diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 2fe09db1f99..a2131c2d20a 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -32,7 +32,7 @@ $TRANSLATIONS = array(
 "cancel" => "zrušit",
 "replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}",
 "undo" => "vrátit zpět",
-"_Uploading %n file_::_Uploading %n files_" => array("","",""),
+"_Uploading %n file_::_Uploading %n files_" => array("Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"),
 "files uploading" => "soubory se odesílají",
 "'.' is an invalid file name." => "'.' je neplatným názvem souboru.",
 "File name cannot be empty." => "Název souboru nemůže být prázdný řetězec.",
@@ -44,8 +44,8 @@ $TRANSLATIONS = array(
 "Name" => "Název",
 "Size" => "Velikost",
 "Modified" => "Upraveno",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
+"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"),
+"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
 "%s could not be renamed" => "%s nemůže být přejmenován",
 "Upload" => "Odeslat",
 "File handling" => "Zacházení se soubory",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 0733f0e7925..4ae46e79003 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -32,7 +32,7 @@ $TRANSLATIONS = array(
 "cancel" => "キャンセル",
 "replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換",
 "undo" => "元に戻す",
-"_Uploading %n file_::_Uploading %n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array("%n 個のファイルをアップロード中"),
 "files uploading" => "ファイルをアップロード中",
 "'.' is an invalid file name." => "'.' は無効なファイル名です。",
 "File name cannot be empty." => "ファイル名を空にすることはできません。",
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 0eeff3a5906..f6ded76e109 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -2,6 +2,8 @@
 $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu",
 "Could not move %s" => "Nevarēja pārvietot %s",
+"Unable to set upload directory." => "Nevar uzstādīt augšupielādes mapi.",
+"Invalid Token" => "Nepareiza pilnvara",
 "No file was uploaded. Unknown error" => "Netika augšupielādēta neviena datne. Nezināma kļūda",
 "There is no error, the file uploaded with success" => "Viss kārtībā, datne augšupielādēta veiksmīga",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Augšupielādētā datne pārsniedz upload_max_filesize norādījumu php.ini datnē:",
@@ -18,6 +20,7 @@ $TRANSLATIONS = array(
 "Upload cancelled." => "Augšupielāde ir atcelta.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
 "URL cannot be empty." => "URL nevar būt tukšs.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Kļūdains mapes nosaukums. 'Shared' lietošana ir rezervēta no ownCloud",
 "Error" => "Kļūda",
 "Share" => "Dalīties",
 "Delete permanently" => "Dzēst pavisam",
@@ -29,7 +32,8 @@ $TRANSLATIONS = array(
 "cancel" => "atcelt",
 "replaced {new_name} with {old_name}" => "aizvietoja {new_name} ar {old_name}",
 "undo" => "atsaukt",
-"_Uploading %n file_::_Uploading %n files_" => array("","",""),
+"_Uploading %n file_::_Uploading %n files_" => array("%n","Augšupielāde %n failu","Augšupielāde %n failus"),
+"files uploading" => "fails augšupielādējas",
 "'.' is an invalid file name." => "'.' ir nederīgs datnes nosaukums.",
 "File name cannot be empty." => "Datnes nosaukums nevar būt tukšs.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'.",
@@ -40,8 +44,9 @@ $TRANSLATIONS = array(
 "Name" => "Nosaukums",
 "Size" => "Izmērs",
 "Modified" => "Mainīts",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
+"_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"),
+"_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"),
+"%s could not be renamed" => "%s nevar tikt pārsaukts",
 "Upload" => "Augšupielādēt",
 "File handling" => "Datņu pārvaldība",
 "Maximum upload size" => "Maksimālais datņu augšupielādes apjoms",
@@ -66,6 +71,8 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu",
 "Files are being scanned, please wait." => "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.",
 "Current scanning" => "Šobrīd tiek caurskatīts",
+"directory" => "direktorija",
+"directories" => "direktorijas",
 "file" => "fails",
 "files" => "faili",
 "Upgrading filesystem cache..." => "Uzlabo datņu sistēmas kešatmiņu..."
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 5e43740cc20..d76255f522d 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kan ikke flytte %s - En fil med samme navn finnes allerede",
 "Could not move %s" => "Kunne ikke flytte %s",
 "Unable to set upload directory." => "Kunne ikke sette opplastingskatalog.",
+"Invalid Token" => "Ugyldig nøkkel",
 "No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
 "There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen.",
@@ -23,28 +24,29 @@ $TRANSLATIONS = array(
 "Error" => "Feil",
 "Share" => "Del",
 "Delete permanently" => "Slett permanent",
-"Rename" => "Omdøp",
+"Rename" => "Gi nytt navn",
 "Pending" => "Ventende",
 "{new_name} already exists" => "{new_name} finnes allerede",
 "replace" => "erstatt",
 "suggest name" => "foreslå navn",
 "cancel" => "avbryt",
-"replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
+"replaced {new_name} with {old_name}" => "erstattet {new_name} med {old_name}",
 "undo" => "angre",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("Laster opp %n fil","Laster opp %n filer"),
 "files uploading" => "filer lastes opp",
 "'.' is an invalid file name." => "'.' er et ugyldig filnavn.",
 "File name cannot be empty." => "Filnavn kan ikke være tomt.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
 "Your storage is full, files can not be updated or synced anymore!" => "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)",
+"Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Endret",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
+"%s could not be renamed" => "Kunne ikke gi nytt navn til %s",
 "Upload" => "Last opp",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimum opplastingsstørrelse",
@@ -67,7 +69,7 @@ $TRANSLATIONS = array(
 "Delete" => "Slett",
 "Upload too large" => "Filen er for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
-"Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.",
+"Files are being scanned, please wait." => "Skanner filer, vennligst vent.",
 "Current scanning" => "Pågående skanning",
 "directory" => "katalog",
 "directories" => "kataloger",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index adaf07a378e..5648ae9b350 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -32,7 +32,7 @@ $TRANSLATIONS = array(
 "cancel" => "annuleren",
 "replaced {new_name} with {old_name}" => "verving {new_name} met {old_name}",
 "undo" => "ongedaan maken",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("%n bestand aan het uploaden","%n bestanden aan het uploaden"),
 "files uploading" => "bestanden aan het uploaden",
 "'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.",
 "File name cannot be empty." => "Bestandsnaam kan niet leeg zijn.",
@@ -44,8 +44,8 @@ $TRANSLATIONS = array(
 "Name" => "Naam",
 "Size" => "Grootte",
 "Modified" => "Aangepast",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("","%n mappen"),
+"_%n file_::_%n files_" => array("","%n bestanden"),
 "%s could not be renamed" => "%s kon niet worden hernoemd",
 "Upload" => "Uploaden",
 "File handling" => "Bestand",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index c4f9342a3f5..fe771d2b571 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -32,7 +32,7 @@ $TRANSLATIONS = array(
 "cancel" => "отмена",
 "replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}",
 "undo" => "отмена",
-"_Uploading %n file_::_Uploading %n files_" => array("","",""),
+"_Uploading %n file_::_Uploading %n files_" => array("Закачка %n файла","Закачка %n файлов","Закачка %n файлов"),
 "files uploading" => "файлы загружаются",
 "'.' is an invalid file name." => "'.' - неправильное имя файла.",
 "File name cannot be empty." => "Имя файла не может быть пустым.",
@@ -44,8 +44,8 @@ $TRANSLATIONS = array(
 "Name" => "Имя",
 "Size" => "Размер",
 "Modified" => "Изменён",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
+"_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"),
+"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"),
 "%s could not be renamed" => "%s не может быть переименован",
 "Upload" => "Загрузка",
 "File handling" => "Управление файлами",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 5251e2ade26..574dc3728af 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -32,7 +32,7 @@ $TRANSLATIONS = array(
 "cancel" => "avbryt",
 "replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}",
 "undo" => "ångra",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("Laddar upp %n fil","Laddar upp %n filer"),
 "files uploading" => "filer laddas upp",
 "'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.",
 "File name cannot be empty." => "Filnamn kan inte vara tomt.",
@@ -44,8 +44,8 @@ $TRANSLATIONS = array(
 "Name" => "Namn",
 "Size" => "Storlek",
 "Modified" => "Ändrad",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
 "%s could not be renamed" => "%s kunde inte namnändras",
 "Upload" => "Ladda upp",
 "File handling" => "Filhantering",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index ddd3955c2fa..495e9d9d9dd 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -44,8 +44,8 @@ $TRANSLATIONS = array(
 "Name" => "名称",
 "Size" => "大小",
 "Modified" => "修改日期",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
+"_%n folder_::_%n folders_" => array("%n 文件夹"),
+"_%n file_::_%n files_" => array("%n个文件"),
 "%s could not be renamed" => "%s 不能被重命名",
 "Upload" => "上传",
 "File handling" => "文件处理",
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index 76fd8c5ba53..e0d52399c73 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -10,6 +10,8 @@ $TRANSLATIONS = array(
 "Could not update the private key password. Maybe the old password was not correct." => "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ваш секретный ключ не действителен! Вероятно, ваш пароль был изменен вне системы OwnCloud (например, корпоративный каталог). Вы можете обновить секретный ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ",
 "Missing requirements." => "Требования отсутствуют.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Пожалуйста, убедитесь, что версия PHP 5.3.3 или новее, а также, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования отключено.",
+"Following users are not set up for encryption:" => "Для следующих пользователей шифрование не настроено:",
 "Saving..." => "Сохранение...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Секретный ключ недействителен! Возможно, Ваш пароль был изменён в другой программе.",
 "You can unlock your private key in your " => "Вы можете разблокировать закрытый ключ в своём ",
diff --git a/apps/files_external/l10n/lv.php b/apps/files_external/l10n/lv.php
index bc9e3aeefe7..d0db01a22b5 100644
--- a/apps/files_external/l10n/lv.php
+++ b/apps/files_external/l10n/lv.php
@@ -7,6 +7,7 @@ $TRANSLATIONS = array(
 "Error configuring Google Drive storage" => "Kļūda, konfigurējot Google Drive krātuvi",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Brīdinājums:</b> nav uzinstalēts “smbclient”. Nevar montēt CIFS/SMB koplietojumus. Lūdzu, vaicājiet savam sistēmas administratoram, lai to uzinstalē.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Brīdinājums: </b> uz PHP nav aktivēts vai instalēts FTP atbalsts. Nevar montēt FTP koplietojumus. Lūdzu, vaicājiet savam sistēmas administratoram, lai to uzinstalē.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Brīdinājums:</b> PHP Curl atbalsts nav instalēts.  OwnCloud / WebDAV vai GoogleDrive montēšana nav iespējama. Lūdziet sistēmas administratoram lai tas tiek uzstādīts.",
 "External Storage" => "Ārējā krātuve",
 "Folder name" => "Mapes nosaukums",
 "External storage" => "Ārējā krātuve",
diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php
index 37898a1cd00..f541d6c155a 100644
--- a/apps/files_sharing/l10n/zh_CN.php
+++ b/apps/files_sharing/l10n/zh_CN.php
@@ -1,7 +1,14 @@
 <?php
 $TRANSLATIONS = array(
+"The password is wrong. Try again." => "用户名或密码错误！请重试",
 "Password" => "密码",
 "Submit" => "提交",
+"Sorry, this link doesn’t seem to work anymore." => "抱歉，此链接已失效",
+"Reasons might be:" => "可能原因是：",
+"the item was removed" => "此项已移除",
+"the link expired" => "链接过期",
+"sharing is disabled" => "共享已禁用",
+"For more info, please ask the person who sent this link." => "欲知详情，请联系发给你链接的人。",
 "%s shared the folder %s with you" => "%s与您共享了%s文件夹",
 "%s shared the file %s with you" => "%s与您共享了%s文件",
 "Download" => "下载",
diff --git a/apps/files_trashbin/l10n/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php
index 383d2a217f7..f0bebee742f 100644
--- a/apps/files_trashbin/l10n/cs_CZ.php
+++ b/apps/files_trashbin/l10n/cs_CZ.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
 "Delete permanently" => "Trvale odstranit",
 "Name" => "Název",
 "Deleted" => "Smazáno",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
+"_%n folder_::_%n folders_" => array("%n adresář","%n adresáře","%n adresářů"),
+"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
 "restored" => "obnoveno",
 "Nothing in here. Your trash bin is empty!" => "Žádný obsah. Váš koš je prázdný.",
 "Restore" => "Obnovit",
diff --git a/apps/files_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php
index ccbf117fdad..ca833b24208 100644
--- a/apps/files_trashbin/l10n/lv.php
+++ b/apps/files_trashbin/l10n/lv.php
@@ -8,8 +8,9 @@ $TRANSLATIONS = array(
 "Delete permanently" => "Dzēst pavisam",
 "Name" => "Nosaukums",
 "Deleted" => "Dzēsts",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
+"_%n folder_::_%n folders_" => array("Nekas, %n mapes","%n mape","%n mapes"),
+"_%n file_::_%n files_" => array("Neviens! %n faaili","%n fails","%n faili"),
+"restored" => "atjaunots",
 "Nothing in here. Your trash bin is empty!" => "Šeit nekā nav. Jūsu miskaste ir tukša!",
 "Restore" => "Atjaunot",
 "Delete" => "Dzēst",
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index 8a69b3d87aa..8eb3bc1846f 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
 "Delete permanently" => "Slett permanent",
 "Name" => "Navn",
 "Deleted" => "Slettet",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("","%n mapper"),
+"_%n file_::_%n files_" => array("","%n filer"),
 "Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
 "Restore" => "Gjenopprett",
 "Delete" => "Slett",
diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php
index 2c6dcb2fcbf..b3ae57da563 100644
--- a/apps/files_trashbin/l10n/nl.php
+++ b/apps/files_trashbin/l10n/nl.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
 "Delete permanently" => "Verwijder definitief",
 "Name" => "Naam",
 "Deleted" => "Verwijderd",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n map","%n mappen"),
+"_%n file_::_%n files_" => array("%n bestand","%n bestanden"),
 "restored" => "hersteld",
 "Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!",
 "Restore" => "Herstellen",
diff --git a/apps/files_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php
index 909e4d7131f..5f52263a118 100644
--- a/apps/files_trashbin/l10n/ru.php
+++ b/apps/files_trashbin/l10n/ru.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
 "Delete permanently" => "Удалено навсегда",
 "Name" => "Имя",
 "Deleted" => "Удалён",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
+"_%n folder_::_%n folders_" => array("","","%n папок"),
+"_%n file_::_%n files_" => array("","","%n файлов"),
 "restored" => "восстановлен",
 "Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
 "Restore" => "Восстановить",
diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php
index b0752cbbe8b..47a52f25736 100644
--- a/apps/files_trashbin/l10n/sv.php
+++ b/apps/files_trashbin/l10n/sv.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
 "Delete permanently" => "Radera permanent",
 "Name" => "Namn",
 "Deleted" => "Raderad",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
 "restored" => "återställd",
 "Nothing in here. Your trash bin is empty!" => "Ingenting här. Din papperskorg är tom!",
 "Restore" => "Återskapa",
diff --git a/apps/files_trashbin/l10n/zh_CN.php b/apps/files_trashbin/l10n/zh_CN.php
index 6609f57d9cf..dc2d5b4c00e 100644
--- a/apps/files_trashbin/l10n/zh_CN.php
+++ b/apps/files_trashbin/l10n/zh_CN.php
@@ -8,8 +8,9 @@ $TRANSLATIONS = array(
 "Delete permanently" => "永久删除",
 "Name" => "名称",
 "Deleted" => "已删除",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
+"_%n folder_::_%n folders_" => array("%n 文件夹"),
+"_%n file_::_%n files_" => array("%n个文件"),
+"restored" => "已恢复",
 "Nothing in here. Your trash bin is empty!" => "这里没有东西. 你的回收站是空的!",
 "Restore" => "恢复",
 "Delete" => "删除",
diff --git a/apps/user_ldap/l10n/bn_BD.php b/apps/user_ldap/l10n/bn_BD.php
index ae8571e3d87..407d5f509ec 100644
--- a/apps/user_ldap/l10n/bn_BD.php
+++ b/apps/user_ldap/l10n/bn_BD.php
@@ -10,19 +10,12 @@ $TRANSLATIONS = array(
 "Password" => "কূটশব্দ",
 "For anonymous access, leave DN and Password empty." => "অজ্ঞাতকুলশীল অধিগমনের জন্য DN এবং কূটশব্দটি ফাঁকা রাখুন।",
 "User Login Filter" => "ব্যবহারকারির প্রবেশ ছাঁকনী",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "প্রবেশের  চেষ্টা করার সময় প্রযোজ্য ছাঁকনীটি নির্ধারণ করবে। প্রবেশের সময় ব্যবহারকারী নামটি %%uid  দিয়ে প্রতিস্থাপিত হবে।",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid স্থানধারক ব্যবহার করুন, উদাহরণঃ  \"uid=%%uid\"",
 "User List Filter" => "ব্যবহারকারী তালিকা ছাঁকনী",
-"Defines the filter to apply, when retrieving users." => "ব্যবহারকারী উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।",
-"without any placeholder, e.g. \"objectClass=person\"." => "কোন স্থানধারক ব্যতীত, যেমনঃ \"objectClass=person\"।",
 "Group Filter" => "গোষ্ঠী ছাঁকনী",
-"Defines the filter to apply, when retrieving groups." => "গোষ্ঠীসমূহ উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "কোন স্থান ধারক ব্যতীত, উদাহরণঃ\"objectClass=posixGroup\"।",
 "Port" => "পোর্ট",
 "Use TLS" => "TLS ব্যবহার কর",
 "Case insensitve LDAP server (Windows)" => "বর্ণ অসংবেদী LDAP  সার্ভার (উইন্ডোজ)",
 "Turn off SSL certificate validation." => "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।",
-"Not recommended, use for testing only." => "অনুমোদিত নয়, শুধুমাত্র পরীক্ষামূলক ব্যবহারের জন্য।",
 "in seconds. A change empties the cache." => "সেকেন্ডে। কোন পরিবর্তন ক্যাসে খালি করবে।",
 "User Display Name Field" => "ব্যবহারকারীর প্রদর্শিতব্য নামের ক্ষেত্র",
 "Base User Tree" => "ভিত্তি ব্যবহারকারি বৃক্ষাকারে",
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index a6b34399cd4..338317baad7 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -30,14 +30,8 @@ $TRANSLATIONS = array(
 "Password" => "Contrasenya",
 "For anonymous access, leave DN and Password empty." => "Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
 "User Login Filter" => "Filtre d'inici de sessió d'usuari",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Defineix el filtre a aplicar quan s'intenta l'inici de sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "useu el paràmetre de substitució %%uid, per exemple \"uid=%%uid\"",
 "User List Filter" => "Llista de filtres d'usuari",
-"Defines the filter to apply, when retrieving users." => "Defineix el filtre a aplicar quan es mostren usuaris",
-"without any placeholder, e.g. \"objectClass=person\"." => "sense cap paràmetre de substitució, per exemple \"objectClass=persona\"",
 "Group Filter" => "Filtre de grup",
-"Defines the filter to apply, when retrieving groups." => "Defineix el filtre a aplicar quan es mostren grups.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\".",
 "Connection Settings" => "Arranjaments de connexió",
 "Configuration Active" => "Configuració activa",
 "When unchecked, this configuration will be skipped." => "Si està desmarcat, aquesta configuració s'ometrà.",
@@ -51,8 +45,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "No ho useu adicionalment per a conexions LDAPS, fallarà.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)",
 "Turn off SSL certificate validation." => "Desactiva la validació de certificat SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor %s.",
-"Not recommended, use for testing only." => "No recomanat, ús només per proves.",
 "Cache Time-To-Live" => "Memòria de cau Time-To-Live",
 "in seconds. A change empties the cache." => "en segons. Un canvi buidarà la memòria de cau.",
 "Directory Settings" => "Arranjaments de carpetes",
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 165946a3b30..a5f20cbf134 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -4,9 +4,9 @@ $TRANSLATIONS = array(
 "Failed to delete the server configuration" => "Selhalo smazání nastavení serveru",
 "The configuration is valid and the connection could be established!" => "Nastavení je v pořádku a spojení bylo navázáno.",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurace je v pořádku, ale spojení selhalo. Zkontrolujte, prosím, nastavení serveru a přihlašovací údaje.",
-"The configuration is invalid. Please look in the ownCloud log for further details." => "Nastavení je neplatné. Zkontrolujte, prosím, záznam ownCloud pro další podrobnosti.",
-"Deletion failed" => "Mazání selhalo.",
-"Take over settings from recent server configuration?" => "Převzít nastavení z nedávného nastavení serveru?",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Nastavení je neplatné. Zkontrolujte, prosím, záznamy ownCloud pro další podrobnosti.",
+"Deletion failed" => "Mazání selhalo",
+"Take over settings from recent server configuration?" => "Převzít nastavení z nedávné konfigurace serveru?",
 "Keep settings?" => "Ponechat nastavení?",
 "Cannot add server configuration" => "Nelze přidat nastavení serveru",
 "mappings cleared" => "mapování zrušeno",
@@ -17,7 +17,7 @@ $TRANSLATIONS = array(
 "Do you really want to delete the current Server Configuration?" => "Opravdu si přejete smazat současné nastavení serveru?",
 "Confirm Deletion" => "Potvrdit smazání",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neočekávané chování. Požádejte prosím vašeho systémového administrátora o zakázání jednoho z nich.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému aby jej nainstaloval.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému, aby jej nainstaloval.",
 "Server configuration" => "Nastavení serveru",
 "Add Server Configuration" => "Přidat nastavení serveru",
 "Host" => "Počítač",
@@ -26,42 +26,34 @@ $TRANSLATIONS = array(
 "One Base DN per line" => "Jedna základní DN na řádku",
 "You can specify Base DN for users and groups in the Advanced tab" => "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny",
 "User DN" => "Uživatelské DN",
-"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN klentského uživatele ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte údaje DN and Heslo prázdné.",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN klientského uživatele, ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte DN a heslo prázdné.",
 "Password" => "Heslo",
-"For anonymous access, leave DN and Password empty." => "Pro anonymní přístup, ponechte údaje DN and heslo prázdné.",
+"For anonymous access, leave DN and Password empty." => "Pro anonymní přístup ponechte údaje DN and heslo prázdné.",
 "User Login Filter" => "Filtr přihlášení uživatelů",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "použijte zástupný vzor %%uid, např. \"uid=%%uid\"",
-"User List Filter" => "Filtr uživatelských seznamů",
-"Defines the filter to apply, when retrieving users." => "Určuje použitý filtr, pro získávaní uživatelů.",
-"without any placeholder, e.g. \"objectClass=person\"." => "bez zástupných znaků, např. \"objectClass=person\".",
+"User List Filter" => "Filtr seznamu uživatelů",
 "Group Filter" => "Filtr skupin",
-"Defines the filter to apply, when retrieving groups." => "Určuje použitý filtr, pro získávaní skupin.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez zástupných znaků, např. \"objectClass=posixGroup\".",
 "Connection Settings" => "Nastavení spojení",
 "Configuration Active" => "Nastavení aktivní",
-"When unchecked, this configuration will be skipped." => "Pokud není zaškrtnuto, bude nastavení přeskočeno.",
+"When unchecked, this configuration will be skipped." => "Pokud není zaškrtnuto, bude toto nastavení přeskočeno.",
 "Port" => "Port",
 "Backup (Replica) Host" => "Záložní (kopie) hostitel",
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Zadejte volitelného záložního hostitele. Musí to být kopie hlavního serveru LDAP/AD.",
 "Backup (Replica) Port" => "Záložní (kopie) port",
-"Disable Main Server" => "Zakázat hlavní serveru",
-"Only connect to the replica server." => "Připojit jen k replikujícímu serveru.",
+"Disable Main Server" => "Zakázat hlavní server",
+"Only connect to the replica server." => "Připojit jen k záložnímu serveru.",
 "Use TLS" => "Použít TLS",
-"Do not use it additionally for LDAPS connections, it will fail." => "Nepoužívejte pro spojení LDAP, selže.",
+"Do not use it additionally for LDAPS connections, it will fail." => "Nepoužívejte v kombinaci s LDAPS spojením, nebude to fungovat.",
 "Case insensitve LDAP server (Windows)" => "LDAP server nerozlišující velikost znaků (Windows)",
 "Turn off SSL certificate validation." => "Vypnout ověřování SSL certifikátu.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Pokud spojení funguje jen s touto volbou, importujte SSL certifikát vašeho LDAP serveru na server %s.",
-"Not recommended, use for testing only." => "Není doporučeno, pouze pro testovací účely.",
 "Cache Time-To-Live" => "TTL vyrovnávací paměti",
-"in seconds. A change empties the cache." => "ve vteřinách. Změna vyprázdní vyrovnávací paměť.",
+"in seconds. A change empties the cache." => "v sekundách. Změna vyprázdní vyrovnávací paměť.",
 "Directory Settings" => "Nastavení adresáře",
 "User Display Name Field" => "Pole zobrazovaného jména uživatele",
 "The LDAP attribute to use to generate the user's display name." => "LDAP atribut použitý k vytvoření zobrazovaného jména uživatele.",
 "Base User Tree" => "Základní uživatelský strom",
 "One User Base DN per line" => "Jedna uživatelská základní DN na řádku",
 "User Search Attributes" => "Atributy vyhledávání uživatelů",
-"Optional; one attribute per line" => "Volitelné, atribut na řádku",
+"Optional; one attribute per line" => "Volitelné, jeden atribut na řádku",
 "Group Display Name Field" => "Pole zobrazovaného jména skupiny",
 "The LDAP attribute to use to generate the groups's display name." => "LDAP atribut použitý k vytvoření zobrazovaného jména skupiny.",
 "Base Group Tree" => "Základní skupinový strom",
@@ -76,13 +68,13 @@ $TRANSLATIONS = array(
 "User Home Folder Naming Rule" => "Pravidlo pojmenování domovské složky uživatele",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr.",
 "Internal Username" => "Interní uživatelské jméno",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Ve výchozím nastavení bude uživatelské jméno vytvořeno z UUID atributu. To zajistí unikátnost uživatelského jména bez potřeby konverze znaků. Interní uživatelské jméno je omezena na znaky: [ a-zA-Z0-9_.@- ]. Ostatní znaky jsou nahrazeny jejich ASCII ekvivalentem nebo jednoduše vynechány. V případě kolize uživatelských jmen bude přidáno/navýšeno číslo. Interní uživatelské jméno je používáno k interní identifikaci uživatele. Je také výchozím názvem uživatelského domovského adresáře. Je také součástí URL pro vzdálený přístup, například všech *DAV služeb. S tímto nastavením bude výchozí chování přepsáno. Pro dosažení podobného chování jako před ownCloudem 5 uveďte atribut zobrazovaného jména do pole níže. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele z LDAP.",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Ve výchozím nastavení bude uživatelské jméno vytvořeno z UUID atributu. To zajistí unikátnost uživatelského jména a není potřeba provádět konverzi znaků. Interní uživatelské jméno je omezeno na znaky: [ a-zA-Z0-9_.@- ]. Ostatní znaky jsou nahrazeny jejich ASCII ekvivalentem nebo jednoduše vynechány. V případě kolize uživatelských jmen bude přidáno/navýšeno číslo. Interní uživatelské jméno je používáno k interní identifikaci uživatele. Je také výchozím názvem uživatelského domovského adresáře. Je také součástí URL pro vzdálený přístup, například všech *DAV služeb. S tímto nastavením může být výchozí chování změněno. Pro dosažení podobného chování jako před ownCloudem 5 uveďte atribut zobrazovaného jména do pole níže. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele z LDAP.",
 "Internal Username Attribute:" => "Atribut interního uživatelského jména:",
 "Override UUID detection" => "Nastavit ručně UUID atribut",
-"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Ve výchozím nastavení je UUID atribut nalezen automaticky. UUID atribut je používán pro nezpochybnitelnou identifikaci uživatelů a skupin z LDAP. Navíc je na základě UUID tvořeno také interní uživatelské jméno, pokud není nastaveno jinak. Můžete výchozí nastavení přepsat a použít atribut který sami zvolíte. Musíte se ale ujistit že atribut který vyberete bude uveden jak u uživatelů, tak i u skupin a je unikátní. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele a skupiny z LDAP.",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Ve výchozím nastavení je UUID atribut nalezen automaticky. UUID atribut je používán pro nezpochybnitelnou identifikaci uživatelů a skupin z LDAP. Navíc je na základě UUID tvořeno také interní uživatelské jméno, pokud není nastaveno jinak. Můžete výchozí nastavení přepsat a použít atribut, který sami zvolíte. Musíte se ale ujistit, že atribut, který vyberete, bude uveden jak u uživatelů, tak i u skupin a je unikátní. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele a skupiny z LDAP.",
 "UUID Attribute:" => "Atribut UUID:",
 "Username-LDAP User Mapping" => "Mapování uživatelských jmen z LDAPu",
-"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Uživatelská jména jsou používány pro uchovávání a přiřazování (meta)dat. Pro správnou identifikaci a rozpoznání uživatelů bude mít každý uživatel z LDAP interní uživatelské jméno. To je nezbytné pro mapování uživatelských jmen na uživatele LDAP. Vytvořené uživatelské jméno je mapováno na UUID uživatele v LDAP. Navíc je cachována DN pro reprodukci interakce s LDAP, ale není používána pro identifikaci. Pokud se DN změní, bude to správně rozpoznáno. Vyčištění mapování zanechá zbytky všude. Vyčištění navíc není specifické konfiguraci, bude mít vliv na všechny LDAP konfigurace! Nikdy nečistěte mapování v produkčním prostředí, jen v testovací nebo experimentální fázi.",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Uživatelská jména jsou používány pro uchovávání a přiřazování (meta)dat. Pro správnou identifikaci a rozpoznání uživatelů bude mít každý uživatel z LDAP interní uživatelské jméno. To vyžaduje mapování uživatelských jmen na uživatele LDAP. Vytvořené uživatelské jméno je mapováno na UUID uživatele v LDAP. Navíc je cachována DN pro zmenšení interakce s LDAP, ale není používána pro identifikaci. Pokud se DN změní, bude to správně rozpoznáno. Interní uživatelské jméno se používá celé. Vyčištění mapování zanechá zbytky všude. Vyčištění navíc není specifické konfiguraci, bude mít vliv na všechny LDAP konfigurace! Nikdy nečistěte mapování v produkčním prostředí, jen v testovací nebo experimentální fázi.",
 "Clear Username-LDAP User Mapping" => "Zrušit mapování uživatelských jmen LDAPu",
 "Clear Groupname-LDAP Group Mapping" => "Zrušit mapování názvů skupin LDAPu",
 "Test Configuration" => "Vyzkoušet nastavení",
diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
index ab59d3ed506..e0c7acbadf8 100644
--- a/apps/user_ldap/l10n/da.php
+++ b/apps/user_ldap/l10n/da.php
@@ -23,11 +23,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "For anonym adgang, skal du lade DN og Adgangskode tomme.",
 "User Login Filter" => "Bruger Login Filter",
 "User List Filter" => "Brugerliste Filter",
-"Defines the filter to apply, when retrieving users." => "Definere filteret der bruges ved indlæsning af brugere.",
-"without any placeholder, e.g. \"objectClass=person\"." => "Uden stedfortræder, f.eks. \"objectClass=person\".",
 "Group Filter" => "Gruppe Filter",
-"Defines the filter to apply, when retrieving groups." => "Definere filteret der bruges når der indlæses grupper.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Uden stedfortræder, f.eks. \"objectClass=posixGroup\".",
 "Connection Settings" => "Forbindelsesindstillinger ",
 "Configuration Active" => "Konfiguration Aktiv",
 "Port" => "Port",
@@ -38,7 +34,6 @@ $TRANSLATIONS = array(
 "Use TLS" => "Brug TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Benyt ikke flere LDAPS forbindelser, det vil mislykkeds. ",
 "Turn off SSL certificate validation." => "Deaktiver SSL certifikat validering",
-"Not recommended, use for testing only." => "Anbefales ikke, brug kun for at teste.",
 "User Display Name Field" => "User Display Name Field",
 "Base User Tree" => "Base Bruger Træ",
 "Base Group Tree" => "Base Group Tree",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 73649f7c0ac..1520cc1daa8 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -30,14 +30,8 @@ $TRANSLATIONS = array(
 "Password" => "Passwort",
 "For anonymous access, leave DN and Password empty." => "Lasse die Felder DN und Passwort für anonymen Zugang leer.",
 "User Login Filter" => "Benutzer-Login-Filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "verwende %%uid Platzhalter, z. B. \"uid=%%uid\"",
 "User List Filter" => "Benutzer-Filter-Liste",
-"Defines the filter to apply, when retrieving users." => "Definiert den Filter für die Anfrage der Benutzer.",
-"without any placeholder, e.g. \"objectClass=person\"." => "ohne Platzhalter, z.B.: \"objectClass=person\"",
 "Group Filter" => "Gruppen-Filter",
-"Defines the filter to apply, when retrieving groups." => "Definiert den Filter für die Anfrage der Gruppen.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"",
 "Connection Settings" => "Verbindungseinstellungen",
 "Configuration Active" => "Konfiguration aktiv",
 "When unchecked, this configuration will be skipped." => "Konfiguration wird übersprungen wenn deaktiviert",
@@ -51,8 +45,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen.",
 "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
 "Turn off SSL certificate validation." => "Schalte die SSL-Zertifikatsprüfung aus.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Falls die Verbindung nur mit dieser Option funktioniert, importiere das SSL-Zertifikat des LDAP-Servers in deinen %s Server.",
-"Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.",
 "Cache Time-To-Live" => "Speichere Time-To-Live zwischen",
 "in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
 "Directory Settings" => "Ordnereinstellungen",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 0052b75b33a..10648493196 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -30,14 +30,8 @@ $TRANSLATIONS = array(
 "Password" => "Passwort",
 "For anonymous access, leave DN and Password empty." => "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
 "User Login Filter" => "Benutzer-Login-Filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\"",
 "User List Filter" => "Benutzer-Filter-Liste",
-"Defines the filter to apply, when retrieving users." => "Definiert den Filter für die Anfrage der Benutzer.",
-"without any placeholder, e.g. \"objectClass=person\"." => "ohne Platzhalter, z.B.: \"objectClass=person\"",
 "Group Filter" => "Gruppen-Filter",
-"Defines the filter to apply, when retrieving groups." => "Definiert den Filter für die Anfrage der Gruppen.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"",
 "Connection Settings" => "Verbindungseinstellungen",
 "Configuration Active" => "Konfiguration aktiv",
 "When unchecked, this configuration will be skipped." => "Wenn nicht angehakt, wird diese Konfiguration übersprungen.",
@@ -51,8 +45,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen.",
 "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
 "Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.",
-"Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.",
 "Cache Time-To-Live" => "Speichere Time-To-Live zwischen",
 "in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
 "Directory Settings" => "Ordnereinstellungen",
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index 140925f6126..d588f90518e 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -27,14 +27,8 @@ $TRANSLATIONS = array(
 "Password" => "Συνθηματικό",
 "For anonymous access, leave DN and Password empty." => "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword.",
 "User Login Filter" => "User Login Filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Καθορίζει το φίλτρο που θα ισχύει κατά την προσπάθεια σύνδεσης χρήστη. %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. ",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "χρησιμοποιήστε τη μεταβλητή %%uid, π.χ. \"uid=%%uid\"",
 "User List Filter" => "User List Filter",
-"Defines the filter to apply, when retrieving users." => "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση επαφών.",
-"without any placeholder, e.g. \"objectClass=person\"." => "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=άτομο\".",
 "Group Filter" => "Group Filter",
-"Defines the filter to apply, when retrieving groups." => "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\".",
 "Connection Settings" => "Ρυθμίσεις Σύνδεσης",
 "Configuration Active" => "Ενεργοποιηση ρυθμισεων",
 "When unchecked, this configuration will be skipped." => "Όταν δεν είναι επιλεγμένο, αυτή η ρύθμιση θα πρέπει να παραλειφθεί. ",
@@ -47,7 +41,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Μην το χρησιμοποιήσετε επιπροσθέτως, για LDAPS συνδέσεις , θα αποτύχει.",
 "Case insensitve LDAP server (Windows)" => "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ",
 "Turn off SSL certificate validation." => "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL.",
-"Not recommended, use for testing only." => "Δεν προτείνεται, χρήση μόνο για δοκιμές.",
 "Cache Time-To-Live" => "Cache Time-To-Live",
 "in seconds. A change empties the cache." => "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache.",
 "Directory Settings" => "Ρυθμίσεις Καταλόγου",
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index 2973e05388b..26d46b81b9f 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -10,19 +10,12 @@ $TRANSLATIONS = array(
 "Password" => "Pasvorto",
 "For anonymous access, leave DN and Password empty." => "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
 "User Login Filter" => "Filtrilo de uzantensaluto",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Ĝi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataŭigas la uzantonomon en la ensaluta ago.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "uzu la referencilon %%uid, ekz.: \"uid=%%uid\"",
 "User List Filter" => "Filtrilo de uzantolisto",
-"Defines the filter to apply, when retrieving users." => "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj.",
-"without any placeholder, e.g. \"objectClass=person\"." => "sen ajna referencilo, ekz.: \"objectClass=person\".",
 "Group Filter" => "Filtrilo de grupo",
-"Defines the filter to apply, when retrieving groups." => "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sen ajna referencilo, ekz.: \"objectClass=posixGroup\".",
 "Port" => "Pordo",
 "Use TLS" => "Uzi TLS-on",
 "Case insensitve LDAP server (Windows)" => "LDAP-servilo blinda je litergrandeco (Vindozo)",
 "Turn off SSL certificate validation." => "Malkapabligi validkontrolon de SSL-atestiloj.",
-"Not recommended, use for testing only." => "Ne rekomendata, uzu ĝin nur por testoj.",
 "in seconds. A change empties the cache." => "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron.",
 "User Display Name Field" => "Kampo de vidignomo de uzanto",
 "Base User Tree" => "Baza uzantarbo",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index ca59e2f3ead..e5994273635 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -29,14 +29,8 @@ $TRANSLATIONS = array(
 "Password" => "Contraseña",
 "For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.",
 "User Login Filter" => "Filtro de inicio de sesión de usuario",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "usar %%uid como comodín, ej: \"uid=%%uid\"",
 "User List Filter" => "Lista de filtros de usuario",
-"Defines the filter to apply, when retrieving users." => "Define el filtro a aplicar, cuando se obtienen usuarios.",
-"without any placeholder, e.g. \"objectClass=person\"." => "Sin comodines, ej: \"objectClass=person\".",
 "Group Filter" => "Filtro de grupo",
-"Defines the filter to apply, when retrieving groups." => "Define el filtro a aplicar, cuando se obtienen grupos.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sin comodines, ej: \"objectClass=posixGroup\".",
 "Connection Settings" => "Configuración de conexión",
 "Configuration Active" => "Configuracion activa",
 "When unchecked, this configuration will be skipped." => "Cuando deseleccione, esta configuracion sera omitida.",
@@ -49,8 +43,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "No lo use para conexiones LDAPS, Fallará.",
 "Case insensitve LDAP server (Windows)" => "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)",
 "Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Si la conexión funciona sólo con esta opción, importe el certificado SSL del servidor LDAP en su servidor %s.",
-"Not recommended, use for testing only." => "No recomendado, sólo para pruebas.",
 "Cache Time-To-Live" => "Cache TTL",
 "in seconds. A change empties the cache." => "en segundos. Un cambio vacía la caché.",
 "Directory Settings" => "Configuracion de directorio",
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index c4f339f76bb..ecfcae32f46 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -29,14 +29,8 @@ $TRANSLATIONS = array(
 "Password" => "Contraseña",
 "For anonymous access, leave DN and Password empty." => "Para acceso anónimo, dejá DN y contraseña vacíos.",
 "User Login Filter" => "Filtro de inicio de sesión de usuario",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazará el nombre de usuario en el proceso de inicio de sesión.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "usar %%uid como plantilla, p. ej.: \"uid=%%uid\"",
 "User List Filter" => "Lista de filtros de usuario",
-"Defines the filter to apply, when retrieving users." => "Define el filtro a aplicar, cuando se obtienen usuarios.",
-"without any placeholder, e.g. \"objectClass=person\"." => "Sin plantilla, p. ej.: \"objectClass=person\".",
 "Group Filter" => "Filtro de grupo",
-"Defines the filter to apply, when retrieving groups." => "Define el filtro a aplicar cuando se obtienen grupos.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\".",
 "Connection Settings" => "Configuración de Conección",
 "Configuration Active" => "Configuración activa",
 "When unchecked, this configuration will be skipped." => "Si no está seleccionada, esta configuración será omitida.",
@@ -49,7 +43,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "No usar adicionalmente para conexiones LDAPS, las mismas fallarán",
 "Case insensitve LDAP server (Windows)" => "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)",
 "Turn off SSL certificate validation." => "Desactivar la validación por certificado SSL.",
-"Not recommended, use for testing only." => "No recomendado, sólo para pruebas.",
 "Cache Time-To-Live" => "Tiempo de vida del caché",
 "in seconds. A change empties the cache." => "en segundos. Cambiarlo vacía la cache.",
 "Directory Settings" => "Configuración de Directorio",
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index f97a1ad7406..700b31e7ba9 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -30,14 +30,8 @@ $TRANSLATIONS = array(
 "Password" => "Parool",
 "For anonymous access, leave DN and Password empty." => "Anonüümseks ligipääsuks jäta DN ja parool tühjaks.",
 "User Login Filter" => "Kasutajanime filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\"",
 "User List Filter" => "Kasutajate nimekirja filter",
-"Defines the filter to apply, when retrieving users." => "Määrab kasutajaid hankides filtri, mida rakendatakse.",
-"without any placeholder, e.g. \"objectClass=person\"." => "ilma ühegi kohatäitjata, nt. \"objectClass=person\".",
 "Group Filter" => "Grupi filter",
-"Defines the filter to apply, when retrieving groups." => "Määrab gruppe hankides filtri, mida rakendatakse.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\".",
 "Connection Settings" => "Ühenduse seaded",
 "Configuration Active" => "Seadistus aktiivne",
 "When unchecked, this configuration will be skipped." => "Kui märkimata, siis seadistust ei kasutata",
@@ -51,8 +45,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "LDAPS puhul ära kasuta. Ühendus ei toimi.",
 "Case insensitve LDAP server (Windows)" => "Mittetõstutundlik LDAP server (Windows)",
 "Turn off SSL certificate validation." => "Lülita SSL sertifikaadi kontrollimine välja.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma %s serverisse.",
-"Not recommended, use for testing only." => "Pole soovitatav, kasuta ainult testimiseks.",
 "Cache Time-To-Live" => "Puhvri iga",
 "in seconds. A change empties the cache." => "sekundites. Muudatus tühjendab vahemälu.",
 "Directory Settings" => "Kataloogi seaded",
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 59e8371d9c2..664d4901947 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -27,14 +27,8 @@ $TRANSLATIONS = array(
 "Password" => "Pasahitza",
 "For anonymous access, leave DN and Password empty." => "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
 "User Login Filter" => "Erabiltzaileen saioa hasteko iragazkia",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "erabili %%uid txantiloia, adb. \"uid=%%uid\"",
 "User List Filter" => "Erabiltzaile zerrendaren Iragazkia",
-"Defines the filter to apply, when retrieving users." => "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du.",
-"without any placeholder, e.g. \"objectClass=person\"." => "txantiloirik gabe, adb. \"objectClass=person\".",
 "Group Filter" => "Taldeen iragazkia",
-"Defines the filter to apply, when retrieving groups." => "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "txantiloirik gabe, adb. \"objectClass=posixGroup\".",
 "Connection Settings" => "Konexio Ezarpenak",
 "Configuration Active" => "Konfigurazio Aktiboa",
 "When unchecked, this configuration will be skipped." => "Markatuta ez dagoenean, konfigurazio hau ez da kontutan hartuko.",
@@ -47,7 +41,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Ez erabili LDAPS konexioetarako, huts egingo du.",
 "Case insensitve LDAP server (Windows)" => "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)",
 "Turn off SSL certificate validation." => "Ezgaitu SSL ziurtagirien egiaztapena.",
-"Not recommended, use for testing only." => "Ez da aholkatzen, erabili bakarrik frogak egiteko.",
 "Cache Time-To-Live" => "Katxearen Bizi-Iraupena",
 "in seconds. A change empties the cache." => "segundutan. Aldaketak katxea husten du.",
 "Directory Settings" => "Karpetaren Ezarpenak",
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
index 7b65c798d82..c4db39521dd 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -25,7 +25,6 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "برای دسترسی ناشناس، DN را رها نموده و رمزعبور را خالی بگذارید.",
 "User Login Filter" => "فیلتر ورودی کاربر",
 "Group Filter" => "فیلتر گروه",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "بدون هیچ گونه حفره یا سوراخ، به عنوان مثال، \"objectClass = posixGroup\".",
 "Connection Settings" => "تنظیمات اتصال",
 "Configuration Active" => "پیکربندی فعال",
 "When unchecked, this configuration will be skipped." => "زمانیکه انتخاب نشود، این پیکربندی نادیده گرفته خواهد شد.",
@@ -37,7 +36,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "علاوه بر این برای اتصالات LDAPS  از آن استفاده نکنید، با شکست مواجه خواهد شد.",
 "Case insensitve LDAP server (Windows)" => "غیر حساس به بزرگی و کوچکی حروف LDAP سرور (ویندوز)",
 "Turn off SSL certificate validation." => "غیرفعال کردن اعتبار گواهی نامه SSL .",
-"Not recommended, use for testing only." => "توصیه نمی شود، تنها برای آزمایش استفاده کنید.",
 "Directory Settings" => "تنظیمات پوشه",
 "User Display Name Field" => "فیلد نام کاربر",
 "Base User Tree" => "کاربر درخت پایه",
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index 744833ff7b3..341ffe8f627 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -17,21 +17,14 @@ $TRANSLATIONS = array(
 "Password" => "Salasana",
 "For anonymous access, leave DN and Password empty." => "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi ",
 "User Login Filter" => "Login suodatus",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Määrittelee käytettävän suodattimen, kun sisäänkirjautumista yritetään. %%uid korvaa sisäänkirjautumisessa käyttäjätunnuksen.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "käytä %%uid paikanvaraajaa, ts. \"uid=%%uid\"",
 "User List Filter" => "Käyttäjien suodatus",
-"Defines the filter to apply, when retrieving users." => "Määrittelee käytettävän suodattimen, kun käyttäjiä haetaan.  ",
-"without any placeholder, e.g. \"objectClass=person\"." => "ilman paikanvaraustermiä, ts. \"objectClass=person\".",
 "Group Filter" => "Ryhmien suodatus",
-"Defines the filter to apply, when retrieving groups." => "Määrittelee käytettävän suodattimen, kun ryhmiä haetaan.  ",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\".",
 "Connection Settings" => "Yhteysasetukset",
 "Port" => "Portti",
 "Disable Main Server" => "Poista pääpalvelin käytöstä",
 "Use TLS" => "Käytä TLS:ää",
 "Case insensitve LDAP server (Windows)" => "Kirjainkoosta piittamaton LDAP-palvelin (Windows)",
 "Turn off SSL certificate validation." => "Poista käytöstä SSL-varmenteen vahvistus",
-"Not recommended, use for testing only." => "Ei suositella, käytä vain testausta varten.",
 "in seconds. A change empties the cache." => "sekunneissa. Muutos tyhjentää välimuistin.",
 "Directory Settings" => "Hakemistoasetukset",
 "User Display Name Field" => "Käyttäjän näytettävän nimen kenttä",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 5fc02e58372..0c7d3ad078f 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -29,14 +29,8 @@ $TRANSLATIONS = array(
 "Password" => "Mot de passe",
 "For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
 "User Login Filter" => "Modèle d'authentification utilisateurs",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\"",
 "User List Filter" => "Filtre d'utilisateurs",
-"Defines the filter to apply, when retrieving users." => "Définit le filtre à appliquer lors de la récupération des utilisateurs.",
-"without any placeholder, e.g. \"objectClass=person\"." => "sans élément de substitution, par exemple \"objectClass=person\".",
 "Group Filter" => "Filtre de groupes",
-"Defines the filter to apply, when retrieving groups." => "Définit le filtre à appliquer lors de la récupération des groupes.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sans élément de substitution, par exemple \"objectClass=posixGroup\".",
 "Connection Settings" => "Paramètres de connexion",
 "Configuration Active" => "Configuration active",
 "When unchecked, this configuration will be skipped." => "Lorsque non cochée, la configuration sera ignorée.",
@@ -49,7 +43,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "À ne pas utiliser pour les connexions LDAPS (cela échouera).",
 "Case insensitve LDAP server (Windows)" => "Serveur LDAP insensible à la casse (Windows)",
 "Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL.",
-"Not recommended, use for testing only." => "Non recommandé, utilisation pour tests uniquement.",
 "Cache Time-To-Live" => "Durée de vie du cache",
 "in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.",
 "Directory Settings" => "Paramètres du répertoire",
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index ce4967f8b8c..9debcef70ac 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -30,14 +30,8 @@ $TRANSLATIONS = array(
 "Password" => "Contrasinal",
 "For anonymous access, leave DN and Password empty." => "Para o acceso anónimo deixe o DN e o contrasinal baleiros.",
 "User Login Filter" => "Filtro de acceso de usuarios",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "usar a marca de posición %%uid, p.ex «uid=%%uid»",
 "User List Filter" => "Filtro da lista de usuarios",
-"Defines the filter to apply, when retrieving users." => "Define o filtro a aplicar cando se recompilan os usuarios.",
-"without any placeholder, e.g. \"objectClass=person\"." => "sen ningunha marca de posición, como p.ex «objectClass=persoa».",
 "Group Filter" => "Filtro de grupo",
-"Defines the filter to apply, when retrieving groups." => "Define o filtro a aplicar cando se recompilan os grupos.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix».",
 "Connection Settings" => "Axustes da conexión",
 "Configuration Active" => "Configuración activa",
 "When unchecked, this configuration will be skipped." => "Se está sen marcar, omítese esta configuración.",
@@ -51,8 +45,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Non utilizalo ademais para conexións LDAPS xa que fallará.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)",
 "Turn off SSL certificate validation." => "Desactiva a validación do certificado SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no teu servidor %s.",
-"Not recommended, use for testing only." => "Non se recomenda. Só para probas.",
 "Cache Time-To-Live" => "Tempo de persistencia da caché",
 "in seconds. A change empties the cache." => "en segundos. Calquera cambio baleira a caché.",
 "Directory Settings" => "Axustes do directorio",
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index 61fa37ed95c..6961869f3e0 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -29,14 +29,8 @@ $TRANSLATIONS = array(
 "Password" => "Jelszó",
 "For anonymous access, leave DN and Password empty." => "Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!",
 "User Login Filter" => "Szűrő a bejelentkezéshez",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "használja az %%uid változót, pl. \"uid=%%uid\"",
 "User List Filter" => "A felhasználók szűrője",
-"Defines the filter to apply, when retrieving users." => "Ez a szűrő érvényes a felhasználók listázásakor.",
-"without any placeholder, e.g. \"objectClass=person\"." => "itt ne használjon változót, pl. \"objectClass=person\".",
 "Group Filter" => "A csoportok szűrője",
-"Defines the filter to apply, when retrieving groups." => "Ez a szűrő érvényes a csoportok listázásakor.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "itt ne használjunk változót, pl. \"objectClass=posixGroup\".",
 "Connection Settings" => "Kapcsolati beállítások",
 "Configuration Active" => "A beállítás aktív",
 "When unchecked, this configuration will be skipped." => "Ha nincs kipipálva, ez a beállítás kihagyódik.",
@@ -49,7 +43,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "LDAPS kapcsolatok esetén ne kapcsoljuk be, mert nem fog működni.",
 "Case insensitve LDAP server (Windows)" => "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)",
 "Turn off SSL certificate validation." => "Ne ellenőrizzük az SSL-tanúsítvány érvényességét",
-"Not recommended, use for testing only." => "Nem javasolt, csak tesztelésre érdemes használni.",
 "Cache Time-To-Live" => "A gyorsítótár tárolási időtartama",
 "in seconds. A change empties the cache." => "másodpercben. A változtatás törli a cache tartalmát.",
 "Directory Settings" => "Címtár beállítások",
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index efaf8e3c926..9580725616d 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -27,14 +27,8 @@ $TRANSLATIONS = array(
 "Password" => "Sandi",
 "For anonymous access, leave DN and Password empty." => "Untuk akses anonim, biarkan DN dan Kata sandi kosong.",
 "User Login Filter" => "gunakan saringan login",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "gunakan pengganti %%uid, mis. \"uid=%%uid\"",
 "User List Filter" => "Daftar Filter Pengguna",
-"Defines the filter to apply, when retrieving users." => "Definisikan filter untuk diterapkan saat menerima pengguna.",
-"without any placeholder, e.g. \"objectClass=person\"." => "tanpa pengganti apapun, mis. \"objectClass=seseorang\".",
 "Group Filter" => "saringan grup",
-"Defines the filter to apply, when retrieving groups." => "Definisikan filter untuk diterapkan saat menerima grup.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\".",
 "Connection Settings" => "Pengaturan Koneksi",
 "Configuration Active" => "Konfigurasi Aktif",
 "When unchecked, this configuration will be skipped." => "Jika tidak dicentang, konfigurasi ini dilewati.",
@@ -47,7 +41,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal.",
 "Case insensitve LDAP server (Windows)" => "Server LDAP dengan kapitalisasi tidak sensitif (Windows)",
 "Turn off SSL certificate validation." => "matikan validasi sertivikat SSL",
-"Not recommended, use for testing only." => "tidak disarankan, gunakan hanya untuk pengujian.",
 "Cache Time-To-Live" => "Gunakan Tembolok untuk Time-To-Live",
 "in seconds. A change empties the cache." => "dalam detik. perubahan mengosongkan cache",
 "Directory Settings" => "Pengaturan Direktori",
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 0a44850fdb0..82f42ef3be9 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -30,14 +30,8 @@ $TRANSLATIONS = array(
 "Password" => "Password",
 "For anonymous access, leave DN and Password empty." => "Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
 "User Login Filter" => "Filtro per l'accesso utente",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "utilizza il segnaposto %%uid, ad esempio \"uid=%%uid\"",
 "User List Filter" => "Filtro per l'elenco utenti",
-"Defines the filter to apply, when retrieving users." => "Specifica quale filtro utilizzare durante il recupero degli utenti.",
-"without any placeholder, e.g. \"objectClass=person\"." => "senza nessun segnaposto, per esempio \"objectClass=person\".",
 "Group Filter" => "Filtro per il gruppo",
-"Defines the filter to apply, when retrieving groups." => "Specifica quale filtro utilizzare durante il recupero dei gruppi.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "senza nessun segnaposto, per esempio \"objectClass=posixGroup\".",
 "Connection Settings" => "Impostazioni di connessione",
 "Configuration Active" => "Configurazione attiva",
 "When unchecked, this configuration will be skipped." => "Se deselezionata, questa configurazione sarà saltata.",
@@ -51,8 +45,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Da non utilizzare per le connessioni LDAPS, non funzionerà.",
 "Case insensitve LDAP server (Windows)" => "Case insensitve LDAP server (Windows)",
 "Turn off SSL certificate validation." => "Disattiva il controllo del certificato SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server %s.",
-"Not recommended, use for testing only." => "Non consigliato, utilizzare solo per test.",
 "Cache Time-To-Live" => "Tempo di vita della cache",
 "in seconds. A change empties the cache." => "in secondi. Il cambio svuota la cache.",
 "Directory Settings" => "Impostazioni delle cartelle",
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index d87a0f065b3..ec0da143057 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -30,14 +30,8 @@ $TRANSLATIONS = array(
 "Password" => "パスワード",
 "For anonymous access, leave DN and Password empty." => "匿名アクセスの場合は、DNとパスワードを空にしてください。",
 "User Login Filter" => "ユーザログインフィルタ",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\"",
 "User List Filter" => "ユーザリストフィルタ",
-"Defines the filter to apply, when retrieving users." => "ユーザーを取得するときに適用するフィルターを定義する。",
-"without any placeholder, e.g. \"objectClass=person\"." => "プレースホルダーを利用しないでください。例 \"objectClass=person\"",
 "Group Filter" => "グループフィルタ",
-"Defines the filter to apply, when retrieving groups." => "グループを取得するときに適用するフィルターを定義する。",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\"",
 "Connection Settings" => "接続設定",
 "Configuration Active" => "設定はアクティブです",
 "When unchecked, this configuration will be skipped." => "チェックを外すと、この設定はスキップされます。",
@@ -51,8 +45,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "LDAPS接続のために追加でそれを利用しないで下さい。失敗します。",
 "Case insensitve LDAP server (Windows)" => "大文字／小文字を区別しないLDAPサーバ（Windows）",
 "Turn off SSL certificate validation." => "SSL証明書の確認を無効にする。",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書を %s サーバにインポートしてください。",
-"Not recommended, use for testing only." => "推奨しません、テスト目的でのみ利用してください。",
 "Cache Time-To-Live" => "キャッシュのTTL",
 "in seconds. A change empties the cache." => "秒。変更後にキャッシュがクリアされます。",
 "Directory Settings" => "ディレクトリ設定",
diff --git a/apps/user_ldap/l10n/ka_GE.php b/apps/user_ldap/l10n/ka_GE.php
index 7317a257daf..860e8933b0d 100644
--- a/apps/user_ldap/l10n/ka_GE.php
+++ b/apps/user_ldap/l10n/ka_GE.php
@@ -27,14 +27,8 @@ $TRANSLATIONS = array(
 "Password" => "პაროლი",
 "For anonymous access, leave DN and Password empty." => "ანონიმური დაშვებისთვის, დატოვეთ DN–ის და პაროლის ველები ცარიელი.",
 "User Login Filter" => "მომხმარებლის ფილტრი",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "როცა შემოსვლა განხორციელდება ასეიძლება მოვახდინოთ გაფილტვრა. %%uid შეიცვლება იუზერნეიმით მომხმარებლის ველში.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "გამოიყენეთ %%uid დამასრულებელი მაგ: \"uid=%%uid\"",
 "User List Filter" => "მომხმარებლებიის სიის ფილტრი",
-"Defines the filter to apply, when retrieving users." => "გაფილტვრა განხორციელდება, როცა მომხმარებლების სია ჩამოიტვირთება.",
-"without any placeholder, e.g. \"objectClass=person\"." => "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=person\".",
 "Group Filter" => "ჯგუფის ფილტრი",
-"Defines the filter to apply, when retrieving groups." => "გაფილტვრა განხორციელდება, როცა ჯგუფის სია ჩამოიტვირთება.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=posixGroup\".",
 "Connection Settings" => "კავშირის პარამეტრები",
 "Configuration Active" => "კონფიგურაცია აქტიურია",
 "When unchecked, this configuration will be skipped." => "როცა გადანიშნულია, ეს კონფიგურაცია გამოტოვებული იქნება.",
@@ -47,7 +41,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "არ გამოიყენოთ დამატებით LDAPS კავშირი. ის წარუმატებლად დასრულდება.",
 "Case insensitve LDAP server (Windows)" => "LDAP server (Windows)",
 "Turn off SSL certificate validation." => "გამორთეთ SSL სერთიფიკატის ვალიდაცია.",
-"Not recommended, use for testing only." => "არ არის რეკომენდირებული, გამოიყენეთ მხოლოდ სატესტოდ.",
 "Cache Time-To-Live" => "ქეშის სიცოცხლის ხანგრძლივობა",
 "in seconds. A change empties the cache." => "წამებში. ცვლილება ასუფთავებს ქეშს.",
 "Directory Settings" => "დირექტორიის პარამეტრები",
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index 650781fe4a2..a5a2798165c 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -16,14 +16,8 @@ $TRANSLATIONS = array(
 "Password" => "암호",
 "For anonymous access, leave DN and Password empty." => "익명 접근을 허용하려면 DN과 암호를 비워 두십시오.",
 "User Login Filter" => "사용자 로그인 필터",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "로그인을 시도할 때 적용할 필터입니다. %%uid는 로그인 작업에서의 사용자 이름으로 대체됩니다.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid 자리 비움자를 사용하십시오. 예제: \"uid=%%uid\"\"",
 "User List Filter" => "사용자 목록 필터",
-"Defines the filter to apply, when retrieving users." => "사용자를 검색할 때 적용할 필터를 정의합니다.",
-"without any placeholder, e.g. \"objectClass=person\"." => "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=person\"",
 "Group Filter" => "그룹 필터",
-"Defines the filter to apply, when retrieving groups." => "그룹을 검색할 때 적용할 필터를 정의합니다.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=posixGroup\"",
 "Connection Settings" => "연결 설정",
 "Configuration Active" => "구성 활성화",
 "Port" => "포트",
@@ -33,7 +27,6 @@ $TRANSLATIONS = array(
 "Use TLS" => "TLS 사용",
 "Case insensitve LDAP server (Windows)" => "서버에서 대소문자를 구분하지 않음 (Windows)",
 "Turn off SSL certificate validation." => "SSL 인증서 유효성 검사를 해제합니다.",
-"Not recommended, use for testing only." => "추천하지 않음, 테스트로만 사용하십시오.",
 "in seconds. A change empties the cache." => "초. 항목 변경 시 캐시가 갱신됩니다.",
 "Directory Settings" => "디렉토리 설정",
 "User Display Name Field" => "사용자의 표시 이름 필드",
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
index 3046824e6c1..7e8b389af7f 100644
--- a/apps/user_ldap/l10n/lt_LT.php
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -7,7 +7,6 @@ $TRANSLATIONS = array(
 "Port" => "Prievadas",
 "Use TLS" => "Naudoti TLS",
 "Turn off SSL certificate validation." => "Išjungti SSL sertifikato tikrinimą.",
-"Not recommended, use for testing only." => "Nerekomenduojama, naudokite tik testavimui.",
 "Help" => "Pagalba"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php
index 7d3d088b40a..11a68fffeb4 100644
--- a/apps/user_ldap/l10n/lv.php
+++ b/apps/user_ldap/l10n/lv.php
@@ -26,14 +26,8 @@ $TRANSLATIONS = array(
 "Password" => "Parole",
 "For anonymous access, leave DN and Password empty." => "Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu.",
 "User Login Filter" => "Lietotāja ierakstīšanās filtrs",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definē filtru, ko izmantot, kad mēģina ierakstīties. %%uid ierakstīšanās darbībā aizstāj lietotājvārdu.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "lieto %%uid vietturi, piemēram, \"uid=%%uid\"",
 "User List Filter" => "Lietotāju saraksta filtrs",
-"Defines the filter to apply, when retrieving users." => "Definē filtru, ko izmantot, kad saņem lietotāju sarakstu.",
-"without any placeholder, e.g. \"objectClass=person\"." => "bez jebkādiem vietturiem, piemēram, \"objectClass=person\".",
 "Group Filter" => "Grupu filtrs",
-"Defines the filter to apply, when retrieving groups." => "Definē filtru, ko izmantot, kad saņem grupu sarakstu.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez jebkādiem vietturiem, piemēram, \"objectClass=posixGroup\".",
 "Connection Settings" => "Savienojuma iestatījumi",
 "Configuration Active" => "Konfigurācija ir aktīva",
 "When unchecked, this configuration will be skipped." => "Ja nav atzīmēts, šī konfigurācija tiks izlaista.",
@@ -46,7 +40,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Neizmanto papildu LDAPS savienojumus! Tas nestrādās.",
 "Case insensitve LDAP server (Windows)" => "Reģistrnejutīgs LDAP serveris (Windows)",
 "Turn off SSL certificate validation." => "Izslēgt SSL sertifikātu validēšanu.",
-"Not recommended, use for testing only." => "Nav ieteicams, izmanto tikai testēšanai!",
 "Cache Time-To-Live" => "Kešatmiņas dzīvlaiks",
 "in seconds. A change empties the cache." => "sekundēs. Izmaiņas iztukšos kešatmiņu.",
 "Directory Settings" => "Direktorijas iestatījumi",
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
index 8f1c338b124..8c482ed2a55 100644
--- a/apps/user_ldap/l10n/nb_NO.php
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -27,14 +27,8 @@ $TRANSLATIONS = array(
 "Password" => "Passord",
 "For anonymous access, leave DN and Password empty." => "For anonym tilgang, la DN- og passord-feltet stå tomt.",
 "User Login Filter" => "Brukerpålogging filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definerer filteret som skal brukes når et påloggingsforsøk blir utført. %%uid erstatter brukernavnet i innloggingshandlingen.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "bruk %%uid plassholder, f.eks. \"uid=%%uid\"",
 "User List Filter" => "Brukerliste filter",
-"Defines the filter to apply, when retrieving users." => "Definerer filteret som skal brukes, når systemet innhenter brukere.",
-"without any placeholder, e.g. \"objectClass=person\"." => "uten noe plassholder, f.eks. \"objectClass=person\".",
 "Group Filter" => "Gruppefilter",
-"Defines the filter to apply, when retrieving groups." => "Definerer filteret som skal brukes, når systemet innhenter grupper.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "uten noe plassholder, f.eks. \"objectClass=posixGroup\".",
 "Configuration Active" => "Konfigurasjon aktiv",
 "When unchecked, this configuration will be skipped." => "Når ikke huket av så vil denne konfigurasjonen bli hoppet over.",
 "Port" => "Port",
@@ -42,7 +36,6 @@ $TRANSLATIONS = array(
 "Use TLS" => "Bruk TLS",
 "Case insensitve LDAP server (Windows)" => "Case-insensitiv LDAP tjener (Windows)",
 "Turn off SSL certificate validation." => "Slå av SSL-sertifikat validering",
-"Not recommended, use for testing only." => "Ikke anbefalt, bruk kun for testing",
 "in seconds. A change empties the cache." => "i sekunder. En endring tømmer bufferen.",
 "User Display Name Field" => "Vis brukerens navnfelt",
 "Base User Tree" => "Hovedbruker tre",
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index 1a67cd409dc..301cad98521 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -30,14 +30,8 @@ $TRANSLATIONS = array(
 "Password" => "Wachtwoord",
 "For anonymous access, leave DN and Password empty." => "Voor anonieme toegang, laat de DN en het wachtwoord leeg.",
 "User Login Filter" => "Gebruikers Login Filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definiëerd de toe te passen filter indien er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam in de login actie.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "gebruik %%uid placeholder, bijv. \"uid=%%uid\"",
 "User List Filter" => "Gebruikers Lijst Filter",
-"Defines the filter to apply, when retrieving users." => "Definiëerd de toe te passen filter voor het ophalen van gebruikers.",
-"without any placeholder, e.g. \"objectClass=person\"." => "zonder een placeholder, bijv. \"objectClass=person\"",
 "Group Filter" => "Groep Filter",
-"Defines the filter to apply, when retrieving groups." => "Definiëerd de toe te passen filter voor het ophalen van groepen.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "zonder een placeholder, bijv. \"objectClass=posixGroup\"",
 "Connection Settings" => "Verbindingsinstellingen",
 "Configuration Active" => "Configuratie actief",
 "When unchecked, this configuration will be skipped." => "Als dit niet is ingeschakeld wordt deze configuratie overgeslagen.",
@@ -51,8 +45,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Gebruik het niet voor LDAPS verbindingen, dat gaat niet lukken.",
 "Case insensitve LDAP server (Windows)" => "Niet-hoofdlettergevoelige LDAP server (Windows)",
 "Turn off SSL certificate validation." => "Schakel SSL certificaat validatie uit.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar de %s server.",
-"Not recommended, use for testing only." => "Niet aangeraden, gebruik alleen voor test doeleinden.",
 "Cache Time-To-Live" => "Cache time-to-live",
 "in seconds. A change empties the cache." => "in seconden. Een verandering maakt de cache leeg.",
 "Directory Settings" => "Mapinstellingen",
@@ -76,10 +68,13 @@ $TRANSLATIONS = array(
 "User Home Folder Naming Rule" => "Gebruikers Home map naamgevingsregel",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
 "Internal Username" => "Interne gebruikersnaam",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Standaard wordt de interne gebruikersnaam aangemaakt op basis van het UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan​​: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een ​​gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle *DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van vóór ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op gekoppelde (toegevoegde) LDAP-gebruikers.",
 "Internal Username Attribute:" => "Interne gebruikersnaam attribuut:",
 "Override UUID detection" => "Negeren UUID detectie",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standaard herkent ownCloud het UUID-attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij deze hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw gekoppelde (toegevoegde) LDAP-gebruikers en-groepen.",
 "UUID Attribute:" => "UUID Attribuut:",
 "Username-LDAP User Mapping" => "Gebruikersnaam-LDAP gebruikers vertaling",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, krijgt elke LDAP-gebruiker ook een interne gebruikersnaam. Dit vereist een koppeling van de ownCloud gebruikersnaam aan een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Aanvullend wordt ook de 'DN' gecached om het aantal LDAP-interacties te verminderen, maar dit wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden. De interne naam wordt overal gebruikt. Het wissen van de koppeling zal overal resten achterlaten. Het wissen van koppelingen is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze koppelingen nooit in een productieomgeving gewist worden. Maak ze alleen leeg in een test- of ontwikkelomgeving.",
 "Clear Username-LDAP User Mapping" => "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling",
 "Clear Groupname-LDAP Group Mapping" => "Leegmaken Groepsnaam-LDAP groep vertaling",
 "Test Configuration" => "Test configuratie",
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index 87dfe41a317..7801f73dc12 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -29,14 +29,8 @@ $TRANSLATIONS = array(
 "Password" => "Hasło",
 "For anonymous access, leave DN and Password empty." => "Dla dostępu anonimowego pozostawić DN i hasło puste.",
 "User Login Filter" => "Filtr logowania użytkownika",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definiuje filtr do zastosowania, gdy podejmowana jest próba logowania. %%uid zastępuje nazwę użytkownika w działaniu logowania.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "Użyj %%uid zastępczy, np. \"uid=%%uid\"",
 "User List Filter" => "Lista filtrów użytkownika",
-"Defines the filter to apply, when retrieving users." => "Definiuje filtry do zastosowania, podczas pobierania użytkowników.",
-"without any placeholder, e.g. \"objectClass=person\"." => "bez żadnych symboli zastępczych np. \"objectClass=person\".",
 "Group Filter" => "Grupa filtrów",
-"Defines the filter to apply, when retrieving groups." => "Definiuje filtry do zastosowania, podczas pobierania grup.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\".",
 "Connection Settings" => "Konfiguracja połączeń",
 "Configuration Active" => "Konfiguracja archiwum",
 "When unchecked, this configuration will be skipped." => "Gdy niezaznaczone, ta konfiguracja zostanie pominięta.",
@@ -49,7 +43,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Nie używaj go dodatkowo dla połączeń protokołu LDAPS, zakończy się niepowodzeniem.",
 "Case insensitve LDAP server (Windows)" => "Wielkość liter serwera LDAP (Windows)",
 "Turn off SSL certificate validation." => "Wyłączyć sprawdzanie poprawności certyfikatu SSL.",
-"Not recommended, use for testing only." => "Niezalecane, użyj tylko testowo.",
 "Cache Time-To-Live" => "Przechowuj czas życia",
 "in seconds. A change empties the cache." => "w sekundach. Zmiana opróżnia pamięć podręczną.",
 "Directory Settings" => "Ustawienia katalogów",
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index 0145e8fe2a4..88006e1b5d9 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -30,14 +30,8 @@ $TRANSLATIONS = array(
 "Password" => "Senha",
 "For anonymous access, leave DN and Password empty." => "Para acesso anônimo, deixe DN e Senha vazios.",
 "User Login Filter" => "Filtro de Login de Usuário",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define o filtro pra aplicar ao efetuar uma tentativa de login. %%uuid substitui o nome de usuário na ação de login.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "use %%uid placeholder, ex. \"uid=%%uid\"",
 "User List Filter" => "Filtro de Lista de Usuário",
-"Defines the filter to apply, when retrieving users." => "Define filtro a ser aplicado ao obter usuários.",
-"without any placeholder, e.g. \"objectClass=person\"." => "sem nenhum espaço reservado, ex. \"objectClass=person\".",
 "Group Filter" => "Filtro de Grupo",
-"Defines the filter to apply, when retrieving groups." => "Define o filtro a aplicar ao obter grupos.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sem nenhum espaço reservado, ex.  \"objectClass=posixGroup\"",
 "Connection Settings" => "Configurações de Conexão",
 "Configuration Active" => "Configuração ativa",
 "When unchecked, this configuration will be skipped." => "Quando não marcada, esta configuração será ignorada.",
@@ -51,8 +45,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Não use adicionalmente para conexões LDAPS, pois falhará.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP sensível à caixa alta (Windows)",
 "Turn off SSL certificate validation." => "Desligar validação de certificado SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Se a conexão só funciona com esta opção, importe o certificado SSL do servidor LDAP no seu servidor %s.",
-"Not recommended, use for testing only." => "Não recomendado, use somente para testes.",
 "Cache Time-To-Live" => "Cache Time-To-Live",
 "in seconds. A change empties the cache." => "em segundos. Uma mudança esvaziará o cache.",
 "Directory Settings" => "Configurações de Diretório",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 0abb049a155..b88ad18f0f6 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -29,14 +29,8 @@ $TRANSLATIONS = array(
 "Password" => "Password",
 "For anonymous access, leave DN and Password empty." => "Para acesso anónimo, deixe DN e a Palavra-passe vazios.",
 "User Login Filter" => "Filtro de login de utilizador",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define o filtro a aplicar, para aquando de uma tentativa de login. %%uid substitui o nome de utilizador utilizado.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "Use a variável %%uid , exemplo: \"uid=%%uid\"",
 "User List Filter" => "Utilizar filtro",
-"Defines the filter to apply, when retrieving users." => "Defina o filtro a aplicar, ao recuperar utilizadores.",
-"without any placeholder, e.g. \"objectClass=person\"." => "Sem variável. Exemplo: \"objectClass=pessoa\".",
 "Group Filter" => "Filtrar por grupo",
-"Defines the filter to apply, when retrieving groups." => "Defina o filtro a aplicar, ao recuperar grupos.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\".",
 "Connection Settings" => "Definições de ligação",
 "Configuration Active" => "Configuração activa",
 "When unchecked, this configuration will be skipped." => "Se não estiver marcada, esta definição não será tida em conta.",
@@ -49,7 +43,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Não utilize para adicionar ligações LDAP, irá falhar!",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP (Windows) não sensível a maiúsculas.",
 "Turn off SSL certificate validation." => "Desligar a validação de certificado SSL.",
-"Not recommended, use for testing only." => "Não recomendado, utilizado apenas para testes!",
 "Cache Time-To-Live" => "Cache do tempo de vida dos objetos no servidor",
 "in seconds. A change empties the cache." => "em segundos. Uma alteração esvazia a cache.",
 "Directory Settings" => "Definições de directorias",
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index cdc94e6a493..a0bacccb707 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -14,19 +14,12 @@ $TRANSLATIONS = array(
 "Password" => "Parolă",
 "For anonymous access, leave DN and Password empty." => "Pentru acces anonim, lăsați DN și Parolă libere.",
 "User Login Filter" => "Filtrare după Nume Utilizator",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "folosiți substituentul %%uid , d.e. \"uid=%%uid\"",
 "User List Filter" => "Filtrarea după lista utilizatorilor",
-"Defines the filter to apply, when retrieving users." => "Definește filtrele care trebui aplicate, când se peiau utilzatorii.",
-"without any placeholder, e.g. \"objectClass=person\"." => "fără substituenți, d.e. \"objectClass=person\".",
 "Group Filter" => "Fitrare Grup",
-"Defines the filter to apply, when retrieving groups." => "Definește filtrele care se aplică, când se preiau grupurile.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "fără substituenți, d.e. \"objectClass=posixGroup\"",
 "Port" => "Portul",
 "Use TLS" => "Utilizează TLS",
 "Case insensitve LDAP server (Windows)" => "Server LDAP insensibil la majuscule (Windows)",
 "Turn off SSL certificate validation." => "Oprește validarea certificatelor SSL ",
-"Not recommended, use for testing only." => "Nu este recomandat, a se utiliza doar pentru testare.",
 "in seconds. A change empties the cache." => "în secunde. O schimbare curăță memoria tampon.",
 "User Display Name Field" => "Câmpul cu numele vizibil al utilizatorului",
 "Base User Tree" => "Arborele de bază al Utilizatorilor",
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index ef115f6bbd7..f26e26f1e77 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -30,14 +30,8 @@ $TRANSLATIONS = array(
 "Password" => "Пароль",
 "For anonymous access, leave DN and Password empty." => "Для анонимного доступа оставьте DN и пароль пустыми.",
 "User Login Filter" => "Фильтр входа пользователей",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "используйте заполнитель %%uid, например: \"uid=%%uid\"",
 "User List Filter" => "Фильтр списка пользователей",
-"Defines the filter to apply, when retrieving users." => "Определяет фильтр для применения при получении пользователей.",
-"without any placeholder, e.g. \"objectClass=person\"." => "без заполнителя, например: \"objectClass=person\".",
 "Group Filter" => "Фильтр группы",
-"Defines the filter to apply, when retrieving groups." => "Определяет фильтр для применения при получении группы.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без заполнения, например \"objectClass=posixGroup\".",
 "Connection Settings" => "Настройки подключения",
 "Configuration Active" => "Конфигурация активна",
 "When unchecked, this configuration will be skipped." => "Когда галочка снята, эта конфигурация будет пропущена.",
@@ -50,7 +44,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Не используйте совместно с безопасными подключениями (LDAPS), это не сработает.",
 "Case insensitve LDAP server (Windows)" => "Нечувствительный к регистру сервер LDAP (Windows)",
 "Turn off SSL certificate validation." => "Отключить проверку сертификата SSL.",
-"Not recommended, use for testing only." => "Не рекомендуется, используйте только для тестирования.",
 "Cache Time-To-Live" => "Кэш времени жизни",
 "in seconds. A change empties the cache." => "в секундах. Изменение очистит кэш.",
 "Directory Settings" => "Настройки каталога",
diff --git a/apps/user_ldap/l10n/si_LK.php b/apps/user_ldap/l10n/si_LK.php
index 21c8f047ff6..5d2db636cf0 100644
--- a/apps/user_ldap/l10n/si_LK.php
+++ b/apps/user_ldap/l10n/si_LK.php
@@ -9,10 +9,8 @@ $TRANSLATIONS = array(
 "User Login Filter" => "පරිශීලක පිවිසුම් පෙරහන",
 "User List Filter" => "පරිශීලක ලැයිස්තු පෙරහන",
 "Group Filter" => "කණ්ඩායම් පෙරහන",
-"Defines the filter to apply, when retrieving groups." => "කණ්ඩායම් සොයා ලබාගන්නා විට, යොදන පෙරහන නියම කරයි",
 "Port" => "තොට",
 "Use TLS" => "TLS භාවිතා කරන්න",
-"Not recommended, use for testing only." => "නිර්දේශ කළ නොහැක. පරීක්ෂණ සඳහා පමණක් භාවිත කරන්න",
 "Help" => "උදව්"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index f02828daf70..c5bb6a8a50c 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -30,14 +30,8 @@ $TRANSLATIONS = array(
 "Password" => "Heslo",
 "For anonymous access, leave DN and Password empty." => "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.",
 "User Login Filter" => "Filter prihlásenia používateľov",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "použite zástupný vzor %%uid, napr. \\\"uid=%%uid\\\"",
 "User List Filter" => "Filter zoznamov používateľov",
-"Defines the filter to apply, when retrieving users." => "Definuje použitý filter, pre získanie používateľov.",
-"without any placeholder, e.g. \"objectClass=person\"." => "bez zástupných znakov, napr. \"objectClass=person\"",
 "Group Filter" => "Filter skupiny",
-"Defines the filter to apply, when retrieving groups." => "Definuje použitý filter, pre získanie skupín.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez zástupných znakov, napr. \"objectClass=posixGroup\"",
 "Connection Settings" => "Nastavenie pripojenia",
 "Configuration Active" => "Nastavenia sú aktívne ",
 "When unchecked, this configuration will be skipped." => "Ak nie je zaškrtnuté, nastavenie bude preskočené.",
@@ -51,8 +45,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Nepoužívajte pre pripojenie LDAPS, zlyhá.",
 "Case insensitve LDAP server (Windows)" => "LDAP server nerozlišuje veľkosť znakov (Windows)",
 "Turn off SSL certificate validation." => "Vypnúť overovanie SSL certifikátu.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Ak pripojenie pracuje len s touto možnosťou, tak naimportujte SSL certifikát LDAP servera do vášho %s servera.",
-"Not recommended, use for testing only." => "Nie je doporučované, len pre testovacie účely.",
 "Cache Time-To-Live" => "Životnosť objektov v cache",
 "in seconds. A change empties the cache." => "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť.",
 "Directory Settings" => "Nastavenie priečinka",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 80abb79e495..703b643db58 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -29,14 +29,8 @@ $TRANSLATIONS = array(
 "Password" => "Geslo",
 "For anonymous access, leave DN and Password empty." => "Za brezimni dostop sta polji DN in geslo prazni.",
 "User Login Filter" => "Filter prijav uporabnikov",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime v postopku prijave.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "Uporabite vsebnik %%uid, npr. \"uid=%%uid\".",
 "User List Filter" => "Filter seznama uporabnikov",
-"Defines the filter to apply, when retrieving users." => "Določi filter za uporabo med pridobivanjem uporabnikov.",
-"without any placeholder, e.g. \"objectClass=person\"." => "Brez kateregakoli vsebnika, npr. \"objectClass=person\".",
 "Group Filter" => "Filter skupin",
-"Defines the filter to apply, when retrieving groups." => "Določi filter za uporabo med pridobivanjem skupin.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\".",
 "Connection Settings" => "Nastavitve povezave",
 "Configuration Active" => "Dejavna nastavitev",
 "When unchecked, this configuration will be skipped." => "Neizbrana možnost preskoči nastavitev.",
@@ -49,7 +43,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Strežnika ni priporočljivo uporabljati za povezave LDAPS. Povezava bo spodletela.",
 "Case insensitve LDAP server (Windows)" => "Strežnik LDAP ne upošteva velikosti črk (Windows)",
 "Turn off SSL certificate validation." => "Onemogoči določanje veljavnosti potrdila SSL.",
-"Not recommended, use for testing only." => "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja.",
 "Cache Time-To-Live" => "Predpomni podatke TTL",
 "in seconds. A change empties the cache." => "v sekundah. Sprememba izprazni predpomnilnik.",
 "Directory Settings" => "Nastavitve mape",
diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
index 7dd12fe5cca..d0c9290dc19 100644
--- a/apps/user_ldap/l10n/sr.php
+++ b/apps/user_ldap/l10n/sr.php
@@ -10,19 +10,12 @@ $TRANSLATIONS = array(
 "Password" => "Лозинка",
 "For anonymous access, leave DN and Password empty." => "За анониман приступ, оставите поља DN и лозинка празним.",
 "User Login Filter" => "Филтер за пријаву корисника",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Одређује филтер за примењивање при покушају пријаве. %%uid замењује корисничко име.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "користите чувар места %%uid, нпр. „uid=%%uid\"",
 "User List Filter" => "Филтер за списак корисника",
-"Defines the filter to apply, when retrieving users." => "Одређује филтер за примењивање при прибављању корисника.",
-"without any placeholder, e.g. \"objectClass=person\"." => "без икаквог чувара места, нпр. „objectClass=person“.",
 "Group Filter" => "Филтер групе",
-"Defines the filter to apply, when retrieving groups." => "Одређује филтер за примењивање при прибављању група.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без икаквог чувара места, нпр. „objectClass=posixGroup“.",
 "Port" => "Порт",
 "Use TLS" => "Користи TLS",
 "Case insensitve LDAP server (Windows)" => "LDAP сервер осетљив на велика и мала слова (Windows)",
 "Turn off SSL certificate validation." => "Искључите потврду SSL сертификата.",
-"Not recommended, use for testing only." => "Не препоручује се; користите само за тестирање.",
 "in seconds. A change empties the cache." => "у секундама. Промена испражњава кеш меморију.",
 "User Display Name Field" => "Име приказа корисника",
 "Base User Tree" => "Основно стабло корисника",
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index d5d47074bed..c7fb33195d7 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -30,14 +30,8 @@ $TRANSLATIONS = array(
 "Password" => "Lösenord",
 "For anonymous access, leave DN and Password empty." => "För anonym åtkomst, lämna DN och lösenord tomt.",
 "User Login Filter" => "Filter logga in användare",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definierar filter att tillämpa vid inloggningsförsök. %% uid ersätter användarnamn i loginåtgärden.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "använd platshållare %%uid, t ex \"uid=%%uid\"",
 "User List Filter" => "Filter lista användare",
-"Defines the filter to apply, when retrieving users." => "Definierar filter att tillämpa vid listning av användare.",
-"without any placeholder, e.g. \"objectClass=person\"." => "utan platshållare, t.ex. \"objectClass=person\".",
 "Group Filter" => "Gruppfilter",
-"Defines the filter to apply, when retrieving groups." => "Definierar filter att tillämpa vid listning av grupper.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "utan platshållare, t.ex. \"objectClass=posixGroup\".",
 "Connection Settings" => "Uppkopplingsinställningar",
 "Configuration Active" => "Konfiguration aktiv",
 "When unchecked, this configuration will be skipped." => "Ifall denna är avbockad så kommer konfigurationen att skippas.",
@@ -51,8 +45,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Använd inte för LDAPS-anslutningar, det kommer inte att fungera.",
 "Case insensitve LDAP server (Windows)" => "LDAP-servern är okänslig för gemener och versaler (Windows)",
 "Turn off SSL certificate validation." => "Stäng av verifiering av SSL-certifikat.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Om anslutningen bara fungerar med detta alternativ, importera LDAP-serverns SSL-certifikat i din% s server.",
-"Not recommended, use for testing only." => "Rekommenderas inte, använd bara för test. ",
 "Cache Time-To-Live" => "Cache Time-To-Live",
 "in seconds. A change empties the cache." => "i sekunder. En förändring tömmer cache.",
 "Directory Settings" => "Mappinställningar",
diff --git a/apps/user_ldap/l10n/ta_LK.php b/apps/user_ldap/l10n/ta_LK.php
index 6a541ca2d52..25053f2e3d1 100644
--- a/apps/user_ldap/l10n/ta_LK.php
+++ b/apps/user_ldap/l10n/ta_LK.php
@@ -8,12 +8,10 @@ $TRANSLATIONS = array(
 "You can specify Base DN for users and groups in the Advanced tab" => "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் ",
 "User DN" => "பயனாளர்  DN",
 "Password" => "கடவுச்சொல்",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "எந்த ஒதுக்கீடும் இல்லாமல், உதாரணம். \"objectClass=posixGroup\".",
 "Port" => "துறை ",
 "Use TLS" => "TLS ஐ பயன்படுத்தவும்",
 "Case insensitve LDAP server (Windows)" => "உணர்ச்சியான LDAP சேவையகம் (சாளரங்கள்)",
 "Turn off SSL certificate validation." => "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்",
-"Not recommended, use for testing only." => "பரிந்துரைக்கப்படவில்லை, சோதனைக்காக மட்டும் பயன்படுத்தவும்.",
 "in seconds. A change empties the cache." => "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்.",
 "User Display Name Field" => "பயனாளர் காட்சிப்பெயர் புலம்",
 "Base User Tree" => "தள பயனாளர் மரம்",
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index 34739cb5178..91d93e1235c 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -26,21 +26,14 @@ $TRANSLATIONS = array(
 "Password" => "รหัสผ่าน",
 "For anonymous access, leave DN and Password empty." => "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้",
 "User Login Filter" => "ตัวกรองข้อมูลการเข้าสู่ระบบของผู้ใช้งาน",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "กำหนดตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อมีความพยายามในการเข้าสู่ระบบ %%uid จะถูกนำไปแทนที่ชื่อผู้ใช้งานในการกระทำของการเข้าสู่ระบบ",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\"",
 "User List Filter" => "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน",
-"Defines the filter to apply, when retrieving users." => "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน",
-"without any placeholder, e.g. \"objectClass=person\"." => "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\",",
 "Group Filter" => "ตัวกรองข้อมูลกลุ่ม",
-"Defines the filter to apply, when retrieving groups." => "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\",",
 "Connection Settings" => "ตั้งค่าการเชื่อมต่อ",
 "Port" => "พอร์ต",
 "Disable Main Server" => "ปิดใช้งานเซิร์ฟเวอร์หลัก",
 "Use TLS" => "ใช้ TLS",
 "Case insensitve LDAP server (Windows)" => "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)",
 "Turn off SSL certificate validation." => "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL",
-"Not recommended, use for testing only." => "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น",
 "in seconds. A change empties the cache." => "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า",
 "Directory Settings" => "ตั้งค่าไดเร็กทอรี่",
 "User Display Name Field" => "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ",
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index e334ffcc8f5..fc9cceddf03 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -26,14 +26,8 @@ $TRANSLATIONS = array(
 "Password" => "Parola",
 "For anonymous access, leave DN and Password empty." => "Anonim erişim için DN ve Parola alanlarını boş bırakın.",
 "User Login Filter" => "Kullanıcı Oturum Filtresi",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Filter uyunlamak icin tayin ediyor, ne zaman girişmek isteminiz. % % uid adi kullanici girismeye karsi koymacak. ",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\"",
 "User List Filter" => "Kullanıcı Liste Filtresi",
-"Defines the filter to apply, when retrieving users." => "Filter uyunmak icin tayin ediyor, ne zaman adi  kullanici geri aliyor. ",
-"without any placeholder, e.g. \"objectClass=person\"." => "bir yer tutucusu olmadan, örneğin \"objectClass=person\"",
 "Group Filter" => "Grup Süzgeci",
-"Defines the filter to apply, when retrieving groups." => "Filter uyunmak icin tayin ediyor, ne zaman grubalari tekrar aliyor. ",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "siz bir yer tutucu, mes. 'objectClass=posixGroup ('posixGrubu''. ",
 "Connection Settings" => "Bağlantı ayarları",
 "When unchecked, this configuration will be skipped." => "Ne zaman iptal, bu uynnlama isletici ",
 "Port" => "Port",
@@ -45,7 +39,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Bu LDAPS baglama icin kullamaminiz, basamacak. ",
 "Case insensitve LDAP server (Windows)" => "Dusme sunucu LDAP zor degil. (Windows)",
 "Turn off SSL certificate validation." => "SSL sertifika doğrulamasını kapat.",
-"Not recommended, use for testing only." => "Önerilmez, sadece test için kullanın.",
 "Cache Time-To-Live" => "Cache Time-To-Live ",
 "in seconds. A change empties the cache." => "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir.",
 "Directory Settings" => "Parametrar Listesin Adresinin ",
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index ebf7dbd5d84..5fb52761215 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -27,14 +27,8 @@ $TRANSLATIONS = array(
 "Password" => "Пароль",
 "For anonymous access, leave DN and Password empty." => "Для анонімного доступу, залиште DN і Пароль порожніми.",
 "User Login Filter" => "Фільтр Користувачів, що під'єднуються",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Визначає фільтр, який застосовується при спробі входу. %%uid замінює ім'я користувача при вході.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\"",
 "User List Filter" => "Фільтр Списку Користувачів",
-"Defines the filter to apply, when retrieving users." => "Визначає фільтр, який застосовується при отриманні користувачів",
-"without any placeholder, e.g. \"objectClass=person\"." => "без будь-якого заповнювача, наприклад: \"objectClass=person\".",
 "Group Filter" => "Фільтр Груп",
-"Defines the filter to apply, when retrieving groups." => "Визначає фільтр, який застосовується при отриманні груп.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\".",
 "Connection Settings" => "Налаштування З'єднання",
 "Configuration Active" => "Налаштування Активне",
 "When unchecked, this configuration will be skipped." => "Якщо \"галочка\" знята, ця конфігурація буде пропущена.",
@@ -47,7 +41,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Не використовуйте це додатково для під'єднання до LDAP, бо виконано не буде.",
 "Case insensitve LDAP server (Windows)" => "Нечутливий до регістру LDAP сервер (Windows)",
 "Turn off SSL certificate validation." => "Вимкнути перевірку SSL сертифіката.",
-"Not recommended, use for testing only." => "Не рекомендується, використовуйте лише для тестів.",
 "Cache Time-To-Live" => "Час актуальності Кеша",
 "in seconds. A change empties the cache." => "в секундах. Зміна очищує кеш.",
 "Directory Settings" => "Налаштування Каталога",
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
index c4fe9b73bcc..7ef961df7ad 100644
--- a/apps/user_ldap/l10n/vi.php
+++ b/apps/user_ldap/l10n/vi.php
@@ -12,14 +12,8 @@ $TRANSLATIONS = array(
 "Password" => "Mật khẩu",
 "For anonymous access, leave DN and Password empty." => "Cho phép truy cập nặc danh , DN và mật khẩu trống.",
 "User Login Filter" => "Lọc người dùng đăng nhập",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Xác định các bộ lọc để áp dụng, khi đăng nhập . uid%% thay thế tên người dùng trong các lần đăng nhập.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "use %%uid placeholder, e.g. \"uid=%%uid\"",
 "User List Filter" => "Lọc danh sách thành viên",
-"Defines the filter to apply, when retrieving users." => "Xác định các bộ lọc để áp dụng, khi người dụng sử dụng.",
-"without any placeholder, e.g. \"objectClass=person\"." => "mà không giữ chỗ nào, ví dụ như \"objectClass = person\".",
 "Group Filter" => "Bộ lọc nhóm",
-"Defines the filter to apply, when retrieving groups." => "Xác định các bộ lọc để áp dụng, khi nhóm sử dụng.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "mà không giữ chỗ nào, ví dụ như \"objectClass = osixGroup\".",
 "Connection Settings" => "Connection Settings",
 "Port" => "Cổng",
 "Backup (Replica) Port" => "Cổng sao lưu (Replica)",
@@ -28,7 +22,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Do not use it additionally for LDAPS connections, it will fail.",
 "Case insensitve LDAP server (Windows)" => "Trường hợp insensitve LDAP máy chủ (Windows)",
 "Turn off SSL certificate validation." => "Tắt xác thực chứng nhận SSL",
-"Not recommended, use for testing only." => "Không khuyến khích, Chỉ sử dụng để thử nghiệm.",
 "in seconds. A change empties the cache." => "trong vài giây. Một sự thay đổi bộ nhớ cache.",
 "Directory Settings" => "Directory Settings",
 "User Display Name Field" => "Hiển thị tên người sử dụng",
diff --git a/apps/user_ldap/l10n/zh_CN.GB2312.php b/apps/user_ldap/l10n/zh_CN.GB2312.php
index 92eded19b4c..306b84a588e 100644
--- a/apps/user_ldap/l10n/zh_CN.GB2312.php
+++ b/apps/user_ldap/l10n/zh_CN.GB2312.php
@@ -12,19 +12,12 @@ $TRANSLATIONS = array(
 "Password" => "密码",
 "For anonymous access, leave DN and Password empty." => "匿名访问请留空判别名和密码。",
 "User Login Filter" => "用户登录过滤器",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "定义尝试登录时要应用的过滤器。用 %%uid 替换登录操作中使用的用户名。",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "使用 %%uid 占位符，例如 \"uid=%%uid\"",
 "User List Filter" => "用户列表过滤器",
-"Defines the filter to apply, when retrieving users." => "定义撷取用户时要应用的过滤器。",
-"without any placeholder, e.g. \"objectClass=person\"." => "不能使用占位符，例如 \"objectClass=person\"。",
 "Group Filter" => "群组过滤器",
-"Defines the filter to apply, when retrieving groups." => "定义撷取群组时要应用的过滤器",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "不能使用占位符，例如 \"objectClass=posixGroup\"。",
 "Port" => "端口",
 "Use TLS" => "使用 TLS",
 "Case insensitve LDAP server (Windows)" => "大小写不敏感的 LDAP 服务器 (Windows)",
 "Turn off SSL certificate validation." => "关闭 SSL 证书校验。",
-"Not recommended, use for testing only." => "不推荐，仅供测试",
 "in seconds. A change empties the cache." => "以秒计。修改会清空缓存。",
 "User Display Name Field" => "用户显示名称字段",
 "Base User Tree" => "基本用户树",
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index 5107b7b1ab7..c30cb421505 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -29,14 +29,8 @@ $TRANSLATIONS = array(
 "Password" => "密码",
 "For anonymous access, leave DN and Password empty." => "启用匿名访问，将DN和密码保留为空",
 "User Login Filter" => "用户登录过滤",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "定义当尝试登录时的过滤器。 在登录过程中，%%uid将会被用户名替换",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "使用 %%uid作为占位符，例如“uid=%%uid”",
 "User List Filter" => "用户列表过滤",
-"Defines the filter to apply, when retrieving users." => "定义拉取用户时的过滤器",
-"without any placeholder, e.g. \"objectClass=person\"." => "没有任何占位符,如 \"objectClass=person\".",
 "Group Filter" => "组过滤",
-"Defines the filter to apply, when retrieving groups." => "定义拉取组信息时的过滤器",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "无需占位符，例如\"objectClass=posixGroup\"",
 "Connection Settings" => "连接设置",
 "Configuration Active" => "现行配置",
 "When unchecked, this configuration will be skipped." => "当反选后，此配置将被忽略。",
@@ -49,7 +43,6 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "对于 LDAPS 连接不要额外启用它，连接必然失败。",
 "Case insensitve LDAP server (Windows)" => "大小写敏感LDAP服务器(Windows)",
 "Turn off SSL certificate validation." => "关闭SSL证书验证",
-"Not recommended, use for testing only." => "暂不推荐，仅供测试",
 "Cache Time-To-Live" => "缓存存活时间",
 "in seconds. A change empties the cache." => "以秒计。修改将清空缓存。",
 "Directory Settings" => "目录设置",
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index 84e1f83aefc..38bed895742 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -27,14 +27,8 @@ $TRANSLATIONS = array(
 "Password" => "密碼",
 "For anonymous access, leave DN and Password empty." => "匿名連接時請將DN與密碼欄位留白",
 "User Login Filter" => "使用者登入過濾器",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "試圖登入時會定義要套用的篩選器。登入過程中%%uid會取代使用者名稱。",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "請使用 %%uid placeholder，例如:\"uid=%%uid\"",
 "User List Filter" => "使用者名單篩選器",
-"Defines the filter to apply, when retrieving users." => "檢索使用者時定義要套用的篩選器",
-"without any placeholder, e.g. \"objectClass=person\"." => "請勿使用任何placeholder，例如:\"objectClass=person\"。",
 "Group Filter" => "群組篩選器",
-"Defines the filter to apply, when retrieving groups." => "檢索群組時，定義要套用的篩選器",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "請勿使用任何placeholder，例如:\"objectClass=posixGroup\"。",
 "Connection Settings" => "連線設定",
 "Configuration Active" => "設定為主動模式",
 "When unchecked, this configuration will be skipped." => "沒有被勾選時，此設定會被略過。",
@@ -46,7 +40,6 @@ $TRANSLATIONS = array(
 "Use TLS" => "使用TLS",
 "Case insensitve LDAP server (Windows)" => "不區分大小寫的LDAP伺服器(Windows)",
 "Turn off SSL certificate validation." => "關閉 SSL 憑證驗證",
-"Not recommended, use for testing only." => "不推薦使用，僅供測試用途。",
 "Cache Time-To-Live" => "快取的存活時間",
 "in seconds. A change empties the cache." => "以秒為單位。更變後會清空快取。",
 "Directory Settings" => "目錄選項",
diff --git a/apps/user_webdavauth/l10n/zh_TW.php b/apps/user_webdavauth/l10n/zh_TW.php
index 304ecdaf4f3..013a1652f32 100644
--- a/apps/user_webdavauth/l10n/zh_TW.php
+++ b/apps/user_webdavauth/l10n/zh_TW.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV 認證"
+"WebDAV Authentication" => "WebDAV 認證",
+"Address: " => "為址",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "使用者憑證將會被傳送到此位址。此外掛程式將會檢查回應，HTTP statuscodes 401與403將會被理解為無效憑證，而所有其他的回應將會被理解為有效憑證。"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index ed5989e43bd..41447055609 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -31,8 +31,6 @@ $TRANSLATIONS = array(
 "Log out" => "Teken uit",
 "Lost your password?" => "Jou wagwoord verloor?",
 "remember" => "onthou",
-"Log in" => "Teken aan",
-"prev" => "vorige",
-"next" => "volgende"
+"Log in" => "Teken aan"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index b61b5cd060a..84f076f3018 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -40,7 +40,6 @@ $TRANSLATIONS = array(
 "last year" => "السنةالماضية",
 "years ago" => "سنة مضت",
 "Choose" => "اختيار",
-"Cancel" => "الغاء",
 "Yes" => "نعم",
 "No" => "لا",
 "Ok" => "موافق",
@@ -122,8 +121,6 @@ $TRANSLATIONS = array(
 "remember" => "تذكر",
 "Log in" => "أدخل",
 "Alternative Logins" => "اسماء دخول بديلة",
-"prev" => "السابق",
-"next" => "التالي",
 "Updating ownCloud to version %s, this may take a while." => "جاري تحديث Owncloud الى اصدار %s , قد يستغرق هذا بعض الوقت."
 );
 $PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/core/l10n/be.php b/core/l10n/be.php
index de1b24e4a7a..83f0d99a2e4 100644
--- a/core/l10n/be.php
+++ b/core/l10n/be.php
@@ -5,8 +5,6 @@ $TRANSLATIONS = array(
 "_%n day ago_::_%n days ago_" => array("","","",""),
 "_%n month ago_::_%n months ago_" => array("","","",""),
 "Advanced" => "Дасведчаны",
-"Finish setup" => "Завяршыць ўстаноўку.",
-"prev" => "Папярэдняя",
-"next" => "Далей"
+"Finish setup" => "Завяршыць ўстаноўку."
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index d79fe87c8f0..8afe42f206b 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -31,7 +31,6 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "последната година",
 "years ago" => "последните години",
-"Cancel" => "Отказ",
 "Yes" => "Да",
 "No" => "Не",
 "Ok" => "Добре",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "Log out" => "Изход",
 "Lost your password?" => "Забравена парола?",
 "remember" => "запомни",
-"Log in" => "Вход",
-"prev" => "пред.",
-"next" => "следващо"
+"Log in" => "Вход"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index b9227e1e61e..5e65d681ec2 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -39,7 +39,6 @@ $TRANSLATIONS = array(
 "last year" => "গত বছর",
 "years ago" => "বছর পূর্বে",
 "Choose" => "বেছে নিন",
-"Cancel" => "বাতির",
 "Yes" => "হ্যাঁ",
 "No" => "না",
 "Ok" => "তথাস্তু",
@@ -111,8 +110,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "কূটশব্দ হারিয়েছেন?",
 "remember" => "মনে রাখ",
 "Log in" => "প্রবেশ",
-"prev" => "পূর্ববর্তী",
-"next" => "পরবর্তী",
 "Updating ownCloud to version %s, this may take a while." => "%s ভার্সনে ownCloud পরিবর্ধন করা হচ্ছে, এজন্য কিছু সময় প্রয়োজন।"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 41b85875e77..3b8b57e8ac1 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "l'any passat",
 "years ago" => "anys enrere",
 "Choose" => "Escull",
-"Cancel" => "Cancel·la",
 "Error loading file picker template" => "Error en carregar la plantilla del seleccionador de fitxers",
 "Yes" => "Sí",
 "No" => "No",
@@ -134,8 +133,6 @@ $TRANSLATIONS = array(
 "Log in" => "Inici de sessió",
 "Alternative Logins" => "Acreditacions alternatives",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ei,<br><br>només fer-te saber que %s ha compartit %s amb tu.<br><a href=\"%s\">Mira-ho:</a><br><br>Salut!",
-"prev" => "anterior",
-"next" => "següent",
 "Updating ownCloud to version %s, this may take a while." => "S'està actualitzant ownCloud a la versió %s, pot trigar una estona."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index f984d1e526b..78614eef0e7 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -30,18 +30,17 @@ $TRANSLATIONS = array(
 "December" => "Prosinec",
 "Settings" => "Nastavení",
 "seconds ago" => "před pár vteřinami",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n minute ago_::_%n minutes ago_" => array("před %n minutou","před %n minutami","před %n minutami"),
+"_%n hour ago_::_%n hours ago_" => array("před %n hodinou","před %n hodinami","před %n hodinami"),
 "today" => "dnes",
 "yesterday" => "včera",
-"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("před %n dnem","před %n dny","před %n dny"),
 "last month" => "minulý měsíc",
-"_%n month ago_::_%n months ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("před %n měsícem","před %n měsíci","před %n měsíci"),
 "months ago" => "před měsíci",
 "last year" => "minulý rok",
 "years ago" => "před lety",
 "Choose" => "Vybrat",
-"Cancel" => "Zrušit",
 "Error loading file picker template" => "Chyba při načítání šablony výběru souborů",
 "Yes" => "Ano",
 "No" => "Ne",
@@ -84,6 +83,7 @@ $TRANSLATIONS = array(
 "Email sent" => "E-mail odeslán",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">evidence chyb ownCloud</a>",
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
+"%s password reset" => "reset hesla %s",
 "Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu.<br>Pokud jej v krátké době neobdržíte, zkontrolujte váš koš a složku spam.<br>Pokud jej nenaleznete, kontaktujte svého správce.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Požadavek selhal!<br>Ujistili jste se, že vaše uživatelské jméno a e-mail jsou správně?",
@@ -135,8 +135,6 @@ $TRANSLATIONS = array(
 "Log in" => "Přihlásit",
 "Alternative Logins" => "Alternativní přihlášení",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ahoj,<br><br>jenom vám chci oznámit, že %s s vámi sdílí %s.\nPodívat se můžete <br><a href=\"%s\">zde</a>.<br><br>Díky",
-"prev" => "předchozí",
-"next" => "následující",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index 0123b098485..442970fbb0b 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -40,7 +40,6 @@ $TRANSLATIONS = array(
 "last year" => "y llynedd",
 "years ago" => "blwyddyn yn ôl",
 "Choose" => "Dewisiwch",
-"Cancel" => "Diddymu",
 "Yes" => "Ie",
 "No" => "Na",
 "Ok" => "Iawn",
@@ -125,8 +124,6 @@ $TRANSLATIONS = array(
 "remember" => "cofio",
 "Log in" => "Mewngofnodi",
 "Alternative Logins" => "Mewngofnodiadau Amgen",
-"prev" => "blaenorol",
-"next" => "nesaf",
 "Updating ownCloud to version %s, this may take a while." => "Yn diweddaru owncloud i fersiwn %s, gall hyn gymryd amser."
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/core/l10n/da.php b/core/l10n/da.php
index f028331f891..79ccc20d495 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "sidste år",
 "years ago" => "år siden",
 "Choose" => "Vælg",
-"Cancel" => "Annuller",
 "Error loading file picker template" => "Fejl ved indlæsning af filvælger skabelon",
 "Yes" => "Ja",
 "No" => "Nej",
@@ -136,8 +135,6 @@ $TRANSLATIONS = array(
 "Log in" => "Log ind",
 "Alternative Logins" => "Alternative logins",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>dette blot for at lade dig vide, at %s har delt \"%s\" med dig.<br><a href=\"%s\">Se det!</a><br><br>Hej",
-"prev" => "forrige",
-"next" => "næste",
 "Updating ownCloud to version %s, this may take a while." => "Opdatere Owncloud til version %s, dette kan tage et stykke tid."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de.php b/core/l10n/de.php
index c4b22ecd874..2fe2f564124 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
 "Choose" => "Auswählen",
-"Cancel" => "Abbrechen",
 "Error loading file picker template" => "Dateiauswahltemplate konnte nicht geladen werden",
 "Yes" => "Ja",
 "No" => "Nein",
@@ -136,8 +135,6 @@ $TRANSLATIONS = array(
 "Log in" => "Einloggen",
 "Alternative Logins" => "Alternative Logins",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br/><br/>wollte dich nur kurz informieren, dass %s gerade %s mit dir geteilt hat.<br/><a href=\"%s\">Schau es dir an.</a><br/><br/>Gruß!",
-"prev" => "Zurück",
-"next" => "Weiter",
 "Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index 81c74d841ee..3e622ace6f6 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
 "Choose" => "Auswählen",
-"Cancel" => "Abbrechen",
 "Error loading file picker template" => "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten.",
 "Yes" => "Ja",
 "No" => "Nein",
@@ -135,8 +134,6 @@ $TRANSLATIONS = array(
 "Log in" => "Einloggen",
 "Alternative Logins" => "Alternative Logins",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele Grüsse!",
-"prev" => "Zurück",
-"next" => "Weiter",
 "Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index a323fd08193..60f5418727a 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
 "Choose" => "Auswählen",
-"Cancel" => "Abbrechen",
 "Error loading file picker template" => "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten.",
 "Yes" => "Ja",
 "No" => "Nein",
@@ -136,8 +135,6 @@ $TRANSLATIONS = array(
 "Log in" => "Einloggen",
 "Alternative Logins" => "Alternative Logins",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele Grüße!",
-"prev" => "Zurück",
-"next" => "Weiter",
 "Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 330a29e2743..51a3a68d788 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "τελευταίο χρόνο",
 "years ago" => "χρόνια πριν",
 "Choose" => "Επιλέξτε",
-"Cancel" => "Άκυρο",
 "Error loading file picker template" => "Σφάλμα φόρτωσης αρχείου επιλογέα προτύπου",
 "Yes" => "Ναι",
 "No" => "Όχι",
@@ -134,8 +133,6 @@ $TRANSLATIONS = array(
 "Log in" => "Είσοδος",
 "Alternative Logins" => "Εναλλακτικές Συνδέσεις",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Γεια σας,<br><br>σας ενημερώνουμε ότι ο %s διαμοιράστηκε μαζί σας το »%s«.<br><a href=\"%s\">Δείτε το!</a><br><br>Γεια χαρά!",
-"prev" => "προηγούμενο",
-"next" => "επόμενο",
 "Updating ownCloud to version %s, this may take a while." => "Ενημερώνοντας το ownCloud στην έκδοση %s,μπορεί να πάρει λίγο χρόνο."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 66fc435fec7..fc688b103a6 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "lastajare",
 "years ago" => "jaroj antaŭe",
 "Choose" => "Elekti",
-"Cancel" => "Nuligi",
 "Yes" => "Jes",
 "No" => "Ne",
 "Ok" => "Akcepti",
@@ -126,8 +125,6 @@ $TRANSLATIONS = array(
 "Log in" => "Ensaluti",
 "Alternative Logins" => "Alternativaj ensalutoj",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Saluton:<br /><br />Ni nur sciigas vin, ke %s kunhavigis “%s” kun vi.<br /><a href=\"%s\">Vidu ĝin</a><br /><br />Ĝis!",
-"prev" => "maljena",
-"next" => "jena",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud ĝisdatiĝas al eldono %s, tio ĉi povas daŭri je iom da tempo."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es.php b/core/l10n/es.php
index fba08b9f60a..9e7f5656683 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "el año pasado",
 "years ago" => "hace años",
 "Choose" => "Seleccionar",
-"Cancel" => "Cancelar",
 "Error loading file picker template" => "Error cargando la plantilla del seleccionador de archivos",
 "Yes" => "Sí",
 "No" => "No",
@@ -134,8 +133,6 @@ $TRANSLATIONS = array(
 "Log in" => "Entrar",
 "Alternative Logins" => "Inicios de sesión alternativos",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Oye,<br><br>sólo te hago saber que %s compartido %s contigo,<br><a href=\"%s\">\nMíralo!</a><br><br>Disfrutalo!",
-"prev" => "anterior",
-"next" => "siguiente",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 68c501e05a3..cd51ba2f441 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "el año pasado",
 "years ago" => "años atrás",
 "Choose" => "Elegir",
-"Cancel" => "Cancelar",
 "Error loading file picker template" => "Error al cargar la plantilla del seleccionador de archivos",
 "Yes" => "Sí",
 "No" => "No",
@@ -132,8 +131,6 @@ $TRANSLATIONS = array(
 "Log in" => "Iniciar sesión",
 "Alternative Logins" => "Nombre alternativos de usuarios",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hola,<br><br>Simplemente te informo que %s compartió %s con vos.<br><a href=\"%s\">Miralo acá:</a><br><br>¡Chau!",
-"prev" => "anterior",
-"next" => "siguiente",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede demorar un rato."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 5524411e77d..8c2fb2804dd 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "viimasel aastal",
 "years ago" => "aastat tagasi",
 "Choose" => "Vali",
-"Cancel" => "Loobu",
 "Error loading file picker template" => "Viga failivalija malli laadimisel",
 "Yes" => "Jah",
 "No" => "Ei",
@@ -135,8 +134,6 @@ $TRANSLATIONS = array(
 "Log in" => "Logi sisse",
 "Alternative Logins" => "Alternatiivsed sisselogimisviisid",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hei,<br><br>lihtsalt annan sulle teada, et %s jagas sinuga »%s«.<br><a href=\"%s\">Vaata seda!</a><br><br>Tervitades!",
-"prev" => "eelm",
-"next" => "järgm",
 "Updating ownCloud to version %s, this may take a while." => "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 5ab0e032e4b..280c5a94b60 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "joan den urtean",
 "years ago" => "urte",
 "Choose" => "Aukeratu",
-"Cancel" => "Ezeztatu",
 "Error loading file picker template" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan",
 "Yes" => "Bai",
 "No" => "Ez",
@@ -134,8 +133,6 @@ $TRANSLATIONS = array(
 "Log in" => "Hasi saioa",
 "Alternative Logins" => "Beste erabiltzaile izenak",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.<br><a href=\"%s\">\nIkusi ezazu</a><br><br>Ongi jarraitu!",
-"prev" => "aurrekoa",
-"next" => "hurrengoa",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud %s bertsiora eguneratzen, denbora har dezake."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index f9af8787e0a..a9e17a194ae 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "سال قبل",
 "years ago" => "سال‌های قبل",
 "Choose" => "انتخاب کردن",
-"Cancel" => "منصرف شدن",
 "Error loading file picker template" => "خطا در بارگذاری قالب انتخاب کننده فایل",
 "Yes" => "بله",
 "No" => "نه",
@@ -132,8 +131,6 @@ $TRANSLATIONS = array(
 "Log in" => "ورود",
 "Alternative Logins" => "ورود متناوب",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "اینجا<br><br> فقط به شما اجازه میدهد که بدانید %s به اشتراک گذاشته شده»%s« توسط شما.<br><a href=\"%s\"> مشاهده آن!</a><br><br> به سلامتی!",
-"prev" => "بازگشت",
-"next" => "بعدی",
 "Updating ownCloud to version %s, this may take a while." => "به روز رسانی OwnCloud به نسخه ی %s، این عملیات ممکن است زمان بر باشد."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 22d35c14716..d3cfe01293e 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -39,7 +39,6 @@ $TRANSLATIONS = array(
 "last year" => "viime vuonna",
 "years ago" => "vuotta sitten",
 "Choose" => "Valitse",
-"Cancel" => "Peru",
 "Yes" => "Kyllä",
 "No" => "Ei",
 "Ok" => "Ok",
@@ -128,8 +127,6 @@ $TRANSLATIONS = array(
 "Log in" => "Kirjaudu sisään",
 "Alternative Logins" => "Vaihtoehtoiset kirjautumiset",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hei!<br><br>%s jakoi kohteen »%s« kanssasi.<br><a href=\"%s\">Katso se tästä!</a><br><br>Näkemiin!",
-"prev" => "edellinen",
-"next" => "seuraava",
 "Updating ownCloud to version %s, this may take a while." => "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 641378ac42b..3f85cb1503f 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "l'année dernière",
 "years ago" => "il y a plusieurs années",
 "Choose" => "Choisir",
-"Cancel" => "Annuler",
 "Error loading file picker template" => "Erreur de chargement du modèle du sélecteur de fichier",
 "Yes" => "Oui",
 "No" => "Non",
@@ -132,8 +131,6 @@ $TRANSLATIONS = array(
 "Log in" => "Connexion",
 "Alternative Logins" => "Logins alternatifs",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Salut,<br><br>je veux juste vous signaler %s partagé »%s« avec vous.<br><a href=\"%s\">Voyez-le!</a><br><br>Bonne continuation!",
-"prev" => "précédent",
-"next" => "suivant",
 "Updating ownCloud to version %s, this may take a while." => "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 5c505567768..9db68bbbd05 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "último ano",
 "years ago" => "anos atrás",
 "Choose" => "Escoller",
-"Cancel" => "Cancelar",
 "Error loading file picker template" => "Produciuse un erro ao cargar o modelo do selector de ficheiros",
 "Yes" => "Si",
 "No" => "Non",
@@ -136,8 +135,6 @@ $TRANSLATIONS = array(
 "Log in" => "Conectar",
 "Alternative Logins" => "Accesos alternativos",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ola,<br><br>só facerlle saber que %s compartiu «%s» con vostede.<br><a href=\"%s\">Véxao!</a><br><br>Saúdos!",
-"prev" => "anterior",
-"next" => "seguinte",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versión %s,  esto pode levar un anaco."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 6a2e5c88eeb..7f3f4dfdd32 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -40,7 +40,6 @@ $TRANSLATIONS = array(
 "last year" => "שנה שעברה",
 "years ago" => "שנים",
 "Choose" => "בחירה",
-"Cancel" => "ביטול",
 "Error loading file picker template" => "שגיאה בטעינת תבנית בחירת הקבצים",
 "Yes" => "כן",
 "No" => "לא",
@@ -126,8 +125,6 @@ $TRANSLATIONS = array(
 "remember" => "שמירת הססמה",
 "Log in" => "כניסה",
 "Alternative Logins" => "כניסות אלטרנטיביות",
-"prev" => "הקודם",
-"next" => "הבא",
 "Updating ownCloud to version %s, this may take a while." => "מעדכן את ownCloud אל גרסא %s, זה עלול לקחת זמן מה."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index 7ad75a41a1b..00cb5926d70 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -41,8 +41,6 @@ $TRANSLATIONS = array(
 "Database name" => "डेटाबेस का नाम",
 "Finish setup" => "सेटअप समाप्त करे",
 "Log out" => "लोग  आउट",
-"remember" => "याद रखें",
-"prev" => "पिछला",
-"next" => "अगला"
+"remember" => "याद रखें"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 403df77f819..97fbfb8b97f 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -34,7 +34,6 @@ $TRANSLATIONS = array(
 "last year" => "prošlu godinu",
 "years ago" => "godina",
 "Choose" => "Izaberi",
-"Cancel" => "Odustani",
 "Yes" => "Da",
 "No" => "Ne",
 "Ok" => "U redu",
@@ -93,8 +92,6 @@ $TRANSLATIONS = array(
 "Log out" => "Odjava",
 "Lost your password?" => "Izgubili ste lozinku?",
 "remember" => "zapamtiti",
-"Log in" => "Prijava",
-"prev" => "prethodan",
-"next" => "sljedeći"
+"Log in" => "Prijava"
 );
 $PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index ddec9c1e4ca..c231d7f9a44 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "tavaly",
 "years ago" => "több éve",
 "Choose" => "Válasszon",
-"Cancel" => "Mégsem",
 "Error loading file picker template" => "Nem sikerült betölteni a fájlkiválasztó sablont",
 "Yes" => "Igen",
 "No" => "Nem",
@@ -134,8 +133,6 @@ $TRANSLATIONS = array(
 "Log in" => "Bejelentkezés",
 "Alternative Logins" => "Alternatív bejelentkezés",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Üdv!<br><br>Új hír: %s megosztotta Önnel ezt:  »%s«.<br><a href=\"%s\">Itt nézhető meg!</a><br><br>Minden jót!",
-"prev" => "előző",
-"next" => "következő",
 "Updating ownCloud to version %s, this may take a while." => "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index e0d1e96f6ac..0556d5d1295 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -24,7 +24,6 @@ $TRANSLATIONS = array(
 "_%n hour ago_::_%n hours ago_" => array("",""),
 "_%n day ago_::_%n days ago_" => array("",""),
 "_%n month ago_::_%n months ago_" => array("",""),
-"Cancel" => "Cancellar",
 "Error" => "Error",
 "Share" => "Compartir",
 "Password" => "Contrasigno",
@@ -56,8 +55,6 @@ $TRANSLATIONS = array(
 "Log out" => "Clauder le session",
 "Lost your password?" => "Tu perdeva le contrasigno?",
 "remember" => "memora",
-"Log in" => "Aperir session",
-"prev" => "prev",
-"next" => "prox"
+"Log in" => "Aperir session"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 644efde9fc0..fc6cb788fb0 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -40,7 +40,6 @@ $TRANSLATIONS = array(
 "last year" => "tahun kemarin",
 "years ago" => "beberapa tahun lalu",
 "Choose" => "Pilih",
-"Cancel" => "Batal",
 "Yes" => "Ya",
 "No" => "Tidak",
 "Ok" => "Oke",
@@ -122,8 +121,6 @@ $TRANSLATIONS = array(
 "remember" => "selalu masuk",
 "Log in" => "Masuk",
 "Alternative Logins" => "Cara Alternatif untuk Masuk",
-"prev" => "sebelumnya",
-"next" => "selanjutnya",
 "Updating ownCloud to version %s, this may take a while." => "Memperbarui ownCloud ke versi %s, prosesnya akan berlangsung beberapa saat."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 5115d70ee7a..8211421cf35 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -39,7 +39,6 @@ $TRANSLATIONS = array(
 "last year" => "síðasta ári",
 "years ago" => "einhverjum árum",
 "Choose" => "Veldu",
-"Cancel" => "Hætta við",
 "Yes" => "Já",
 "No" => "Nei",
 "Ok" => "Í lagi",
@@ -118,8 +117,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "Týndir þú lykilorðinu?",
 "remember" => "muna eftir mér",
 "Log in" => "<strong>Skrá inn</strong>",
-"prev" => "fyrra",
-"next" => "næsta",
 "Updating ownCloud to version %s, this may take a while." => "Uppfæri ownCloud í útgáfu %s, það gæti tekið smá stund."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 9c55f7125a7..7a0af92070d 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "anno scorso",
 "years ago" => "anni fa",
 "Choose" => "Scegli",
-"Cancel" => "Annulla",
 "Error loading file picker template" => "Errore durante il caricamento del modello del selezionatore di file",
 "Yes" => "Sì",
 "No" => "No",
@@ -134,8 +133,6 @@ $TRANSLATIONS = array(
 "Log in" => "Accedi",
 "Alternative Logins" => "Accessi alternativi",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ehilà,<br><br>volevo solamente farti sapere che %s ha condiviso «%s» con te.<br><a href=\"%s\">Guarda!</a><br><br>Saluti!",
-"prev" => "precedente",
-"next" => "successivo",
 "Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, ciò potrebbe richiedere del tempo."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index fc184088293..31d2f92eff2 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -30,18 +30,17 @@ $TRANSLATIONS = array(
 "December" => "12月",
 "Settings" => "設定",
 "seconds ago" => "数秒前",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n 分前"),
+"_%n hour ago_::_%n hours ago_" => array("%n 時間後"),
 "today" => "今日",
 "yesterday" => "昨日",
-"_%n day ago_::_%n days ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array("%n 日後"),
 "last month" => "一月前",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n カ月後"),
 "months ago" => "月前",
 "last year" => "一年前",
 "years ago" => "年前",
 "Choose" => "選択",
-"Cancel" => "キャンセル",
 "Error loading file picker template" => "ファイルピッカーのテンプレートの読み込みエラー",
 "Yes" => "はい",
 "No" => "いいえ",
@@ -84,6 +83,7 @@ $TRANSLATIONS = array(
 "Email sent" => "メールを送信しました",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新に成功しました。この問題を <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> にレポートしてください。",
 "The update was successful. Redirecting you to ownCloud now." => "更新に成功しました。今すぐownCloudにリダイレクトします。",
+"%s password reset" => "%s パスワードリセット",
 "Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "パスワードリセットのリンクをあなたのメールアドレスに送信しました。<br>しばらくたっても受信出来ない場合は、スパム／迷惑メールフォルダを確認して下さい。<br>もしそこにもない場合は、管理者に問い合わせてください。",
 "Request failed!<br>Did you make sure your email/username was right?" => "リクエストに失敗しました！<br>あなたのメール／ユーザ名が正しいことを確認しましたか？",
@@ -135,8 +135,6 @@ $TRANSLATIONS = array(
 "Log in" => "ログイン",
 "Alternative Logins" => "代替ログイン",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>それでは。",
-"prev" => "前",
-"next" => "次",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index bf9ce1b8a46..0f4b23906d6 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -40,7 +40,6 @@ $TRANSLATIONS = array(
 "last year" => "ბოლო წელს",
 "years ago" => "წლის წინ",
 "Choose" => "არჩევა",
-"Cancel" => "უარყოფა",
 "Yes" => "კი",
 "No" => "არა",
 "Ok" => "დიახ",
@@ -122,8 +121,6 @@ $TRANSLATIONS = array(
 "remember" => "დამახსოვრება",
 "Log in" => "შესვლა",
 "Alternative Logins" => "ალტერნატიული Login–ი",
-"prev" => "წინა",
-"next" => "შემდეგი",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud–ის განახლება %s–ვერსიამდე. ეს მოითხოვს გარკვეულ დროს."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 44738a161a6..4c2d33e3010 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -40,7 +40,6 @@ $TRANSLATIONS = array(
 "last year" => "작년",
 "years ago" => "년 전",
 "Choose" => "선택",
-"Cancel" => "취소",
 "Yes" => "예",
 "No" => "아니요",
 "Ok" => "승락",
@@ -125,8 +124,6 @@ $TRANSLATIONS = array(
 "remember" => "기억하기",
 "Log in" => "로그인",
 "Alternative Logins" => "대체 ",
-"prev" => "이전",
-"next" => "다음",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud를 버전 %s(으)로 업데이트합니다. 잠시 기다려 주십시오."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
index 826fa428ef5..a2a0ff22ef6 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -23,8 +23,6 @@ $TRANSLATIONS = array(
 "Database name" => "ناوی داتابه‌یس",
 "Database host" => "هۆستی داتابه‌یس",
 "Finish setup" => "كۆتایی هات ده‌ستكاریه‌كان",
-"Log out" => "چوونەدەرەوە",
-"prev" => "پێشتر",
-"next" => "دواتر"
+"Log out" => "چوونەدەرەوە"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index a4b32698c93..8a5a28957c4 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "Lescht Joer",
 "years ago" => "Joren hir",
 "Choose" => "Auswielen",
-"Cancel" => "Ofbriechen",
 "Error loading file picker template" => "Feeler beim Luede vun der Virlag fir d'Fichiers-Selektioun",
 "Yes" => "Jo",
 "No" => "Nee",
@@ -132,8 +131,6 @@ $TRANSLATIONS = array(
 "Log in" => "Umellen",
 "Alternative Logins" => "Alternativ Umeldungen",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>ech wëll just Bescheed soen dass den/d' %s,  »%s« mat dir gedeelt huet.<br><a href=\"%s\">Kucken!</a><br><br>E schéine Bonjour!",
-"prev" => "zeréck",
-"next" => "weider",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud gëtt op d'Versioun %s aktualiséiert, dat kéint e Moment daueren."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 8a3ca044eaf..00e47488531 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -40,7 +40,6 @@ $TRANSLATIONS = array(
 "last year" => "praeitais metais",
 "years ago" => "prieš metus",
 "Choose" => "Pasirinkite",
-"Cancel" => "Atšaukti",
 "Error loading file picker template" => "Klaida pakraunant failų naršyklę",
 "Yes" => "Taip",
 "No" => "Ne",
@@ -126,8 +125,6 @@ $TRANSLATIONS = array(
 "remember" => "prisiminti",
 "Log in" => "Prisijungti",
 "Alternative Logins" => "Alternatyvūs prisijungimai",
-"prev" => "atgal",
-"next" => "kitas",
 "Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index ad9643e4835..6deb5dfda9f 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s kopīgots »%s« ar jums",
 "Category type not provided." => "Kategorijas tips nav norādīts.",
 "No category to add?" => "Nav kategoriju, ko pievienot?",
 "This category already exists: %s" => "Šāda kategorija jau eksistē — %s",
@@ -29,18 +30,18 @@ $TRANSLATIONS = array(
 "December" => "Decembris",
 "Settings" => "Iestatījumi",
 "seconds ago" => "sekundes atpakaļ",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n minute ago_::_%n minutes ago_" => array("Tagad, %n minūtes","Pirms %n minūtes","Pirms %n minūtēm"),
+"_%n hour ago_::_%n hours ago_" => array("Šodien, %n stundas","Pirms %n stundas","Pirms %n stundām"),
 "today" => "šodien",
 "yesterday" => "vakar",
-"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("Šodien, %n dienas","Pirms %n dienas","Pirms %n dienām"),
 "last month" => "pagājušajā mēnesī",
-"_%n month ago_::_%n months ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("Šomēnes, %n mēneši","Pirms %n mēneša","Pirms %n mēnešiem"),
 "months ago" => "mēnešus atpakaļ",
 "last year" => "gājušajā gadā",
 "years ago" => "gadus atpakaļ",
 "Choose" => "Izvēlieties",
-"Cancel" => "Atcelt",
+"Error loading file picker template" => "Kļūda ielādējot datņu ņēmēja veidni",
 "Yes" => "Jā",
 "No" => "Nē",
 "Ok" => "Labi",
@@ -59,6 +60,7 @@ $TRANSLATIONS = array(
 "Share with link" => "Dalīties ar saiti",
 "Password protect" => "Aizsargāt ar paroli",
 "Password" => "Parole",
+"Allow Public Upload" => "Ļaut publisko augšupielādi.",
 "Email link to person" => "Sūtīt saiti personai pa e-pastu",
 "Send" => "Sūtīt",
 "Set expiration date" => "Iestaties termiņa datumu",
@@ -81,9 +83,14 @@ $TRANSLATIONS = array(
 "Email sent" => "Vēstule nosūtīta",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atjaunināšana beidzās nesekmīgi. Lūdzu, ziņojiet par šo problēmu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kopienai</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
+"%s password reset" => "%s paroles maiņa",
 "Use the following link to reset your password: {link}" => "Izmantojiet šo saiti, lai mainītu paroli: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Saite uz paroles atjaunošanas vietu ir nosūtīta uz epastu.<br>Ja vēstu nav atnākusi, pārbaudiet epasta mēstuļu mapi.<br>Jā tās tur nav, jautājiet sistēmas administratoram.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Pieprasījums neizdevās!<br>Vai Jūs pārliecinājāties ka epasts/lietotājvārds ir pareizi?",
 "You will receive a link to reset your password via Email." => "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
 "Username" => "Lietotājvārds",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?",
+"Yes, I really want to reset my password now" => "Jā, Es tiešām vēlos mainīt savu paroli",
 "Request reset" => "Pieprasīt paroles maiņu",
 "Your password was reset" => "Jūsu parole tika nomainīta",
 "To login page" => "Uz ielogošanās lapu",
@@ -96,12 +103,16 @@ $TRANSLATIONS = array(
 "Help" => "Palīdzība",
 "Access forbidden" => "Pieeja ir liegta",
 "Cloud not found" => "Mākonis netika atrasts",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Sveiks,\nTikai daru tev zināmu ka %s dalās %s ar tevi.\nApskati to: %s\n\nJaukiņi Labiņi!",
 "Edit categories" => "Rediģēt kategoriju",
 "Add" => "Pievienot",
 "Security Warning" => "Brīdinājums par drošību",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jūsu PHP ir ievainojamība pret NULL Byte uzbrukumiem (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Lūdzu atjauniniet PHP instalāciju lai varētu droši izmantot %s.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nav pieejams drošs nejaušu skaitļu ģenerators. Lūdzu, aktivējiet PHP OpenSSL paplašinājumu.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez droša nejaušu skaitļu ģeneratora uzbrucējs var paredzēt paroļu atjaunošanas marķierus un pārņem jūsu kontu.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
 "Create an <strong>admin account</strong>" => "Izveidot <strong>administratora kontu</strong>",
 "Advanced" => "Paplašināti",
 "Data folder" => "Datu mape",
@@ -113,7 +124,9 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Datubāzes tabulas telpa",
 "Database host" => "Datubāzes serveris",
 "Finish setup" => "Pabeigt iestatīšanu",
+"%s is available. Get more information on how to update." => "%s ir pieejams. Uzziniet vairāk kā atjaunināt.",
 "Log out" => "Izrakstīties",
+"More apps" => "Vairāk programmu",
 "Automatic logon rejected!" => "Automātiskā ierakstīšanās ir noraidīta!",
 "If you did not change your password recently, your account may be compromised!" => "Ja neesat pēdējā laikā mainījis paroli, iespējams, ka jūsu konts ir kompromitēts.",
 "Please change your password to secure your account again." => "Lūdzu, nomainiet savu paroli, lai atkal nodrošinātu savu kontu.",
@@ -121,8 +134,7 @@ $TRANSLATIONS = array(
 "remember" => "atcerēties",
 "Log in" => "Ierakstīties",
 "Alternative Logins" => "Alternatīvās pieteikšanās",
-"prev" => "iepriekšējā",
-"next" => "nākamā",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Sveiks,<br><br>Tikai daru tev zināmu ka %s dalās %s ar tevi.<br><a href=\"%s\">Apskati to!</a><br><br>Jaukiņi Labiņi!",
 "Updating ownCloud to version %s, this may take a while." => "Atjaunina ownCloud uz versiju %s. Tas var aizņemt kādu laiciņu."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index b51f8c7b089..e2416dc052c 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -39,7 +39,6 @@ $TRANSLATIONS = array(
 "last year" => "минатата година",
 "years ago" => "пред години",
 "Choose" => "Избери",
-"Cancel" => "Откажи",
 "Yes" => "Да",
 "No" => "Не",
 "Ok" => "Во ред",
@@ -114,8 +113,6 @@ $TRANSLATIONS = array(
 "Please change your password to secure your account again." => "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно.",
 "Lost your password?" => "Ја заборавивте лозинката?",
 "remember" => "запамти",
-"Log in" => "Најава",
-"prev" => "претходно",
-"next" => "следно"
+"Log in" => "Најава"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 64ad88dcb40..fc3698d58d1 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -26,7 +26,6 @@ $TRANSLATIONS = array(
 "_%n hour ago_::_%n hours ago_" => array(""),
 "_%n day ago_::_%n days ago_" => array(""),
 "_%n month ago_::_%n months ago_" => array(""),
-"Cancel" => "Batal",
 "Yes" => "Ya",
 "No" => "Tidak",
 "Ok" => "Ok",
@@ -64,8 +63,6 @@ $TRANSLATIONS = array(
 "Log out" => "Log keluar",
 "Lost your password?" => "Hilang kata laluan?",
 "remember" => "ingat",
-"Log in" => "Log masuk",
-"prev" => "sebelum",
-"next" => "seterus"
+"Log in" => "Log masuk"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index e06af3efb98..1016ec5f512 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -25,7 +25,6 @@ $TRANSLATIONS = array(
 "last year" => "မနှစ်က",
 "years ago" => "နှစ် အရင်က",
 "Choose" => "ရွေးချယ်",
-"Cancel" => "ပယ်ဖျက်မည်",
 "Yes" => "ဟုတ်",
 "No" => "မဟုတ်ဘူး",
 "Ok" => "အိုကေ",
@@ -60,8 +59,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "တပ်ဆင်ခြင်းပြီးပါပြီ။",
 "Lost your password?" => "သင်၏စကားဝှက်ပျောက်သွားပြီလား။",
 "remember" => "မှတ်မိစေသည်",
-"Log in" => "ဝင်ရောက်ရန်",
-"prev" => "ယခင်",
-"next" => "နောက်သို့"
+"Log in" => "ဝင်ရောက်ရန်"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index c19e570edbd..393dc0d7d11 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -36,7 +36,6 @@ $TRANSLATIONS = array(
 "last year" => "forrige år",
 "years ago" => "år siden",
 "Choose" => "Velg",
-"Cancel" => "Avbryt",
 "Yes" => "Ja",
 "No" => "Nei",
 "Ok" => "Ok",
@@ -102,8 +101,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "Mistet passordet ditt?",
 "remember" => "husk",
 "Log in" => "Logg inn",
-"prev" => "forrige",
-"next" => "neste",
 "Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til versjon %s, dette kan ta en stund."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 7530a736330..46375756de4 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -30,18 +30,17 @@ $TRANSLATIONS = array(
 "December" => "december",
 "Settings" => "Instellingen",
 "seconds ago" => "seconden geleden",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("","%n minuten geleden"),
+"_%n hour ago_::_%n hours ago_" => array("","%n uur geleden"),
 "today" => "vandaag",
 "yesterday" => "gisteren",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("","%n dagen geleden"),
 "last month" => "vorige maand",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","%n maanden geleden"),
 "months ago" => "maanden geleden",
 "last year" => "vorig jaar",
 "years ago" => "jaar geleden",
 "Choose" => "Kies",
-"Cancel" => "Annuleer",
 "Error loading file picker template" => "Fout bij laden van bestandsselectie sjabloon",
 "Yes" => "Ja",
 "No" => "Nee",
@@ -84,6 +83,7 @@ $TRANSLATIONS = array(
 "Email sent" => "E-mail verzonden",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud.",
+"%s password reset" => "%s wachtwoord reset",
 "Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?",
@@ -135,8 +135,6 @@ $TRANSLATIONS = array(
 "Log in" => "Meld je aan",
 "Alternative Logins" => "Alternatieve inlogs",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo daar,<br><br> %s deelde »%s« met jou.<br><a href=\"%s\">Bekijk!</a><br><br>Veel plezier!",
-"prev" => "vorige",
-"next" => "volgende",
 "Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 0cc0944b879..f73cb96076e 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -40,7 +40,6 @@ $TRANSLATIONS = array(
 "last year" => "i fjor",
 "years ago" => "år sidan",
 "Choose" => "Vel",
-"Cancel" => "Avbryt",
 "Yes" => "Ja",
 "No" => "Nei",
 "Ok" => "Greitt",
@@ -125,8 +124,6 @@ $TRANSLATIONS = array(
 "remember" => "hugs",
 "Log in" => "Logg inn",
 "Alternative Logins" => "Alternative innloggingar",
-"prev" => "førre",
-"next" => "neste",
 "Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index f47776fb991..68bf2f89a2a 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -34,7 +34,6 @@ $TRANSLATIONS = array(
 "last year" => "an passat",
 "years ago" => "ans a",
 "Choose" => "Causís",
-"Cancel" => "Annula",
 "Yes" => "Òc",
 "No" => "Non",
 "Ok" => "D'accòrdi",
@@ -94,8 +93,6 @@ $TRANSLATIONS = array(
 "Log out" => "Sortida",
 "Lost your password?" => "L'as perdut lo senhal ?",
 "remember" => "bremba-te",
-"Log in" => "Dintrada",
-"prev" => "dariièr",
-"next" => "venent"
+"Log in" => "Dintrada"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 1f291be8aa0..9be10f535b7 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "w zeszłym roku",
 "years ago" => "lat temu",
 "Choose" => "Wybierz",
-"Cancel" => "Anuluj",
 "Error loading file picker template" => "Błąd podczas ładowania pliku wybranego szablonu",
 "Yes" => "Tak",
 "No" => "Nie",
@@ -135,8 +134,6 @@ $TRANSLATIONS = array(
 "Log in" => "Zaloguj",
 "Alternative Logins" => "Alternatywne loginy",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Cześć,<br><br>Informuję cię że %s udostępnia ci »%s«.\n<br><a href=\"%s\">Zobacz</a><br><br>Pozdrawiam!",
-"prev" => "wstecz",
-"next" => "naprzód",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s. Może to trochę potrwać."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 7542dd730af..8446e5270a7 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "último ano",
 "years ago" => "anos atrás",
 "Choose" => "Escolha",
-"Cancel" => "Cancelar",
 "Error loading file picker template" => "Template selecionador Erro ao carregar arquivo",
 "Yes" => "Sim",
 "No" => "Não",
@@ -136,8 +135,6 @@ $TRANSLATIONS = array(
 "Log in" => "Fazer login",
 "Alternative Logins" => "Logins alternativos",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Olá,<br><br>apenas para você saber que %s compartilhou %s com você.<br><a href=\"%s\">Veja: </a><br><br>Abraços!",
-"prev" => "anterior",
-"next" => "próximo",
 "Updating ownCloud to version %s, this may take a while." => "Atualizando ownCloud para a versão %s, isto pode levar algum tempo."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 8459176f266..25ddaa322d5 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "ano passado",
 "years ago" => "anos atrás",
 "Choose" => "Escolha",
-"Cancel" => "Cancelar",
 "Error loading file picker template" => "Erro ao carregar arquivo do separador modelo",
 "Yes" => "Sim",
 "No" => "Não",
@@ -134,8 +133,6 @@ $TRANSLATIONS = array(
 "Log in" => "Entrar",
 "Alternative Logins" => "Contas de acesso alternativas",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Olá,<br><br>Apenas para lhe informar que %s partilhou »%s« consigo.<br><a href=\"%s\">Consulte-o aqui!</a><br><br>Cumprimentos!",
-"prev" => "anterior",
-"next" => "seguinte",
 "Updating ownCloud to version %s, this may take a while." => "A actualizar o ownCloud para a versão %s, esta operação pode demorar."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 8c082df6af4..7e33003bcce 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "ultimul an",
 "years ago" => "ani în urmă",
 "Choose" => "Alege",
-"Cancel" => "Anulare",
 "Error loading file picker template" => "Eroare la încărcarea șablonului selectorului de fișiere",
 "Yes" => "Da",
 "No" => "Nu",
@@ -134,8 +133,6 @@ $TRANSLATIONS = array(
 "Log in" => "Autentificare",
 "Alternative Logins" => "Conectări alternative",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Salutare, <br><br>Vă aduc la cunoștință că %s a partajat %s cu tine.<br><a href=\"%s\">Accesează-l!</a><br><br>Numai bine!",
-"prev" => "precedentul",
-"next" => "următorul",
 "Updating ownCloud to version %s, this may take a while." => "Actualizăm ownCloud la versiunea %s, aceasta poate dura câteva momente."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index fe00c89b1c2..8c29c8d26f6 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -30,18 +30,17 @@ $TRANSLATIONS = array(
 "December" => "Декабрь",
 "Settings" => "Конфигурация",
 "seconds ago" => "несколько секунд назад",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n минуту назад","%n минуты назад","%n минут назад"),
+"_%n hour ago_::_%n hours ago_" => array("%n час назад","%n часа назад","%n часов назад"),
 "today" => "сегодня",
 "yesterday" => "вчера",
-"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("%n день назад","%n дня назад","%n дней назад"),
 "last month" => "в прошлом месяце",
-"_%n month ago_::_%n months ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("%n месяц назад","%n месяца назад","%n месяцев назад"),
 "months ago" => "несколько месяцев назад",
 "last year" => "в прошлом году",
 "years ago" => "несколько лет назад",
 "Choose" => "Выбрать",
-"Cancel" => "Отменить",
 "Error loading file picker template" => "Ошибка при загрузке файла выбора шаблона",
 "Yes" => "Да",
 "No" => "Нет",
@@ -84,6 +83,7 @@ $TRANSLATIONS = array(
 "Email sent" => "Письмо отправлено",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "При обновлении произошла ошибка. Пожалуйста сообщите об этом в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud сообщество</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
+"%s password reset" => "%s сброс пароля",
 "Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Ссылка для сброса пароля отправлена вам ​​по электронной почте.<br>Если вы не получите письмо в пределах одной-двух минут, проверьте папку Спам. <br>Если письма там нет, обратитесь к своему администратору.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Запрос не удался. Вы уверены, что email или имя пользователя указаны верно?",
@@ -126,6 +126,7 @@ $TRANSLATIONS = array(
 "Finish setup" => "Завершить установку",
 "%s is available. Get more information on how to update." => "%s доступно. Получить дополнительную информацию о порядке обновления.",
 "Log out" => "Выйти",
+"More apps" => "Ещё приложения",
 "Automatic logon rejected!" => "Автоматический вход в систему отключен!",
 "If you did not change your password recently, your account may be compromised!" => "Если Вы недавно не меняли свой пароль, то Ваша учетная запись может быть скомпрометирована!",
 "Please change your password to secure your account again." => "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись.",
@@ -134,8 +135,6 @@ $TRANSLATIONS = array(
 "Log in" => "Войти",
 "Alternative Logins" => "Альтернативные имена пользователя",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Приветствую,<br><br>просто даю знать, что %s поделился »%s« с вами.<br><a href=\"%s\">Посмотреть!</a><br><br>Удачи!",
-"prev" => "пред",
-"next" => "след",
 "Updating ownCloud to version %s, this may take a while." => "Идёт обновление ownCloud до версии %s. Это может занять некоторое время."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index ff016e6d6c0..475cdf5613a 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -33,7 +33,6 @@ $TRANSLATIONS = array(
 "last year" => "පෙර අවුරුද්දේ",
 "years ago" => "අවුරුදු කීපයකට පෙර",
 "Choose" => "තෝරන්න",
-"Cancel" => "එපා",
 "Yes" => "ඔව්",
 "No" => "එපා",
 "Ok" => "හරි",
@@ -85,8 +84,6 @@ $TRANSLATIONS = array(
 "Log out" => "නික්මීම",
 "Lost your password?" => "මුරපදය අමතකද?",
 "remember" => "මතක තබාගන්න",
-"Log in" => "ප්‍රවේශවන්න",
-"prev" => "පෙර",
-"next" => "ඊළඟ"
+"Log in" => "ප්‍රවේශවන්න"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 71f50bbdc31..49c2cbb183b 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "minulý rok",
 "years ago" => "pred rokmi",
 "Choose" => "Výber",
-"Cancel" => "Zrušiť",
 "Error loading file picker template" => "Chyba pri načítaní šablóny výberu súborov",
 "Yes" => "Áno",
 "No" => "Nie",
@@ -134,8 +133,6 @@ $TRANSLATIONS = array(
 "Log in" => "Prihlásiť sa",
 "Alternative Logins" => "Alternatívne prihlasovanie",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ahoj,<br><br>chcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: <br><a href=\"%s\">zde</a>.<br><br>Vďaka",
-"prev" => "späť",
-"next" => "ďalej",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 397ede93fd4..0b72f1dc4e4 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "lansko leto",
 "years ago" => "let nazaj",
 "Choose" => "Izbor",
-"Cancel" => "Prekliči",
 "Error loading file picker template" => "Napaka pri nalaganju predloge za izbor dokumenta",
 "Yes" => "Da",
 "No" => "Ne",
@@ -134,8 +133,6 @@ $TRANSLATIONS = array(
 "Log in" => "Prijava",
 "Alternative Logins" => "Druge prijavne možnosti",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Pozdravljen/a,<br><br>sporočam, da je %s delil »%s« s teboj.<br><a href=\"%s\">Poglej vsebine!</a><br><br>Lep pozdrav!",
-"prev" => "nazaj",
-"next" => "naprej",
 "Updating ownCloud to version %s, this may take a while." => "Posodabljanje sistema ownCloud na različico %s je lahko dolgotrajno."
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 7817af41b54..3057ac2c689 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -40,7 +40,6 @@ $TRANSLATIONS = array(
 "last year" => "vitin e shkuar",
 "years ago" => "vite më parë",
 "Choose" => "Zgjidh",
-"Cancel" => "Anulo",
 "Error loading file picker template" => "Veprim i gabuar gjatë ngarkimit të modelit të zgjedhësit të skedarëve",
 "Yes" => "Po",
 "No" => "Jo",
@@ -128,8 +127,6 @@ $TRANSLATIONS = array(
 "remember" => "kujto",
 "Log in" => "Hyrje",
 "Alternative Logins" => "Hyrje alternative",
-"prev" => "mbrapa",
-"next" => "para",
 "Updating ownCloud to version %s, this may take a while." => "Po azhurnoj ownCloud-in me versionin %s. Mund të zgjasi pak."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index d0485ff662c..3de06c70883 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -39,7 +39,6 @@ $TRANSLATIONS = array(
 "last year" => "прошле године",
 "years ago" => "година раније",
 "Choose" => "Одабери",
-"Cancel" => "Откажи",
 "Yes" => "Да",
 "No" => "Не",
 "Ok" => "У реду",
@@ -114,8 +113,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "Изгубили сте лозинку?",
 "remember" => "упамти",
 "Log in" => "Пријава",
-"prev" => "претходно",
-"next" => "следеће",
 "Updating ownCloud to version %s, this may take a while." => "Надоградња ownCloud-а на верзију %s, сачекајте тренутак."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index 98d227f18a3..62ed061ca06 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -24,7 +24,6 @@ $TRANSLATIONS = array(
 "_%n hour ago_::_%n hours ago_" => array("","",""),
 "_%n day ago_::_%n days ago_" => array("","",""),
 "_%n month ago_::_%n months ago_" => array("","",""),
-"Cancel" => "Otkaži",
 "Password" => "Lozinka",
 "You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.",
 "Username" => "Korisničko ime",
@@ -50,8 +49,6 @@ $TRANSLATIONS = array(
 "Finish setup" => "Završi podešavanje",
 "Log out" => "Odjava",
 "Lost your password?" => "Izgubili ste lozinku?",
-"remember" => "upamti",
-"prev" => "prethodno",
-"next" => "sledeće"
+"remember" => "upamti"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 88639845a5a..cda76a520b4 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -30,18 +30,17 @@ $TRANSLATIONS = array(
 "December" => "December",
 "Settings" => "Inställningar",
 "seconds ago" => "sekunder sedan",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minut sedan","%n minuter sedan"),
+"_%n hour ago_::_%n hours ago_" => array("%n timme sedan","%n timmar sedan"),
 "today" => "i dag",
 "yesterday" => "i går",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n dag sedan","%n dagar sedan"),
 "last month" => "förra månaden",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n månad sedan","%n månader sedan"),
 "months ago" => "månader sedan",
 "last year" => "förra året",
 "years ago" => "år sedan",
 "Choose" => "Välj",
-"Cancel" => "Avbryt",
 "Error loading file picker template" => "Fel vid inläsning av filväljarens mall",
 "Yes" => "Ja",
 "No" => "Nej",
@@ -84,6 +83,7 @@ $TRANSLATIONS = array(
 "Email sent" => "E-post skickat",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
+"%s password reset" => "%s återställ lösenord",
 "Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Länken för att återställa ditt lösenorden har skickats till din e-postadress<br>Om du inte har erhållit meddelandet inom kort, vänligen kontrollera din skräppost-mapp<br>Om den inte finns där, vänligen kontakta din administratör.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Begäran misslyckades!<br>Är du helt säker på att din e-postadress/användarnamn är korrekt?",
@@ -126,6 +126,7 @@ $TRANSLATIONS = array(
 "Finish setup" => "Avsluta installation",
 "%s is available. Get more information on how to update." => "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera.",
 "Log out" => "Logga ut",
+"More apps" => "Fler appar",
 "Automatic logon rejected!" => "Automatisk inloggning inte tillåten!",
 "If you did not change your password recently, your account may be compromised!" => "Om du inte har ändrat ditt lösenord nyligen så kan ditt konto vara manipulerat!",
 "Please change your password to secure your account again." => "Ändra genast lösenord för att säkra ditt konto.",
@@ -134,8 +135,6 @@ $TRANSLATIONS = array(
 "Log in" => "Logga in",
 "Alternative Logins" => "Alternativa inloggningar",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hej där,<br><br>ville bara informera dig om att %s delade »%s« med dig.<br><a href=\"%s\">Titta på den!</a><br><br>Hörs!",
-"prev" => "föregående",
-"next" => "nästa",
 "Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index b2e847f5fb2..3fc461d4284 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -39,7 +39,6 @@ $TRANSLATIONS = array(
 "last year" => "கடந்த வருடம்",
 "years ago" => "வருடங்களுக்கு முன்",
 "Choose" => "தெரிவுசெய்க ",
-"Cancel" => "இரத்து செய்க",
 "Yes" => "ஆம்",
 "No" => "இல்லை",
 "Ok" => "சரி",
@@ -110,8 +109,6 @@ $TRANSLATIONS = array(
 "Please change your password to secure your account again." => "உங்களுடைய கணக்கை மீண்டும் பாதுகாக்க தயவுசெய்து உங்களுடைய கடவுச்சொல்லை மாற்றவும்.",
 "Lost your password?" => "உங்கள் கடவுச்சொல்லை தொலைத்துவிட்டீர்களா?",
 "remember" => "ஞாபகப்படுத்துக",
-"Log in" => "புகுபதிகை",
-"prev" => "முந்தைய",
-"next" => "அடுத்து"
+"Log in" => "புகுபதிகை"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/te.php b/core/l10n/te.php
index f6d165f369f..2e2bb8f8fe8 100644
--- a/core/l10n/te.php
+++ b/core/l10n/te.php
@@ -32,7 +32,6 @@ $TRANSLATIONS = array(
 "months ago" => "నెలల క్రితం",
 "last year" => "పోయిన సంవత్సరం",
 "years ago" => "సంవత్సరాల క్రితం",
-"Cancel" => "రద్దుచేయి",
 "Yes" => "అవును",
 "No" => "కాదు",
 "Ok" => "సరే",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index b015b940f2b..bb5181fd9e6 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -39,7 +39,6 @@ $TRANSLATIONS = array(
 "last year" => "ปีที่แล้ว",
 "years ago" => "ปี ที่ผ่านมา",
 "Choose" => "เลือก",
-"Cancel" => "ยกเลิก",
 "Yes" => "ตกลง",
 "No" => "ไม่ตกลง",
 "Ok" => "ตกลง",
@@ -118,8 +117,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "ลืมรหัสผ่าน?",
 "remember" => "จำรหัสผ่าน",
 "Log in" => "เข้าสู่ระบบ",
-"prev" => "ก่อนหน้า",
-"next" => "ถัดไป",
 "Updating ownCloud to version %s, this may take a while." => "กำลังอัพเดท ownCloud ไปเป็นรุ่น %s, กรุณารอสักครู่"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 2a552e1798e..dde8a1bd97a 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "geçen yıl",
 "years ago" => "yıl önce",
 "Choose" => "seç",
-"Cancel" => "İptal",
 "Error loading file picker template" => "Seçici şablon dosya yüklemesinde hata",
 "Yes" => "Evet",
 "No" => "Hayır",
@@ -136,8 +135,6 @@ $TRANSLATIONS = array(
 "Log in" => "Giriş yap",
 "Alternative Logins" => "Alternatif Girişler",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Merhaba, <br><br> %s sizinle »%s« paylaşımında bulundu.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>İyi günler!",
-"prev" => "önceki",
-"next" => "sonraki",
 "Updating ownCloud to version %s, this may take a while." => "Owncloud %s versiyonuna güncelleniyor. Biraz zaman alabilir."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
index cf1c28a0d2f..5cbb90d15f9 100644
--- a/core/l10n/ug.php
+++ b/core/l10n/ug.php
@@ -26,7 +26,6 @@ $TRANSLATIONS = array(
 "yesterday" => "تۈنۈگۈن",
 "_%n day ago_::_%n days ago_" => array(""),
 "_%n month ago_::_%n months ago_" => array(""),
-"Cancel" => "ۋاز كەچ",
 "Yes" => "ھەئە",
 "No" => "ياق",
 "Ok" => "جەزملە",
@@ -44,6 +43,7 @@ $TRANSLATIONS = array(
 "Users" => "ئىشلەتكۈچىلەر",
 "Apps" => "ئەپلەر",
 "Help" => "ياردەم",
+"Edit categories" => "تۈر تەھرىر",
 "Add" => "قوش",
 "Advanced" => "ئالىي",
 "Finish setup" => "تەڭشەك تامام",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index baf756ab7a9..6fcb23d0a32 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -40,7 +40,6 @@ $TRANSLATIONS = array(
 "last year" => "минулого року",
 "years ago" => "роки тому",
 "Choose" => "Обрати",
-"Cancel" => "Відмінити",
 "Yes" => "Так",
 "No" => "Ні",
 "Ok" => "Ok",
@@ -122,8 +121,6 @@ $TRANSLATIONS = array(
 "remember" => "запам'ятати",
 "Log in" => "Вхід",
 "Alternative Logins" => "Альтернативні Логіни",
-"prev" => "попередній",
-"next" => "наступний",
 "Updating ownCloud to version %s, this may take a while." => "Оновлення ownCloud до версії %s, це може зайняти деякий час."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index de6a58cea26..96871a54d0b 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -20,7 +20,6 @@ $TRANSLATIONS = array(
 "_%n day ago_::_%n days ago_" => array("",""),
 "_%n month ago_::_%n months ago_" => array("",""),
 "Choose" => "منتخب کریں",
-"Cancel" => "منسوخ کریں",
 "Yes" => "ہاں",
 "No" => "نہیں",
 "Ok" => "اوکے",
@@ -75,8 +74,6 @@ $TRANSLATIONS = array(
 "Log out" => "لاگ آؤٹ",
 "Lost your password?" => "کیا آپ پاسورڈ بھول گئے ہیں؟",
 "remember" => "یاد رکھیں",
-"Log in" => "لاگ ان",
-"prev" => "پچھلا",
-"next" => "اگلا"
+"Log in" => "لاگ ان"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 265d83a4266..305839b4760 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -40,7 +40,6 @@ $TRANSLATIONS = array(
 "last year" => "năm trước",
 "years ago" => "năm trước",
 "Choose" => "Chọn",
-"Cancel" => "Hủy",
 "Yes" => "Có",
 "No" => "Không",
 "Ok" => "Đồng ý",
@@ -125,8 +124,6 @@ $TRANSLATIONS = array(
 "remember" => "ghi nhớ",
 "Log in" => "Đăng nhập",
 "Alternative Logins" => "Đăng nhập khác",
-"prev" => "Lùi lại",
-"next" => "Kế tiếp",
 "Updating ownCloud to version %s, this may take a while." => "Cập nhật ownCloud lên phiên bản %s, có thể sẽ mất thời gian"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 7b3a2564878..92f1aef8850 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "去年",
 "years ago" => "年前",
 "Choose" => "选择",
-"Cancel" => "取消",
 "Error loading file picker template" => "加载文件选取模板出错",
 "Yes" => "是",
 "No" => "否",
@@ -136,8 +135,6 @@ $TRANSLATIONS = array(
 "Log in" => "登陆",
 "Alternative Logins" => "备选登录",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "你好！<br><br>温馨提示： %s 与您共享了 %s 。<br><br>\n查看： %s <br><br> 祝顺利！",
-"prev" => "后退",
-"next" => "前进",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud正在升级至 %s 版，这可能需要一点时间。"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index c216584494c..a5a63e24858 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -30,7 +30,7 @@ $TRANSLATIONS = array(
 "December" => "十二月",
 "Settings" => "设置",
 "seconds ago" => "秒前",
-"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"),
 "_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "今天",
 "yesterday" => "昨天",
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "去年",
 "years ago" => "年前",
 "Choose" => "选择(&C)...",
-"Cancel" => "取消",
 "Error loading file picker template" => "加载文件选择器模板出错",
 "Yes" => "是",
 "No" => "否",
@@ -132,8 +131,6 @@ $TRANSLATIONS = array(
 "Log in" => "登录",
 "Alternative Logins" => "其他登录方式",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "您好，<br><br>%s 向您分享了 »%s«。<br><a href=\"%s\">查看</a>",
-"prev" => "上一页",
-"next" => "下一页",
 "Updating ownCloud to version %s, this may take a while." => "更新 ownCloud 到版本 %s，这可能需要一些时间。"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index 0a3134f65da..8bfa1f58616 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -28,7 +28,6 @@ $TRANSLATIONS = array(
 "last month" => "前一月",
 "_%n month ago_::_%n months ago_" => array(""),
 "months ago" => "個月之前",
-"Cancel" => "取消",
 "Yes" => "Yes",
 "No" => "No",
 "Ok" => "OK",
@@ -87,8 +86,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "忘記密碼",
 "remember" => "記住",
 "Log in" => "登入",
-"prev" => "前一步",
-"next" => "下一步",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud (ver. %s)更新中, 請耐心等侯"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index d620866bbb8..d2cbb7a8fd3 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "last year" => "去年",
 "years ago" => "幾年前",
 "Choose" => "選擇",
-"Cancel" => "取消",
 "Error loading file picker template" => "載入檔案選擇器樣板發生錯誤",
 "Yes" => "是",
 "No" => "否",
@@ -134,8 +133,6 @@ $TRANSLATIONS = array(
 "Log in" => "登入",
 "Alternative Logins" => "替代登入方法",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "嗨，<br><br>通知您，%s 與您分享了 %s ，<br><a href=\"%s\">看一下吧</a>",
-"prev" => "上一頁",
-"next" => "下一頁",
 "Updating ownCloud to version %s, this may take a while." => "正在將 Owncloud 升級至版本 %s ，這可能需要一點時間。"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 2aa42f705fb..5673ceabd33 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -141,55 +141,55 @@ msgstr ""
 msgid "Settings"
 msgstr "Instellings"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -197,23 +197,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "vorige"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "volgende"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index 23d5bd79143..6ebf523c19f 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr ""
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index 491052f17f0..ab198f78cac 100644
--- a/l10n/af_ZA/lib.po
+++ b/l10n/af_ZA/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index 64a38fbef8a..2a6cffc209a 100644
--- a/l10n/af_ZA/settings.po
+++ b/l10n/af_ZA/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 1d1d4695a71..b4f237d6109 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_ZA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Hulp"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 8a6009ccb39..a89b43a8722 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -141,11 +141,11 @@ msgstr "كانون الاول"
 msgid "Settings"
 msgstr "إعدادات"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "منذ ثواني"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -155,7 +155,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -165,15 +165,15 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "اليوم"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "يوم أمس"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -183,11 +183,11 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "الشهر الماضي"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -197,15 +197,15 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "شهر مضى"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "السنةالماضية"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "سنة مضت"
 
@@ -213,23 +213,19 @@ msgstr "سنة مضت"
 msgid "Choose"
 msgstr "اختيار"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "الغاء"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "نعم"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "لا"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "موافق"
 
@@ -636,14 +632,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "السابق"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "التالي"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 231fe63b4d0..e9f43521101 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "تم إلغاء عملية رفع الملفات ."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "عنوان ال URL  لا يجوز أن يكون فارغا."
 
@@ -107,8 +107,8 @@ msgstr "عنوان ال URL  لا يجوز أن يكون فارغا."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "خطأ"
 
@@ -188,29 +188,35 @@ msgstr "مساحتك التخزينية ممتلئة, لا يمكم تحديث 
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "مساحتك التخزينية امتلأت تقريبا "
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "إسم مجلد غير صحيح. استخدام مصطلح \"Shared\" محجوز للنظام"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "اسم"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "معدل"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
@@ -220,7 +226,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index d8d3d8214a1..af3920e0949 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 040d66a42c4..2e0845e8125 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "تعذّر تحديده"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "التطبيق غير مفعّل"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 668bdd1a446..e3e192efb11 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr "حصل خطأ أثناء تحديث التطبيق"
 msgid "Updated"
 msgstr "تم التحديث بنجاح"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "جاري الحفظ..."
 
@@ -165,7 +169,7 @@ msgstr "حصل خطأ اثناء انشاء مستخدم"
 msgid "A valid password must be provided"
 msgstr "يجب ادخال كلمة مرور صحيحة"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr "مجدول"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "قم بتنفيذ مهمة واحدة مع كل صفحة تم تحميلها"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "مشاركة"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "السماح بالمشاركة عن طريق الAPI "
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "السماح للتطبيقات بالمشاركة عن طريق الAPI"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "السماح بالعناوين"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط "
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "السماح بإعادة المشاركة "
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "السماح للمستخدمين باعادة مشاركة الملفات التي تم مشاركتها معهم"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "السماح للمستعملين بإعادة المشاركة مع أي أحد  "
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "السماح للمستعمينٍ لإعادة المشاركة فقط مع المستعملين في مجموعاتهم"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "حماية"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "فرض HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "سجل"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "مستوى السجل"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "المزيد"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "أقل"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "إصدار"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "التشفير"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "اسم الدخول"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 3489c7b8184..d760e3d0e43 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "المساعدة"
diff --git a/l10n/be/core.po b/l10n/be/core.po
index fb9c15d2ccc..a0b09af764b 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -141,11 +141,11 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -153,7 +153,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -161,15 +161,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -177,11 +177,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -189,15 +189,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -205,23 +205,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -628,14 +624,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "Папярэдняя"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "Далей"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/be/files.po b/l10n/be/files.po
index c25701d9cc4..dab1498b5ce 100644
--- a/l10n/be/files.po
+++ b/l10n/be/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr ""
 
@@ -186,29 +186,35 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
@@ -216,7 +222,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index c95cd9291f6..62d99ec8df1 100644
--- a/l10n/be/lib.po
+++ b/l10n/be/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 6a5d16012be..1f1fe472263 100644
--- a/l10n/be/settings.po
+++ b/l10n/be/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index 581d1b1dcc0..f2cad633ff3 100644
--- a/l10n/be/user_ldap.po
+++ b/l10n/be/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index cf34714ed71..0a88faaffc1 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -141,55 +141,55 @@ msgstr "Декември"
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "преди секунди"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "днес"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "последният месец"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "последната година"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "последните години"
 
@@ -197,23 +197,19 @@ msgstr "последните години"
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Отказ"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Да"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Не"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Добре"
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "пред."
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "следващо"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 9c5bdeb8b10..9224fb6a328 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "Качването е спряно."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Грешка"
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Променено"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index 9c95c045cdb..ee8f206c9c2 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 1aa83779f3d..2d4ada2a9b9 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "не може да се определи"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Приложението не е включено."
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 7741c170207..ba0d4dd635f 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr "Обновено"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Записване..."
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Крон"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Споделяне"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Още"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "По-малко"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Потребител"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 7cbdd75fe6b..00d80cb160e 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Помощ"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index ab302185623..b4dcaa3e016 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -141,55 +141,55 @@ msgstr "ডিসেম্বর"
 msgid "Settings"
 msgstr "নিয়ামকসমূহ"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "সেকেন্ড পূর্বে"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "আজ"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "গতকাল"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "গত মাস"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "মাস পূর্বে"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "গত বছর"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "বছর পূর্বে"
 
@@ -197,23 +197,19 @@ msgstr "বছর পূর্বে"
 msgid "Choose"
 msgstr "বেছে নিন"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "বাতির"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "হ্যাঁ"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "না"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "তথাস্তু"
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "পূর্ববর্তী"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "পরবর্তী"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index d5e9b24e076..dfaafb4e100 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr "যথেষ্ঠ পরিমাণ স্থান নেই"
 msgid "Upload cancelled."
 msgstr "আপলোড বাতিল করা হয়েছে।"
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।"
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL ফাঁকা রাখা যাবে না।"
 
@@ -107,8 +107,8 @@ msgstr "URL ফাঁকা রাখা যাবে না।"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "সমস্যা"
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud  এর জন্য সংরক্ষিত।"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "রাম"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "আকার"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "পরিবর্তিত"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index f4120be967e..13ff8fcdf45 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index 9f5df0a9649..367e8955b06 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "অ্যাপ্লিকেসনটি সক্রিয় নয়"
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 6e3dfcafa4c..3b8d63a4a77 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "সংরক্ষণ করা হচ্ছে.."
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "বেশী"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "কম"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "ভার্সন"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "সংকেতায়ন"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 56f857f49ae..3a816ab1ca7 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "ব্যবহারকারির প্রবেশ ছাঁকন
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "প্রবেশের  চেষ্টা করার সময় প্রযোজ্য ছাঁকনীটি নির্ধারণ করবে। প্রবেশের সময় ব্যবহারকারী নামটি %%uid  দিয়ে প্রতিস্থাপিত হবে।"
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "%%uid স্থানধারক ব্যবহার করুন, উদাহরণঃ  \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "ব্যবহারকারী তালিকা ছাঁকনী"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "ব্যবহারকারী উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "কোন স্থানধারক ব্যতীত, যেমনঃ \"objectClass=person\"।"
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "গোষ্ঠী ছাঁকনী"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "গোষ্ঠীসমূহ উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।"
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "কোন স্থান ধারক ব্যতীত, উদাহরণঃ\"objectClass=posixGroup\"।"
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "পোর্ট"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "TLS ব্যবহার কর"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "বর্ণ অসংবেদী LDAP  সার্ভার (উইন্ডোজ)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "অনুমোদিত নয়, শুধুমাত্র পরীক্ষামূলক ব্যবহারের জন্য।"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "সেকেন্ডে। কোন পরিবর্তন ক্যাসে খালি করবে।"
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "ব্যবহারকারীর প্রদর্শিতব্য নামের ক্ষেত্র"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "ভিত্তি ব্যবহারকারি বৃক্ষাকারে"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "গোষ্ঠীর প্রদর্শিতব্য নামের ক্ষেত্র"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "ভিত্তি গোষ্ঠী বৃক্ষাকারে"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "গোষ্ঠী-সদস্য সংস্থাপন"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "বাইটে"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "ব্যবহারকারী নামের জন্য ফাঁকা রাখুন (পূর্বনির্ধারিত)। অন্যথায়, LDAP/AD বৈশিষ্ট্য নির্ধারণ করুন।"
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "সহায়িকা"
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index d544fc01ed1..aaec19afacd 100644
--- a/l10n/bs/core.po
+++ b/l10n/bs/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -141,59 +141,59 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -201,23 +201,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -624,14 +620,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
index 112380c4ce7..bd25245e3ae 100644
--- a/l10n/bs/files.po
+++ b/l10n/bs/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr ""
 
@@ -185,36 +185,42 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/bs/lib.po b/l10n/bs/lib.po
index aaa796e1039..7c773af3f93 100644
--- a/l10n/bs/lib.po
+++ b/l10n/bs/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po
index f5e22a8b729..62b49ca53d4 100644
--- a/l10n/bs/settings.po
+++ b/l10n/bs/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Spašavam..."
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/bs/user_ldap.po b/l10n/bs/user_ldap.po
index 8205b382a53..6e276fcf031 100644
--- a/l10n/bs/user_ldap.po
+++ b/l10n/bs/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index a9864b9876a..d5512edef9d 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -143,55 +143,55 @@ msgstr "Desembre"
 msgid "Settings"
 msgstr "Configuració"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "avui"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "ahir"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "el mes passat"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "mesos enrere"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "l'any passat"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "anys enrere"
 
@@ -199,23 +199,19 @@ msgstr "anys enrere"
 msgid "Choose"
 msgstr "Escull"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Error en carregar la plantilla del seleccionador de fitxers"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "D'acord"
 
@@ -622,14 +618,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Ei,<br><br>només fer-te saber que %s ha compartit %s amb tu.<br><a href=\"%s\">Mira-ho:</a><br><br>Salut!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "anterior"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "següent"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index a6bd337655e..3f3a39586a6 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -96,12 +96,12 @@ msgstr "No hi ha prou espai disponible"
 msgid "Upload cancelled."
 msgstr "La pujada s'ha cancel·lat."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "La URL no pot ser buida"
 
@@ -109,8 +109,8 @@ msgstr "La URL no pot ser buida"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Error"
 
@@ -186,35 +186,41 @@ msgstr "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden ac
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 90e87e11497..04c76283088 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 28c2be4f31c..ada11927259 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr "Baixeu els fitxers en trossos petits, de forma separada, o pregunteu a l'administrador."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "no s'ha pogut determinar"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "L'aplicació no està habilitada"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index bfb24dfb9de..2a812a7f066 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -122,7 +122,11 @@ msgstr "Error en actualitzar l'aplicació"
 msgid "Updated"
 msgstr "Actualitzada"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Desant..."
 
@@ -167,7 +171,7 @@ msgstr "Error en crear l'usuari"
 msgid "A valid password must be provided"
 msgstr "Heu de facilitar una contrasenya vàlida"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Català"
 
@@ -238,106 +242,106 @@ msgstr "Aquest servidor no té cap connexió a internet que funcioni. Això sign
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Executa una tasca per cada paquet carregat"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php està registrat en un servei webcron que fa una crida cada minut a la pàgina cron.php a través de http."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Utilitzeu el sistema de servei cron per cridar el fitxer cron.php cada minut."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Compartir"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Habilita l'API de compartir"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Permet que les aplicacions utilitzin l'API de compartir"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Permet enllaços"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Permet als usuaris compartir elements amb el públic amb enllaços"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Permet pujada pública"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Permet als usuaris habilitar pujades de tercers en les seves carpetes compartides al públic"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Permet compartir de nou"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Permet als usuaris compartir de nou elements ja compartits amb ells"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Permet compartir amb qualsevol"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Permet als usuaris compartir només amb els usuaris del seu grup"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Seguretat"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Força HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Força la connexió dels clients a %s a través d'una connexió encriptada."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Connecteu a %s a través de HTTPS per habilitar o inhabilitar l'accés SSL."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Nivell de registre"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Més"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Menys"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Versió"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Useu aquesta adreça per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedir als fitxers via WebDAV</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Nom d'accés"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 4f81fa85c21..8c6b13494d9 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -155,198 +155,185 @@ msgstr "Filtre d'inici de sessió d'usuari"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Defineix el filtre a aplicar quan s'intenta l'inici de sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "useu el paràmetre de substitució %%uid, per exemple \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Llista de filtres d'usuari"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Defineix el filtre a aplicar quan es mostren usuaris"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=persona\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Filtre de grup"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Defineix el filtre a aplicar quan es mostren grups."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Arranjaments de connexió"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Configuració activa"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Si està desmarcat, aquesta configuració s'ometrà."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Màquina de còpia de serguretat (rèplica)"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Afegiu una màquina de còpia de seguretat opcional. Ha de ser una rèplica del servidor LDAP/AD principal."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Port de la còpia de seguretat (rèplica)"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Desactiva el servidor principal"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr "Connecta només al servidor rèplica."
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Usa TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "No ho useu adicionalment per a conexions LDAPS, fallarà."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Desactiva la validació de certificat SSL."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor %s."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "No recomanat, ús només per proves."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Memòria de cau Time-To-Live"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "en segons. Un canvi buidarà la memòria de cau."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Arranjaments de carpetes"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Camp per mostrar el nom d'usuari"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr "Atribut LDAP a usar per generar el nom a mostrar de l'usuari."
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Arbre base d'usuaris"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Una DN Base d'Usuari per línia"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Atributs de cerca d'usuari"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Opcional; Un atribut per línia"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Camp per mostrar el nom del grup"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr "Atribut LDAP a usar per generar el nom a mostrar del grup."
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Arbre base de grups"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Una DN Base de Grup per línia"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Atributs de cerca de grup"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Associació membres-grup"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Atributs especials"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Camp de quota"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Quota per defecte"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Camp de correu electrònic"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Norma per anomenar la carpeta arrel d'usuari"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Nom d'usuari intern"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Per defecte el nom d'usuari intern es crearà a partir de l'atribut UUID. Això assegura que el nom d'usuari és únic i que els caràcters no s'han de convertir. El nom d'usuari intern té la restricció que només estan permesos els caràcters: [ a-zA-Z0-9_.@- ]. Els altres caràcters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de col·lisió s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. També és el nom per defecte de la carpeta home d'usuari. És també un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp següent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte només en els nous usuaris LDAP mapats (afegits)."
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Atribut nom d'usuari intern:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Sobrescriu la detecció UUID"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran als usuaris i grups LDAP mapats de nou (afegits)."
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "Atribut UUID:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Mapatge d'usuari Nom d'usuari-LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
 "experimental stage."
 msgstr "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria de cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental."
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Elimina el mapatge d'usuari Nom d'usuari-LDAP"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Elimina el mapatge de grup Nom de grup-LDAP"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Comprovació de la configuració"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index ed23a4058a7..37ee596b324 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 18:33+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -153,16 +153,16 @@ msgstr "před pár vteřinami"
 #: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "před %n minutou"
+msgstr[1] "před %n minutami"
+msgstr[2] "před %n minutami"
 
 #: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "před %n hodinou"
+msgstr[1] "před %n hodinami"
+msgstr[2] "před %n hodinami"
 
 #: js/js.js:815
 msgid "today"
@@ -175,9 +175,9 @@ msgstr "včera"
 #: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "před %n dnem"
+msgstr[1] "před %n dny"
+msgstr[2] "před %n dny"
 
 #: js/js.js:818
 msgid "last month"
@@ -186,9 +186,9 @@ msgstr "minulý měsíc"
 #: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "před %n měsícem"
+msgstr[1] "před %n měsíci"
+msgstr[2] "před %n měsíci"
 
 #: js/js.js:820
 msgid "months ago"
@@ -206,23 +206,19 @@ msgstr "před lety"
 msgid "Choose"
 msgstr "Vybrat"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Chyba při načítání šablony výběru souborů"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Ano"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ok"
 
@@ -389,7 +385,7 @@ msgstr "Aktualizace byla úspěšná. Přesměrovávám na ownCloud."
 #: lostpassword/controller.php:61
 #, php-format
 msgid "%s password reset"
-msgstr ""
+msgstr "reset hesla %s"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -629,14 +625,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Ahoj,<br><br>jenom vám chci oznámit, že %s s vámi sdílí %s.\nPodívat se můžete <br><a href=\"%s\">zde</a>.<br><br>Díky"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "předchozí"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "následující"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 6086a138d9e..3d3f68587f3 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -97,12 +97,12 @@ msgstr "Nedostatek volného místa"
 msgid "Upload cancelled."
 msgstr "Odesílání zrušeno."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL nemůže být prázdná."
 
@@ -110,8 +110,8 @@ msgstr "URL nemůže být prázdná."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Chyba"
 
@@ -158,9 +158,9 @@ msgstr "vrátit zpět"
 #: js/filelist.js:453
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nahrávám %n soubor"
+msgstr[1] "Nahrávám %n soubory"
+msgstr[2] "Nahrávám %n souborů"
 
 #: js/filelist.js:518
 msgid "files uploading"
@@ -188,41 +188,47 @@ msgstr "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubo
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Vaše úložiště je téměř plné ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Neplatný název složky. Pojmenování 'Shared' je rezervováno pro vnitřní potřeby ownCloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Název"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Upraveno"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n složka"
+msgstr[1] "%n složky"
+msgstr[2] "%n složek"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n soubor"
+msgstr[1] "%n soubory"
+msgstr[2] "%n souborů"
 
 #: lib/app.php:73
 #, php-format
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index a6be32abb2f..58fe5480946 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: pstast <petr@stastny.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index 776ed0a08de..9294025f67d 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/files_trashbin.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Honza K. <honza889@gmail.com>, 2013
+# pstast <petr@stastny.eu>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 18:43+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-16 09:20+0000\n"
 "Last-Translator: pstast <petr@stastny.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -55,16 +56,16 @@ msgstr "Smazáno"
 #: js/trash.js:191
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n adresář"
+msgstr[1] "%n adresáře"
+msgstr[2] "%n adresářů"
 
 #: js/trash.js:197
 msgid "%n file"
 msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n soubor"
+msgstr[1] "%n soubory"
+msgstr[2] "%n souborů"
 
 #: lib/trash.php:819 lib/trash.php:821
 msgid "restored"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 5cde1831012..8c710f73a51 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -76,10 +76,6 @@ msgid ""
 "administrator."
 msgstr "Stáhněte soubory po menších částech, samostatně, nebo se obraťte na správce."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "nelze zjistit"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Aplikace není povolena"
@@ -211,16 +207,16 @@ msgstr "před pár sekundami"
 #: template/functions.php:81
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "před %n minutou"
+msgstr[1] "před %n minutami"
+msgstr[2] "před %n minutami"
 
 #: template/functions.php:82
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "před %n hodinou"
+msgstr[1] "před %n hodinami"
+msgstr[2] "před %n hodinami"
 
 #: template/functions.php:83
 msgid "today"
@@ -233,9 +229,9 @@ msgstr "včera"
 #: template/functions.php:85
 msgid "%n day go"
 msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "před %n dnem"
+msgstr[1] "před %n dny"
+msgstr[2] "před %n dny"
 
 #: template/functions.php:86
 msgid "last month"
@@ -244,9 +240,9 @@ msgstr "minulý měsíc"
 #: template/functions.php:87
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "před %n měsícem"
+msgstr[1] "před %n měsíci"
+msgstr[2] "před %n měsíci"
 
 #: template/functions.php:88
 msgid "last year"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index ccdfe4c30f4..1b7a56f1b44 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -123,7 +123,11 @@ msgstr "Chyba při aktualizaci aplikace"
 msgid "Updated"
 msgstr "Aktualizováno"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Ukládám..."
 
@@ -168,7 +172,7 @@ msgstr "Chyba při vytváření užiatele"
 msgid "A valid password must be provided"
 msgstr "Musíte zadat platné heslo"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Česky"
 
@@ -239,106 +243,106 @@ msgstr "Server nemá funkční připojení k internetu. Některé moduly jako na
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Spustit jednu úlohu s každým načtením stránky"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php je registrován u služby webcron pro zavolání stránky cron.php jednou za minutu přes HTTP."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Použít systémovou službu cron pro spouštění souboru cron.php jednou za minutu."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Sdílení"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Povolit API sdílení"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Povolit aplikacím používat API sdílení"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Povolit odkazy"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Povolit uživatelům sdílet položky veřejně pomocí odkazů"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Povolit veřejné nahrávání souborů"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Povolit uživatelům, aby mohli ostatním umožnit nahrávat do jejich veřejně sdílené složky"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Povolit znovu-sdílení"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Povolit uživatelům znovu sdílet položky, které jsou pro ně sdíleny"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Povolit uživatelům sdílet s kýmkoliv"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Povolit uživatelům sdílet pouze s uživateli v jejich skupinách"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Zabezpečení"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Vynutit HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Vynutí připojování klientů k %s šifrovaným spojením."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Připojte se k %s skrze HTTPS pro povolení nebo zakázání vynucování SSL."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Úroveň zaznamenávání"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Více"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Méně"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Verze"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -468,6 +472,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Použijte <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Šifrování"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Přihlašovací jméno"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 7f676fdca37..492126412c4 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Honza K. <honza889@gmail.com>, 2013
+# pstast <petr@stastny.eu>, 2013
 # Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
-"Last-Translator: Honza K. <honza889@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,15 +42,15 @@ msgstr "Konfigurace je v pořádku, ale spojení selhalo. Zkontrolujte, prosím,
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr "Nastavení je neplatné. Zkontrolujte, prosím, záznam ownCloud pro další podrobnosti."
+msgstr "Nastavení je neplatné. Zkontrolujte, prosím, záznamy ownCloud pro další podrobnosti."
 
 #: js/settings.js:66
 msgid "Deletion failed"
-msgstr "Mazání selhalo."
+msgstr "Mazání selhalo"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr "Převzít nastavení z nedávného nastavení serveru?"
+msgstr "Převzít nastavení z nedávné konfigurace serveru?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
@@ -98,7 +99,7 @@ msgstr "<b>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
-msgstr "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému aby jej nainstaloval."
+msgstr "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému, aby jej nainstaloval."
 
 #: templates/settings.php:16
 msgid "Server configuration"
@@ -138,7 +139,7 @@ msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr "DN klentského uživatele ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte údaje DN and Heslo prázdné."
+msgstr "DN klientského uživatele, ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte DN a heslo prázdné."
 
 #: templates/settings.php:47
 msgid "Password"
@@ -146,7 +147,7 @@ msgstr "Heslo"
 
 #: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Pro anonymní přístup, ponechte údaje DN and heslo prázdné."
+msgstr "Pro anonymní přístup ponechte údaje DN and heslo prázdné."
 
 #: templates/settings.php:51
 msgid "User Login Filter"
@@ -156,198 +157,185 @@ msgstr "Filtr přihlášení uživatelů"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "použijte zástupný vzor %%uid, např. \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
-msgstr "Filtr uživatelských seznamů"
-
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Určuje použitý filtr, pro získávaní uživatelů."
+msgstr "Filtr seznamu uživatelů"
 
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "bez zástupných znaků, např. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Filtr skupin"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Určuje použitý filtr, pro získávaní skupin."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "bez zástupných znaků, např. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Nastavení spojení"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Nastavení aktivní"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
-msgstr "Pokud není zaškrtnuto, bude nastavení přeskočeno."
+msgstr "Pokud není zaškrtnuto, bude toto nastavení přeskočeno."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Záložní (kopie) hostitel"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Zadejte volitelného záložního hostitele. Musí to být kopie hlavního serveru LDAP/AD."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Záložní (kopie) port"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
-msgstr "Zakázat hlavní serveru"
+msgstr "Zakázat hlavní server"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
-msgstr "Připojit jen k replikujícímu serveru."
+msgstr "Připojit jen k záložnímu serveru."
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Použít TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr "Nepoužívejte pro spojení LDAP, selže."
+msgstr "Nepoužívejte v kombinaci s LDAPS spojením, nebude to fungovat."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server nerozlišující velikost znaků (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Vypnout ověřování SSL certifikátu."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Pokud spojení funguje jen s touto volbou, importujte SSL certifikát vašeho LDAP serveru na server %s."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Není doporučeno, pouze pro testovací účely."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "TTL vyrovnávací paměti"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
-msgstr "ve vteřinách. Změna vyprázdní vyrovnávací paměť."
+msgstr "v sekundách. Změna vyprázdní vyrovnávací paměť."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Nastavení adresáře"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Pole zobrazovaného jména uživatele"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr "LDAP atribut použitý k vytvoření zobrazovaného jména uživatele."
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Základní uživatelský strom"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Jedna uživatelská základní DN na řádku"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Atributy vyhledávání uživatelů"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
-msgstr "Volitelné, atribut na řádku"
+msgstr "Volitelné, jeden atribut na řádku"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Pole zobrazovaného jména skupiny"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr "LDAP atribut použitý k vytvoření zobrazovaného jména skupiny."
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Základní skupinový strom"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Jedna skupinová základní DN na řádku"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Atributy vyhledávání skupin"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Asociace člena skupiny"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Speciální atributy"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Pole pro kvótu"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Výchozí kvóta"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "v bajtech"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Pole e-mailu"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Pravidlo pojmenování domovské složky uživatele"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Interní uživatelské jméno"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,17 +349,17 @@ msgid ""
 "behavior as before ownCloud 5 enter the user display name attribute in the "
 "following field. Leave it empty for default behavior. Changes will have "
 "effect only on newly mapped (added) LDAP users."
-msgstr "Ve výchozím nastavení bude uživatelské jméno vytvořeno z UUID atributu. To zajistí unikátnost uživatelského jména bez potřeby konverze znaků. Interní uživatelské jméno je omezena na znaky: [ a-zA-Z0-9_.@- ]. Ostatní znaky jsou nahrazeny jejich ASCII ekvivalentem nebo jednoduše vynechány. V případě kolize uživatelských jmen bude přidáno/navýšeno číslo. Interní uživatelské jméno je používáno k interní identifikaci uživatele. Je také výchozím názvem uživatelského domovského adresáře. Je také součástí URL pro vzdálený přístup, například všech *DAV služeb. S tímto nastavením bude výchozí chování přepsáno. Pro dosažení podobného chování jako před ownCloudem 5 uveďte atribut zobrazovaného jména do pole níže. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele z LDAP."
+msgstr "Ve výchozím nastavení bude uživatelské jméno vytvořeno z UUID atributu. To zajistí unikátnost uživatelského jména a není potřeba provádět konverzi znaků. Interní uživatelské jméno je omezeno na znaky: [ a-zA-Z0-9_.@- ]. Ostatní znaky jsou nahrazeny jejich ASCII ekvivalentem nebo jednoduše vynechány. V případě kolize uživatelských jmen bude přidáno/navýšeno číslo. Interní uživatelské jméno je používáno k interní identifikaci uživatele. Je také výchozím názvem uživatelského domovského adresáře. Je také součástí URL pro vzdálený přístup, například všech *DAV služeb. S tímto nastavením může být výchozí chování změněno. Pro dosažení podobného chování jako před ownCloudem 5 uveďte atribut zobrazovaného jména do pole níže. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele z LDAP."
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Atribut interního uživatelského jména:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Nastavit ručně UUID atribut"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,17 +368,17 @@ msgid ""
 "You must make sure that the attribute of your choice can be fetched for both"
 " users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "Ve výchozím nastavení je UUID atribut nalezen automaticky. UUID atribut je používán pro nezpochybnitelnou identifikaci uživatelů a skupin z LDAP. Navíc je na základě UUID tvořeno také interní uživatelské jméno, pokud není nastaveno jinak. Můžete výchozí nastavení přepsat a použít atribut který sami zvolíte. Musíte se ale ujistit že atribut který vyberete bude uveden jak u uživatelů, tak i u skupin a je unikátní. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele a skupiny z LDAP."
+msgstr "Ve výchozím nastavení je UUID atribut nalezen automaticky. UUID atribut je používán pro nezpochybnitelnou identifikaci uživatelů a skupin z LDAP. Navíc je na základě UUID tvořeno také interní uživatelské jméno, pokud není nastaveno jinak. Můžete výchozí nastavení přepsat a použít atribut, který sami zvolíte. Musíte se ale ujistit, že atribut, který vyberete, bude uveden jak u uživatelů, tak i u skupin a je unikátní. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele a skupiny z LDAP."
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "Atribut UUID:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Mapování uživatelských jmen z LDAPu"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,20 +390,20 @@ msgid ""
 " is not configuration sensitive, it affects all LDAP configurations! Never "
 "clear the mappings in a production environment, only in a testing or "
 "experimental stage."
-msgstr "Uživatelská jména jsou používány pro uchovávání a přiřazování (meta)dat. Pro správnou identifikaci a rozpoznání uživatelů bude mít každý uživatel z LDAP interní uživatelské jméno. To je nezbytné pro mapování uživatelských jmen na uživatele LDAP. Vytvořené uživatelské jméno je mapováno na UUID uživatele v LDAP. Navíc je cachována DN pro reprodukci interakce s LDAP, ale není používána pro identifikaci. Pokud se DN změní, bude to správně rozpoznáno. Vyčištění mapování zanechá zbytky všude. Vyčištění navíc není specifické konfiguraci, bude mít vliv na všechny LDAP konfigurace! Nikdy nečistěte mapování v produkčním prostředí, jen v testovací nebo experimentální fázi."
+msgstr "Uživatelská jména jsou používány pro uchovávání a přiřazování (meta)dat. Pro správnou identifikaci a rozpoznání uživatelů bude mít každý uživatel z LDAP interní uživatelské jméno. To vyžaduje mapování uživatelských jmen na uživatele LDAP. Vytvořené uživatelské jméno je mapováno na UUID uživatele v LDAP. Navíc je cachována DN pro zmenšení interakce s LDAP, ale není používána pro identifikaci. Pokud se DN změní, bude to správně rozpoznáno. Interní uživatelské jméno se používá celé. Vyčištění mapování zanechá zbytky všude. Vyčištění navíc není specifické konfiguraci, bude mít vliv na všechny LDAP konfigurace! Nikdy nečistěte mapování v produkčním prostředí, jen v testovací nebo experimentální fázi."
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Zrušit mapování uživatelských jmen LDAPu"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Zrušit mapování názvů skupin LDAPu"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Vyzkoušet nastavení"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Nápověda"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index eda31fda907..f9b74a7649e 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -142,11 +142,11 @@ msgstr "Rhagfyr"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "eiliad yn ôl"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -154,7 +154,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -162,15 +162,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "heddiw"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "ddoe"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -178,11 +178,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "mis diwethaf"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -190,15 +190,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "misoedd yn ôl"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "y llynedd"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "blwyddyn yn ôl"
 
@@ -206,23 +206,19 @@ msgstr "blwyddyn yn ôl"
 msgid "Choose"
 msgstr "Dewisiwch"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Diddymu"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Ie"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Na"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Iawn"
 
@@ -629,14 +625,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "blaenorol"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "nesaf"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 24e30b40187..a5c216a5355 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr "Dim digon o le ar gael"
 msgid "Upload cancelled."
 msgstr "Diddymwyd llwytho i fyny."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "Does dim hawl cael URL gwag."
 
@@ -107,8 +107,8 @@ msgstr "Does dim hawl cael URL gwag."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Gwall"
 
@@ -186,29 +186,35 @@ msgstr "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Enw plygell annilys. Mae'r defnydd o 'Shared' yn cael ei gadw gan Owncloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Enw"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Maint"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Addaswyd"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
@@ -216,7 +222,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index 6c8d5f69531..40a26ec13c0 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index f53ef9f6f27..e0aa60f01d3 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "methwyd pennu"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Nid yw'r pecyn wedi'i alluogi"
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index bf5e3f365c6..c4bdbaa6bd0 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Yn cadw..."
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index 99af3545bfa..a42f865fb36 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Cymorth"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 99b3fdb8c67..4f224cbacac 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:00+0000\n"
-"Last-Translator: claus_chr <claus_chr@webspeed.dk>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -201,23 +201,19 @@ msgstr "år siden"
 msgid "Choose"
 msgstr "Vælg"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Annuller"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Fejl ved indlæsning af filvælger skabelon"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Nej"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "OK"
 
@@ -624,14 +620,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Hallo,<br><br>dette blot for at lade dig vide, at %s har delt \"%s\" med dig.<br><a href=\"%s\">Se det!</a><br><br>Hej"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "forrige"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "næste"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 168a6cd426a..60430686289 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -97,12 +97,12 @@ msgstr "ikke nok tilgængelig ledig plads "
 msgid "Upload cancelled."
 msgstr "Upload afbrudt."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URLen kan ikke være tom."
 
@@ -110,8 +110,8 @@ msgstr "URLen kan ikke være tom."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ugyldigt mappenavn. Brug af 'Shared' er forbeholdt af ownCloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Fejl"
 
@@ -187,35 +187,41 @@ msgstr "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkron
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappe"
 msgstr[1] "%n mapper"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 6ce42eb608a..a6dc9237e08 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: Sappe\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 8e9c6124d75..95d0d373d80 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:00+0000\n"
-"Last-Translator: claus_chr <claus_chr@webspeed.dk>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,10 +76,6 @@ msgid ""
 "administrator."
 msgstr "Download filerne i små bider, seperat, eller kontakt venligst din administrator."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "kunne ikke fastslås"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Programmet er ikke aktiveret"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 9bff35b5b3d..1ae81e2e65c 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -123,7 +123,11 @@ msgstr "Der opstod en fejl under app opgraderingen"
 msgid "Updated"
 msgstr "Opdateret"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Gemmer..."
 
@@ -168,7 +172,7 @@ msgstr "Fejl ved oprettelse af bruger"
 msgid "A valid password must be provided"
 msgstr "En gyldig adgangskode skal angives"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Dansk"
 
@@ -239,106 +243,106 @@ msgstr "Denne ownCloud-server har ikke en fungerende forbindelse til internettet
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Udføre en opgave med hver side indlæst"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php er registeret hos en webcron-tjeneste til at kalde cron.php en gang i minuttet over http."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Brug systemets cron service til at kalde cron.php filen en gang i minuttet"
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Aktiver Share API"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Tillad apps til at bruge Share API"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Tillad links"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Tillad brugere at dele elementer til offentligheden med links"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Tillad offentlig upload"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Tillad brugere at give andre mulighed for at uploade i deres offentligt delte mapper"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Tillad videredeling"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Tillad brugere at dele elementer delt med dem igen"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Tillad brugere at dele med alle"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillad brugere at kun dele med brugerne i deres grupper"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Sikkerhed"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Gennemtving HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Tving klienten til at forbinde til %s via en kryptetet forbindelse."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Mere"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -468,6 +472,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Anvend denne adresse til at <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tilgå dine filer via WebDAV</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Loginnavn"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 480233b211a..0882b5d0a80 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -155,198 +155,185 @@ msgstr "Bruger Login Filter"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Brugerliste Filter"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definere filteret der bruges ved indlæsning af brugere."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "Uden stedfortræder, f.eks. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Gruppe Filter"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definere filteret der bruges når der indlæses grupper."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "Uden stedfortræder, f.eks. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Forbindelsesindstillinger "
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Konfiguration Aktiv"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Backup (Replika) Vært"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Backup (Replika) Port"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Deaktiver Hovedserver"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr "Forbind kun til replika serveren."
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Brug TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Benyt ikke flere LDAPS forbindelser, det vil mislykkeds. "
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Deaktiver SSL certifikat validering"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Anbefales ikke, brug kun for at teste."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "User Display Name Field"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Base Bruger Træ"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Email Felt"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Internt Brugernavn"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Test Konfiguration"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Hjælp"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 3d323562a86..707d01e384e 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 09:20+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -205,23 +205,19 @@ msgstr "Vor Jahren"
 msgid "Choose"
 msgstr "Auswählen"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Dateiauswahltemplate konnte nicht geladen werden"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Nein"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "OK"
 
@@ -628,14 +624,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Hallo,<br/><br/>wollte dich nur kurz informieren, dass %s gerade %s mit dir geteilt hat.<br/><a href=\"%s\">Schau es dir an.</a><br/><br/>Gruß!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "Zurück"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "Weiter"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/de/files.po b/l10n/de/files.po
index f58b5d5e1ed..c66968b0c14 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -99,12 +99,12 @@ msgstr "Nicht genug Speicherplatz verfügbar"
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
@@ -112,8 +112,8 @@ msgstr "Die URL darf nicht leer sein."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Fehler"
 
@@ -189,35 +189,41 @@ msgstr "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert od
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Dein Speicher ist fast voll ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten."
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n Ordner"
 msgstr[1] "%n Ordner"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n Datei"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index a8263e4c718..656a195b2f7 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 88e04aff8a6..e1661944825 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 09:20+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -76,10 +76,6 @@ msgid ""
 "administrator."
 msgstr "Lade die Dateien in kleineren, separaten, Stücken herunter oder bitte deinen Administrator."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "konnte nicht festgestellt werden"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Die Anwendung ist nicht aktiviert"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 548de28a30d..93d2ba51a14 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -125,7 +125,11 @@ msgstr "Fehler beim Aktualisieren der App"
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Speichern..."
 
@@ -170,7 +174,7 @@ msgstr "Beim Anlegen des Benutzers ist ein Fehler aufgetreten"
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Deutsch (Persönlich)"
 
@@ -241,106 +245,106 @@ msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeute
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Führe eine Aufgabe mit jeder geladenen Seite aus"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php ist als Webcron-Dienst registriert, der die cron.php minütlich per HTTP aufruft."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Benutze den System-Crondienst um die cron.php minütlich aufzurufen."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Teilen"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Aktiviere Sharing-API"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Erlaubt Apps die Nutzung der Share-API"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Erlaubt Links"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Erlaubt erneutes Teilen"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Erzwinge HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Loglevel"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -470,6 +474,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Loginname"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 8f5ae1cdcbc..4206bae5ba9 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -158,198 +158,185 @@ msgstr "Benutzer-Login-Filter"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Benutzer-Filter-Liste"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definiert den Filter für die Anfrage der Benutzer."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Gruppen-Filter"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definiert den Filter für die Anfrage der Gruppen."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Konfiguration wird übersprungen wenn deaktiviert"
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Backup Host (Kopie)"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Backup Port"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Hauptserver deaktivieren"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr "Nur zum Replikat-Server verbinden."
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Nutze TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Schalte die SSL-Zertifikatsprüfung aus."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Falls die Verbindung nur mit dieser Option funktioniert, importiere das SSL-Zertifikat des LDAP-Servers in deinen %s Server."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Nicht empfohlen, nur zu Testzwecken."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Speichere Time-To-Live zwischen"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Änderung leert den Cache."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Ordnereinstellungen"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Feld für den Anzeigenamen des Benutzers"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers."
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Ein Benutzer Basis-DN pro Zeile"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Benutzersucheigenschaften"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Optional; ein Attribut pro Zeile"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Feld für den Anzeigenamen der Gruppe"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen."
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Ein Gruppen Basis-DN pro Zeile"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Gruppensucheigenschaften"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Kontingent Feld"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Standard Kontingent"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "E-Mail Feld"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Interner Benutzername"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -365,15 +352,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken."
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Attribut für interne Benutzernamen:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "UUID-Erkennung überschreiben"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -384,15 +371,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Standardmäßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Du musst allerdings sicherstellen, dass deine gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lasse es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus."
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "UUID-Attribut:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -406,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung."
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Lösche LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Lösche LDAP-Gruppennamenzuordnung"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Testkonfiguration"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index 621763a9b8e..d26af5c3d7b 100644
--- a/l10n/de_AT/core.po
+++ b/l10n/de_AT/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -142,55 +142,55 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -198,23 +198,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -621,14 +617,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po
index 6bb9f95f5e5..5f0e9fd18a3 100644
--- a/l10n/de_AT/files.po
+++ b/l10n/de_AT/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr ""
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/de_AT/lib.po b/l10n/de_AT/lib.po
index 0984165a840..f4911a0682a 100644
--- a/l10n/de_AT/lib.po
+++ b/l10n/de_AT/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po
index 97a2d199c8e..d21b2d2b2b1 100644
--- a/l10n/de_AT/settings.po
+++ b/l10n/de_AT/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/de_AT/user_ldap.po b/l10n/de_AT/user_ldap.po
index 2affcc0727d..affcff22fbe 100644
--- a/l10n/de_AT/user_ldap.po
+++ b/l10n/de_AT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr ""
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index 78e1a2ea083..deacb1c3c4c 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/core.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -149,55 +149,55 @@ msgstr "Dezember"
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -205,23 +205,19 @@ msgstr "Vor Jahren"
 msgid "Choose"
 msgstr "Auswählen"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten."
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Nein"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "OK"
 
@@ -628,14 +624,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele Grüsse!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "Zurück"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "Weiter"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
index 20aca9d1ea2..8befee513b7 100644
--- a/l10n/de_CH/files.po
+++ b/l10n/de_CH/files.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -102,12 +102,12 @@ msgstr "Nicht genügend Speicherplatz verfügbar"
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
@@ -115,8 +115,8 @@ msgstr "Die URL darf nicht leer sein."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ungültiger Ordnername. Die Verwendung von «Shared» ist ownCloud vorbehalten."
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Fehler"
 
@@ -192,35 +192,41 @@ msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert ode
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ungültiger Verzeichnisname. Die Nutzung von «Shared» ist ownCloud vorbehalten"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Grösse"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/de_CH/files_sharing.po b/l10n/de_CH/files_sharing.po
index c17931aa32b..95b2c5d60fc 100644
--- a/l10n/de_CH/files_sharing.po
+++ b/l10n/de_CH/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-07 14:30+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: FlorianScholz <work@bgstyle.de>\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de_CH/lib.po b/l10n/de_CH/lib.po
index b694523ffe8..f196e68f997 100644
--- a/l10n/de_CH/lib.po
+++ b/l10n/de_CH/lib.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -76,10 +76,6 @@ msgid ""
 "administrator."
 msgstr "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bitten Sie Ihren Administrator."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "konnte nicht ermittelt werden"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Die Anwendung ist nicht aktiviert"
diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po
index 776bfefdefd..9b99da139e8 100644
--- a/l10n/de_CH/settings.po
+++ b/l10n/de_CH/settings.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -127,7 +127,11 @@ msgstr "Es ist ein Fehler während des Updates aufgetreten"
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Speichern..."
 
@@ -172,7 +176,7 @@ msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Deutsch (Förmlich: Sie)"
 
@@ -243,106 +247,106 @@ msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeute
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Eine Aufgabe bei jedem Laden der Seite ausführen"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php ist als Webcron-Dienst registriert, der die cron.php minütlich per HTTP aufruft."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Benutzen Sie den System-Crondienst um die cron.php minütlich aufzurufen."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Teilen"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Share-API aktivieren"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Anwendungen erlauben, die Share-API zu benutzen"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Links erlauben"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Erlaube öffentliches hochladen"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Erlaube Weiterverteilen"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "HTTPS erzwingen"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Log-Level"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -472,6 +476,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>."
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Loginname"
diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po
index 20049b695c2..9081b095a9c 100644
--- a/l10n/de_CH/user_ldap.po
+++ b/l10n/de_CH/user_ldap.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
-"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -161,198 +161,185 @@ msgstr "Benutzer-Login-Filter"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "verwenden Sie %%uid Platzhalter, z. B. «uid=%%uid»"
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Benutzer-Filter-Liste"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definiert den Filter für die Anfrage der Benutzer."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "ohne Platzhalter, z.B.: «objectClass=person»"
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Gruppen-Filter"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definiert den Filter für die Anfrage der Gruppen."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "ohne Platzhalter, z.B.: «objectClass=posixGroup»"
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Wenn nicht angehakt, wird diese Konfiguration übersprungen."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Backup Host (Kopie)"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Backup Port"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Hauptserver deaktivieren"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr "Nur zum Replikat-Server verbinden."
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Nutze TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-Server (Windows: Gross- und Kleinschreibung bleibt unbeachtet)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Schalten Sie die SSL-Zertifikatsprüfung aus."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Nicht empfohlen, nur zu Testzwecken."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Speichere Time-To-Live zwischen"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Änderung leert den Cache."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Ordnereinstellungen"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Feld für den Anzeigenamen des Benutzers"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers."
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Ein Benutzer Basis-DN pro Zeile"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Benutzersucheigenschaften"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Optional; ein Attribut pro Zeile"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Feld für den Anzeigenamen der Gruppe"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen."
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Ein Gruppen Basis-DN pro Zeile"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Gruppensucheigenschaften"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Kontingent-Feld"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Standard-Kontingent"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "E-Mail-Feld"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Interner Benutzername"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -368,15 +355,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Standardmässig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmässig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken."
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Interne Eigenschaften des Benutzers:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "UUID-Erkennung überschreiben"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -387,15 +374,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Standardmässig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus."
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "UUID-Attribut:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -409,18 +396,18 @@ msgid ""
 "experimental stage."
 msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung."
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Lösche LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Lösche LDAP-Gruppennamenzuordnung"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Testkonfiguration"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index beccc7cb9aa..da78f8613cf 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 09:30+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -205,23 +205,19 @@ msgstr "Vor Jahren"
 msgid "Choose"
 msgstr "Auswählen"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten."
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Nein"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "OK"
 
@@ -628,14 +624,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele Grüße!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "Zurück"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "Weiter"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index fcaf5ce8f94..ee7f7f50420 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -102,12 +102,12 @@ msgstr "Nicht genügend Speicherplatz verfügbar"
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
@@ -115,8 +115,8 @@ msgstr "Die URL darf nicht leer sein."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten."
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Fehler"
 
@@ -192,35 +192,41 @@ msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert ode
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n Ordner"
 msgstr[1] "%n Ordner"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n Datei"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index 22a6aa0d50d..51ed893dda7 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index c702b000410..ff98de66e2b 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 09:10+0000\n"
-"Last-Translator: noxin <transifex.com@davidmainzer.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,10 +76,6 @@ msgid ""
 "administrator."
 msgstr "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bitten Sie Ihren Administrator."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "konnte nicht ermittelt werden"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Die Anwendung ist nicht aktiviert"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 6a320fe6518..92771d1d43d 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -126,7 +126,11 @@ msgstr "Es ist ein Fehler während des Updates aufgetreten"
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Speichern..."
 
@@ -171,7 +175,7 @@ msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Deutsch (Förmlich: Sie)"
 
@@ -242,106 +246,106 @@ msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeute
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Eine Aufgabe bei jedem Laden der Seite ausführen"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php ist als Webcron-Dienst registriert, der die cron.php minütlich per HTTP aufruft."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Benutzen Sie den System-Crondienst um die cron.php minütlich aufzurufen."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Teilen"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Share-API aktivieren"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Anwendungen erlauben, die Share-API zu benutzen"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Links erlauben"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Erlaube öffentliches hochladen"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Erlaube Weiterverteilen"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "HTTPS erzwingen"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Log-Level"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -471,6 +475,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>."
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Verschlüsselung"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Loginname"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index e6a37a71fc4..35746ea7ce3 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,198 +159,185 @@ msgstr "Benutzer-Login-Filter"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Benutzer-Filter-Liste"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definiert den Filter für die Anfrage der Benutzer."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Gruppen-Filter"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definiert den Filter für die Anfrage der Gruppen."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Wenn nicht angehakt, wird diese Konfiguration übersprungen."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Backup Host (Kopie)"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Backup Port"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Hauptserver deaktivieren"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr "Nur zum Replikat-Server verbinden."
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Nutze TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Schalten Sie die SSL-Zertifikatsprüfung aus."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Nicht empfohlen, nur zu Testzwecken."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Speichere Time-To-Live zwischen"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Änderung leert den Cache."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Ordnereinstellungen"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Feld für den Anzeigenamen des Benutzers"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers."
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Ein Benutzer Basis-DN pro Zeile"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Benutzersucheigenschaften"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Optional; ein Attribut pro Zeile"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Feld für den Anzeigenamen der Gruppe"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen."
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Ein Gruppen Basis-DN pro Zeile"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Gruppensucheigenschaften"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Kontingent-Feld"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Standard-Kontingent"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "E-Mail-Feld"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Interner Benutzername"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -366,15 +353,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken."
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Interne Eigenschaften des Benutzers:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "UUID-Erkennung überschreiben"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -385,15 +372,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Standardmäßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus."
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "UUID-Attribut:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -407,18 +394,18 @@ msgid ""
 "experimental stage."
 msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung."
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Lösche LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Lösche LDAP-Gruppennamenzuordnung"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Testkonfiguration"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 9ce695662a3..f44d1601846 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -148,55 +148,55 @@ msgstr "Δεκέμβριος"
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "δευτερόλεπτα πριν"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "σήμερα"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "χτες"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "τελευταίο μήνα"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "μήνες πριν"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "τελευταίο χρόνο"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "χρόνια πριν"
 
@@ -204,23 +204,19 @@ msgstr "χρόνια πριν"
 msgid "Choose"
 msgstr "Επιλέξτε"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Άκυρο"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Σφάλμα φόρτωσης αρχείου επιλογέα προτύπου"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Ναι"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Όχι"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Οκ"
 
@@ -627,14 +623,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Γεια σας,<br><br>σας ενημερώνουμε ότι ο %s διαμοιράστηκε μαζί σας το »%s«.<br><a href=\"%s\">Δείτε το!</a><br><br>Γεια χαρά!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "προηγούμενο"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "επόμενο"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/el/files.po b/l10n/el/files.po
index e5be16beb95..33d74694271 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -96,12 +96,12 @@ msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος"
 msgid "Upload cancelled."
 msgstr "Η αποστολή ακυρώθηκε."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "Η URL δεν μπορεί να είναι κενή."
 
@@ -109,8 +109,8 @@ msgstr "Η URL δεν μπορεί να είναι κενή."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -186,35 +186,41 @@ msgstr "Ο αποθηκευτικός σας χώρος είναι γεμάτο
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 5fe608cdb4b..79341a41193 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index c98f621f36e..3fbac4a7421 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr "Λήψη των αρχείων σε μικρότερα κομμάτια, χωριστά ή ρωτήστε τον διαχειριστή σας."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "δεν μπορούσε να προσδιορισθεί"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Δεν ενεργοποιήθηκε η εφαρμογή"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 80d72b31abd..6ffb6735912 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -126,7 +126,11 @@ msgstr "Σφάλμα κατά την ενημέρωση της εφαρμογή
 msgid "Updated"
 msgstr "Ενημερώθηκε"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Γίνεται αποθήκευση..."
 
@@ -171,7 +175,7 @@ msgstr "Σφάλμα δημιουργίας χρήστη"
 msgid "A valid password must be provided"
 msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__όνομα_γλώσσας__"
 
@@ -242,106 +246,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Εκτέλεση μιας διεργασίας με κάθε σελίδα που φορτώνεται"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Διαμοιρασμός"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Ενεργοποίηση API Διαμοιρασμού"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν το API Διαμοιρασμού"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Να επιτρέπονται σύνδεσμοι"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζουν δημόσια με συνδέσμους"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Να επιτρέπεται ο επαναδιαμοιρασμός"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Να επιτρέπεται ο διαμοιρασμός με οποιονδήποτε"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Να επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Ασφάλεια"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Επιβολή χρήσης HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Καταγραφές"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Επίπεδο καταγραφής"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Περισσότερα"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Λιγότερα"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Έκδοση"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -471,6 +475,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Χρήση αυτής της διεύθυνσης για <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">πρόσβαση των αρχείων σας μέσω WebDAV</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Όνομα Σύνδεσης"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index fbd59d12749..f01616c71f5 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "User Login Filter"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την προσπάθεια σύνδεσης χρήστη. %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "χρησιμοποιήστε τη μεταβλητή %%uid, π.χ. \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "User List Filter"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση επαφών."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=άτομο\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Group Filter"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Ρυθμίσεις Σύνδεσης"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Ενεργοποιηση ρυθμισεων"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Όταν δεν είναι επιλεγμένο, αυτή η ρύθμιση θα πρέπει να παραλειφθεί. "
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Θύρα"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Δημιουργία αντιγράφων ασφαλείας (Replica) Host "
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Δώστε μια προαιρετική εφεδρική υποδοχή. Πρέπει να είναι ένα αντίγραφο του κύριου LDAP / AD διακομιστη."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Απενεργοποιηση του κεντρικου διακομιστη"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Χρήση TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Μην το χρησιμοποιήσετε επιπροσθέτως, για LDAPS συνδέσεις , θα αποτύχει."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Δεν προτείνεται, χρήση μόνο για δοκιμές."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Cache Time-To-Live"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Ρυθμίσεις Καταλόγου"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Πεδίο Ονόματος Χρήστη"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Base User Tree"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Ένα DN βάσης χρηστών ανά γραμμή"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Χαρακτηριστικά αναζήτησης των χρηστών "
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Προαιρετικά? Ένα χαρακτηριστικό ανά γραμμή "
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Group Display Name Field"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Μια ομαδικη Βάση DN ανά γραμμή"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Ομάδα Χαρακτηριστικων Αναζήτηση"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Ειδικά Χαρακτηριστικά "
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Ποσοσταση πεδιου"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Προκαθισμενο πεδιο"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "σε bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Email τυπος"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Χρήστης Προσωπικόςφάκελος Ονομασία Κανόνας "
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Δοκιμαστικες ρυθμισεις"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Βοήθεια"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index f644607fac9..3def6859364 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -142,55 +142,55 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -198,23 +198,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -621,14 +617,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index 68fdd38747c..8d37893029d 100644
--- a/l10n/en@pirate/files.po
+++ b/l10n/en@pirate/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr ""
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index 94c722fa9a3..35c76d3b04b 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index 69cf917ce77..bd3831f2741 100644
--- a/l10n/en@pirate/lib.po
+++ b/l10n/en@pirate/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index 79163dfbd84..9c6e9df5d64 100644
--- a/l10n/en@pirate/settings.po
+++ b/l10n/en@pirate/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index 3f36998584c..9c7f4649db7 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr ""
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 59d39a60fd0..0ce78d871f5 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -143,55 +143,55 @@ msgstr "Decembro"
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "sekundoj antaŭe"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "hodiaŭ"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "hieraŭ"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "lastamonate"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "monatoj antaŭe"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "lastajare"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "jaroj antaŭe"
 
@@ -199,23 +199,19 @@ msgstr "jaroj antaŭe"
 msgid "Choose"
 msgstr "Elekti"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Nuligi"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Jes"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Akcepti"
 
@@ -622,14 +618,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Saluton:<br /><br />Ni nur sciigas vin, ke %s kunhavigis “%s” kun vi.<br /><a href=\"%s\">Vidu ĝin</a><br /><br />Ĝis!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "maljena"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "jena"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 6b434ac68d5..418410ebe52 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -95,12 +95,12 @@ msgstr "Ne haveblas sufiĉa spaco"
 msgid "Upload cancelled."
 msgstr "La alŝuto nuliĝis."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL ne povas esti malplena."
 
@@ -108,8 +108,8 @@ msgstr "URL ne povas esti malplena."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nevalida dosierujnomo. La uzo de “Shared” estas rezervita de ownCloud."
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Eraro"
 
@@ -185,35 +185,41 @@ msgstr "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Via memoro preskaŭ plenas ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud."
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nomo"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 3a0a3dd5525..215f134b838 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 8c48d709483..45f14563ca1 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "La aplikaĵo ne estas kapabligita"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index be9963b2dd9..7982ef091db 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Konservante..."
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Esperanto"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Kunhavigo"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Kapabligi API-on por Kunhavigo"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Kapabligi ligilojn"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Kapabligi rekunhavigon"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Kapabligi uzantojn kunhavigi kun ĉiu ajn"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Protokolo"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Registronivelo"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Pli"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Malpli"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Eldono"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Ĉifrado"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index f91366c39c9..40492891983 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "Filtrilo de uzantensaluto"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Ĝi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataŭigas la uzantonomon en la ensaluta ago."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "uzu la referencilon %%uid, ekz.: \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtrilo de uzantolisto"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "sen ajna referencilo, ekz.: \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Filtrilo de grupo"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "sen ajna referencilo, ekz.: \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Pordo"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Uzi TLS-on"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-servilo blinda je litergrandeco (Vindozo)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Malkapabligi validkontrolon de SSL-atestiloj."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Ne rekomendata, uzu ĝin nur por testoj."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Kampo de vidignomo de uzanto"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Baza uzantarbo"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Kampo de vidignomo de grupo"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Baza gruparbo"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Asocio de grupo kaj membro"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "duumoke"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lasu malplena por uzantonomo (defaŭlto). Alie, specifu LDAP/AD-atributon."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Helpo"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 195bdf7047b..9baa98366d8 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 13:50+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -206,23 +206,19 @@ msgstr "hace años"
 msgid "Choose"
 msgstr "Seleccionar"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Error cargando la plantilla del seleccionador de archivos"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -629,14 +625,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Oye,<br><br>sólo te hago saber que %s compartido %s contigo,<br><a href=\"%s\">\nMíralo!</a><br><br>Disfrutalo!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "anterior"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "siguiente"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 593c9f3b6b0..a05bd94c82b 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -99,12 +99,12 @@ msgstr "No hay suficiente espacio disponible"
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "La subida del archivo está en proceso. Si sale de la página ahora cancelará la subida."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacía."
 
@@ -112,8 +112,8 @@ msgstr "La URL no puede estar vacía."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nombre de carpeta invalido. El uso de \"Shared\" está reservado por ownCloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Error"
 
@@ -189,35 +189,41 @@ msgstr "Su almacenamiento está lleno, ¡no se pueden actualizar o sincronizar m
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nombre de carpeta no es válido. El uso de \"Shared\" está reservado por Owncloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 302b80c747a..31ba6d42fae 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 209038f14eb..f66d906b20d 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -75,10 +75,6 @@ msgid ""
 "administrator."
 msgstr "Descargue los archivos en trozos más pequeños, por separado o solicítelos amablemente su administrador."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "no pudo ser determinado"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "La aplicación no está habilitada"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 582d3720c7a..df96cf7840f 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: pablomillaquen <pablomillaquen@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -126,7 +126,11 @@ msgstr "Error mientras se actualizaba la aplicación"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Guardando..."
 
@@ -171,7 +175,7 @@ msgstr "Error al crear usuario"
 msgid "A valid password must be provided"
 msgstr "Se debe usar una contraseña valida"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Castellano"
 
@@ -242,106 +246,106 @@ msgstr "Este servidor no tiene una conexión a Internet. Esto significa que algu
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Ejecutar una tarea con cada página cargada"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php está registrado en un servicio WebCron para llamar cron.php una vez por minuto a través de HTTP."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Usar el servicio cron del sistema para llamar al archivo cron.php una vez por minuto."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Compartiendo"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Activar API de Compartición"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Permitir a las aplicaciones utilizar la API de Compartición"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir a los usuarios compartir elementos al público con enlaces"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Permitir subidas públicas"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Permitir re-compartición"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir a los usuarios compartir elementos ya compartidos con ellos mismos"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con todo el mundo"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir a los usuarios compartir sólo con los usuarios en sus grupos"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forzar a los clientes a conectarse a %s por medio de una conexión encriptada."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación SSL."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Nivel de registro"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -471,6 +475,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Utilice esta dirección para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Cifrado"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Nombre de usuario"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index edabac064f8..a823ac15748 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-13 09:11-0400\n"
-"PO-Revision-Date: 2013-08-13 06:00+0000\n"
-"Last-Translator: Rodrigo Rodríguez <roirobo@ubuntu.org.ni>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -158,198 +158,185 @@ msgstr "Filtro de inicio de sesión de usuario"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "usar %%uid como comodín, ej: \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lista de filtros de usuario"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "Sin comodines, ej: \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Define el filtro a aplicar, cuando se obtienen grupos."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "sin comodines, ej: \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Configuración de conexión"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Configuracion activa"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Cuando deseleccione, esta configuracion sera omitida."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Servidor de copia de seguridad (Replica)"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Puerto para copias de seguridad (Replica)"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Deshabilitar servidor principal"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "No lo use para conexiones LDAPS, Fallará."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Apagar la validación por certificado SSL."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Si la conexión funciona sólo con esta opción, importe el certificado SSL del servidor LDAP en su servidor %s."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "No recomendado, sólo para pruebas."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Cache TTL"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Un cambio vacía la caché."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Configuracion de directorio"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Campo de nombre de usuario a mostrar"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Árbol base de usuario"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Un DN Base de Usuario por línea"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Atributos de la busqueda de usuario"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Opcional; un atributo por linea"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Campo de nombre de grupo a mostrar"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Árbol base de grupo"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Un DN Base de Grupo por línea"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Atributos de busqueda de grupo"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Asociación Grupo-Miembro"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Atributos especiales"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Cuota"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Cuota por defecto"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "E-mail"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Regla para la carpeta Home de usuario"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Nombre de usuario interno"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -365,15 +352,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Atributo Nombre de usuario Interno:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Sobrescribir la detección UUID"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -384,15 +371,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "Atributo UUID:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Asignación del Nombre de usuario de un usuario LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -406,18 +393,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Configuración de prueba"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Ayuda"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index a64c557f8e7..4bae50605bd 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -142,55 +142,55 @@ msgstr "diciembre"
 msgid "Settings"
 msgstr "Configuración"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "años atrás"
 
@@ -198,23 +198,19 @@ msgstr "años atrás"
 msgid "Choose"
 msgstr "Elegir"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Error al cargar la plantilla del seleccionador de archivos"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -621,14 +617,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Hola,<br><br>Simplemente te informo que %s compartió %s con vos.<br><a href=\"%s\">Miralo acá:</a><br><br>¡Chau!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "anterior"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "siguiente"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 46a83c8e5b6..bc891faa03c 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -96,12 +96,12 @@ msgstr "No hay suficiente espacio disponible"
 msgid "Upload cancelled."
 msgstr "La subida fue cancelada"
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacía"
 
@@ -109,8 +109,8 @@ msgstr "La URL no puede estar vacía"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nombre de directorio inválido. El uso de \"Shared\" está reservado por ownCloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Error"
 
@@ -186,35 +186,41 @@ msgstr "El almacenamiento está lleno, los archivos no se pueden seguir actualiz
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "El almacenamiento está casi lleno ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index 1af48d91541..b2d33b62c59 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index 722cf0c4c60..b557cf5ae76 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr "Descargá los archivos en partes más chicas, de forma separada, o pedíselos al administrador"
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "no se pudo determinar"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "La aplicación no está habilitada"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 38ed5cca2a4..dfc35a873c6 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -122,7 +122,11 @@ msgstr "Error al actualizar App"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Guardando..."
 
@@ -167,7 +171,7 @@ msgstr "Error creando usuario"
 msgid "A valid password must be provided"
 msgstr "Debe ingresar una contraseña válida"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Castellano (Argentina)"
 
@@ -238,106 +242,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Ejecutá una tarea con cada pagina cargada."
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Compartiendo"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Habilitar Share API"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Permitir a las aplicaciones usar la Share API"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir a los usuarios compartir enlaces públicos"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Permitir subidas públicas"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Permitir que los usuarios autoricen a otros a subir archivos en sus directorios públicos compartidos"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Permitir Re-Compartir"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Permite a los usuarios volver a compartir items que les fueron compartidos"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con cualquiera."
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir a los usuarios compartir sólo con los de sus mismos grupos"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Nivel de Log"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Usá esta dirección para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a tus archivos a través de WebDAV</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Nombre de Usuario"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 21e09ca7c37..2e1635a672f 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -155,198 +155,185 @@ msgstr "Filtro de inicio de sesión de usuario"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazará el nombre de usuario en el proceso de inicio de sesión."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "usar %%uid como plantilla, p. ej.: \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lista de filtros de usuario"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "Sin plantilla, p. ej.: \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Define el filtro a aplicar cuando se obtienen grupos."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Configuración de Conección"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Configuración activa"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Si no está seleccionada, esta configuración será omitida."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Host para copia de seguridad (réplica)"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP/AD."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Puerto para copia de seguridad (réplica)"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Deshabilitar el Servidor Principal"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "No usar adicionalmente para conexiones LDAPS, las mismas fallarán"
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Desactivar la validación por certificado SSL."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "No recomendado, sólo para pruebas."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Tiempo de vida del caché"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Cambiarlo vacía la cache."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Configuración de Directorio"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Campo de nombre de usuario a mostrar"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Árbol base de usuario"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Una DN base de usuario por línea"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Atributos de la búsqueda de usuario"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Opcional; un atributo por linea"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Campo de nombre de grupo a mostrar"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Árbol base de grupo"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Una DN base de grupo por línea"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Atributos de búsqueda de grupo"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Asociación Grupo-Miembro"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Atributos Especiales"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Campo de cuota"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Cuota por defecto"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Campo de e-mail"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Regla de nombre de los directorios de usuario"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Nombre interno de usuario"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Atributo Nombre Interno de usuario:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Sobrescribir la detección UUID"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "Atributo UUID:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Asignación del Nombre de usuario de un usuario LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Probar configuración"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Ayuda"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 089c7847e96..9c79babae64 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -143,55 +143,55 @@ msgstr "Detsember"
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "täna"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "eile"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "viimasel kuul"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "kuu tagasi"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "viimasel aastal"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "aastat tagasi"
 
@@ -199,23 +199,19 @@ msgstr "aastat tagasi"
 msgid "Choose"
 msgstr "Vali"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Loobu"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Viga failivalija malli laadimisel"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Jah"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Ei"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ok"
 
@@ -622,14 +618,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Hei,<br><br>lihtsalt annan sulle teada, et %s jagas sinuga »%s«.<br><a href=\"%s\">Vaata seda!</a><br><br>Tervitades!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "eelm"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "järgm"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 06ecbbff1c1..66b8fc1c9b9 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -96,12 +96,12 @@ msgstr "Pole piisavalt ruumi"
 msgid "Upload cancelled."
 msgstr "Üleslaadimine tühistati."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL ei saa olla tühi."
 
@@ -109,8 +109,8 @@ msgstr "URL ei saa olla tühi."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Viga"
 
@@ -186,35 +186,41 @@ msgstr "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Su andmemaht on peaaegu täis ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. "
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index f45b12c52bb..557d32037ad 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-13 09:11-0400\n"
-"PO-Revision-Date: 2013-08-12 10:50+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index a0fadcd8fea..f221eab3754 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -75,10 +75,6 @@ msgid ""
 "administrator."
 msgstr "Laadi failid alla eraldi väiksemate osadena või küsi nõu oma süsteemiadminstraatorilt."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "ei suudetud tuvastada"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Rakendus pole sisse lülitatud"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 4dc6df1749c..c5788bef801 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -122,7 +122,11 @@ msgstr "Viga rakenduse uuendamisel"
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Salvestamine..."
 
@@ -167,7 +171,7 @@ msgstr "Viga kasutaja loomisel"
 msgid "A valid password must be provided"
 msgstr "Sisesta nõuetele vastav parool"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Eesti"
 
@@ -238,106 +242,106 @@ msgstr "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funkt
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Käivita toiming lehe laadimisel"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php on registreeritud webcron teenusena laadimaks cron.php iga minut üle http."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Kasuta süsteemi cron teenust käivitamaks faili cron.php kord minutis."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Jagamine"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Luba Share API"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Luba rakendustel kasutada Share API-t"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Luba lingid"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Luba kasutajatel jagada kirjeid avalike linkidega"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Luba avalikud üleslaadimised"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Luba kasutajatel üleslaadimine teiste poolt oma avalikult jagatud kataloogidesse "
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Luba edasijagamine"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Luba kasutajatel kõigiga jagada"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Turvalisus"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Sunni peale HTTPS-i kasutamine"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Sunnib kliente %s ühenduma krüpteeritult."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Logi tase"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Rohkem"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Vähem"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Versioon"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Kasuta seda aadressi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Krüpteerimine"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Kasutajanimi"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 429359f138b..d9f36fdaccb 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-13 09:11-0400\n"
-"PO-Revision-Date: 2013-08-12 11:00+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -156,198 +156,185 @@ msgstr "Kasutajanime filter"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Kasutajate nimekirja filter"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Määrab kasutajaid hankides filtri, mida rakendatakse."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Grupi filter"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Määrab gruppe hankides filtri, mida rakendatakse."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Ühenduse seaded"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Seadistus aktiivne"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Kui märkimata, siis seadistust ei kasutata"
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Varuserver"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Lisa täiendav LDAP/AD server, mida replikeeritakse peaserveriga."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Varuserveri (replika) port"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Ära kasuta peaserverit"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr "Ühendu ainult replitseeriva serveriga."
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Kasuta TLS-i"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "LDAPS puhul ära kasuta. Ühendus ei toimi."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Mittetõstutundlik LDAP server (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Lülita SSL sertifikaadi kontrollimine välja."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma %s serverisse."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Pole soovitatav, kasuta ainult testimiseks."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Puhvri iga"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "sekundites. Muudatus tühjendab vahemälu."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Kataloogi seaded"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Kasutaja näidatava nime väli"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr "LDAP atribuut, mida kasutatakse kasutaja kuvatava nime loomiseks."
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Baaskasutaja puu"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Üks kasutajate baas-DN rea kohta"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Kasutaja otsingu atribuudid"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Valikuline; üks atribuut rea kohta"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Grupi näidatava nime väli"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr "LDAP atribuut, mida kasutatakse ownCloudi grupi kuvatava nime loomiseks."
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Baasgrupi puu"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Üks grupi baas-DN rea kohta"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Grupi otsingu atribuudid"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Grupiliikme seotus"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Spetsiifilised atribuudid"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Mahupiirangu atribuut"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Vaikimisi mahupiirang"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "baitides"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Email atribuut"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Kasutaja kodukataloogi nimetamise reegel"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Sisemine kasutajanimi"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -363,15 +350,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URLi osaks, näiteks kõikidel *DAV teenustel. Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi."
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Sisemise kasutajatunnuse atribuut:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Tühista UUID tuvastus"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -382,15 +369,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Vaikimis ownCloud tuvastab automaatselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi."
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "UUID atribuut:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Kasutajatunnus Kasutaja Vastendus"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -404,18 +391,18 @@ msgid ""
 "experimental stage."
 msgstr "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, peab iga LDAP kasutaja omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutajanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas."
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Puhasta LDAP-Grupinimi Grupp Vastendus"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Testi seadistust"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Abiinfo"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index b732596c727..ffc6f231bfc 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -143,55 +143,55 @@ msgstr "Abendua"
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "segundu"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "gaur"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "atzo"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "hilabete"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "joan den urtean"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "urte"
 
@@ -199,23 +199,19 @@ msgstr "urte"
 msgid "Choose"
 msgstr "Aukeratu"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Ezeztatu"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Bai"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Ez"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ados"
 
@@ -622,14 +618,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.<br><a href=\"%s\">\nIkusi ezazu</a><br><br>Ongi jarraitu!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "aurrekoa"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "hurrengoa"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 9c3c84c8910..ac39bb91058 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -95,12 +95,12 @@ msgstr "Ez dago leku nahikorik."
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URLa ezin da hutsik egon."
 
@@ -108,8 +108,8 @@ msgstr "URLa ezin da hutsik egon."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Karpeta izne baliogabea. \"Shared\" karpeta erabilpena OwnCloudentzat erreserbaturik dago."
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Errorea"
 
@@ -185,35 +185,41 @@ msgstr "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. "
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index 81b2f6c18a9..e633bd97d7a 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index 99b8dd00c28..2aa6a48b61e 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -75,10 +75,6 @@ msgid ""
 "administrator."
 msgstr "Deskargatu fitzategiak zati txikiagoetan, banan-banan edo eskatu mesedez zure administradoreari"
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "ezin izan da zehaztu"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Aplikazioa ez dago gaituta"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 561de1b7d88..b30c31bea95 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -122,7 +122,11 @@ msgstr "Errorea aplikazioa eguneratzen zen bitartean"
 msgid "Updated"
 msgstr "Eguneratuta"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Gordetzen..."
 
@@ -167,7 +171,7 @@ msgstr "Errore bat egon da erabiltzailea sortzean"
 msgid "A valid password must be provided"
 msgstr "Baliozko pasahitza eman behar da"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Euskera"
 
@@ -238,106 +242,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Exekutatu zeregin bat orri karga bakoitzean"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php webcron zerbitzu batean erregistratua dago cron.php  minuturo http bidez deitzeko."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Erabili sistemaren cron zerbitzua cron.php fitxategia minuturo deitzeko."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Partekatzea"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Gaitu Elkarbanatze APIa"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Baimendu loturak"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Baimendu igoera publikoak"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Baimendu erabiltzaileak besteak bere partekatutako karpetetan fitxategiak igotzea"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Baimendu birpartekatzea"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Baimendu erabiltzaileak edonorekin elkarbanatzen"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Segurtasuna"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Behartu HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Egunkaria"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Erregistro maila"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Gehiago"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Gutxiago"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Bertsioa"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Enkriptazioa"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Sarrera Izena"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 38995d27908..e9c2fb101c7 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -155,198 +155,185 @@ msgstr "Erabiltzaileen saioa hasteko iragazkia"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Erabiltzaile zerrendaren Iragazkia"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "txantiloirik gabe, adb. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Taldeen iragazkia"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Konexio Ezarpenak"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Konfigurazio Aktiboa"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Markatuta ez dagoenean, konfigurazio hau ez da kontutan hartuko."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Portua"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Babeskopia (Replica) Ostalaria"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Eman babeskopia ostalari gehigarri bat. LDAP/AD zerbitzari nagusiaren replica bat izan behar da."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Babeskopia (Replica) Ataka"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Desgaitu Zerbitzari Nagusia"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Erabili TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Ez erabili LDAPS konexioetarako, huts egingo du."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Ezgaitu SSL ziurtagirien egiaztapena."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Katxearen Bizi-Iraupena"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "segundutan. Aldaketak katxea husten du."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Karpetaren Ezarpenak"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Erabiltzaileen bistaratzeko izena duen eremua"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Oinarrizko Erabiltzaile Zuhaitza"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Erabiltzaile DN Oinarri bat lerroko"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Erabili Bilaketa Atributuak "
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Aukerakoa; atributu bat lerro bakoitzeko"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Taldeen bistaratzeko izena duen eremua"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Oinarrizko Talde Zuhaitza"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Talde DN Oinarri bat lerroko"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Taldekatu Bilaketa Atributuak "
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Talde-Kide elkarketak"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Atributu Bereziak"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Kuota Eremua"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Kuota Lehenetsia"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "bytetan"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Eposta eremua"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Barneko erabiltzaile izena"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Egiaztatu Konfigurazioa"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Laguntza"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 13245335540..1075ec5c3e9 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -142,51 +142,51 @@ msgstr "دسامبر"
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "ثانیه‌ها پیش"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "امروز"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "دیروز"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "ماه قبل"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "ماه‌های قبل"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "سال قبل"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "سال‌های قبل"
 
@@ -194,23 +194,19 @@ msgstr "سال‌های قبل"
 msgid "Choose"
 msgstr "انتخاب کردن"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "منصرف شدن"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "خطا در بارگذاری قالب انتخاب کننده فایل"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "بله"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "نه"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "قبول"
 
@@ -617,14 +613,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "اینجا<br><br> فقط به شما اجازه میدهد که بدانید %s به اشتراک گذاشته شده»%s« توسط شما.<br><a href=\"%s\"> مشاهده آن!</a><br><br> به سلامتی!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "بازگشت"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "بعدی"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 6e40c2131b1..a5fd2a7adb4 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -95,12 +95,12 @@ msgstr "فضای کافی در دسترس نیست"
 msgid "Upload cancelled."
 msgstr "بار گذاری لغو شد"
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. "
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL  نمی تواند خالی باشد."
 
@@ -108,8 +108,8 @@ msgstr "URL  نمی تواند خالی باشد."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "نام پوشه نامعتبر است. استفاده از 'به اشتراک گذاشته شده' متعلق به ownCloud میباشد."
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "خطا"
 
@@ -184,34 +184,40 @@ msgstr "فضای ذخیره ی شما کاملا پر است، بیش از ای
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "نام پوشه نامعتبر است. استفاده از \" به اشتراک گذاشته شده \" متعلق به سایت Owncloud است."
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "نام"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "تاریخ"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index a39839bae35..84ebd4737a2 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 86524be032e..94d2683d00d 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "نمیتواند مشخص شود"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "برنامه فعال نشده است"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index c30c709618f..07f1c49472b 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,11 @@ msgstr "خطا در هنگام بهنگام سازی برنامه"
 msgid "Updated"
 msgstr "بروز رسانی انجام شد"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "در حال ذخیره سازی..."
 
@@ -166,7 +170,7 @@ msgstr "خطا در ایجاد کاربر"
 msgid "A valid password must be provided"
 msgstr "رمز عبور صحیح باید وارد شود"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -237,106 +241,106 @@ msgstr ""
 msgid "Cron"
 msgstr "زمانبند"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "اجرای یک وظیفه با هر بار بارگذاری صفحه"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "اشتراک گذاری"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "فعال کردن API اشتراک گذاری"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "اجازه ی لینک ها"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "مجوز اشتراک گذاری مجدد"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "اجازه به کاربران برای اشتراک گذاری دوباره با آنها"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "اجازه به کابران برای اشتراک گذاری با همه"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "اجازه به کاربران برای اشتراک گذاری ، تنها با دیگر کابران گروه خودشان"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "امنیت"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "وادار کردن HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "کارنامه"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "سطح ورود"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "بیش‌تر"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "کم‌تر"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "نسخه"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "استفاده ابن آدرس <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\"> برای دسترسی فایل های شما از طریق WebDAV </a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "رمزگذاری"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "نام کاربری"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 1a547f66dd7..dabbd41a9ce 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -155,198 +155,185 @@ msgstr "فیلتر ورودی کاربر"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "فیلتر گروه"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "بدون هیچ گونه حفره یا سوراخ، به عنوان مثال، \"objectClass = posixGroup\"."
-
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "تنظیمات اتصال"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "پیکربندی فعال"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "زمانیکه انتخاب نشود، این پیکربندی نادیده گرفته خواهد شد."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "درگاه"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "پشتیبان گیری (بدل) میزبان"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "پشتیبان گیری (بدل) پورت"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "غیر فعال کردن سرور اصلی"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "استفاده ازTLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "علاوه بر این برای اتصالات LDAPS  از آن استفاده نکنید، با شکست مواجه خواهد شد."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "غیر حساس به بزرگی و کوچکی حروف LDAP سرور (ویندوز)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "غیرفعال کردن اعتبار گواهی نامه SSL ."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "توصیه نمی شود، تنها برای آزمایش استفاده کنید."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "تنظیمات پوشه"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "فیلد نام کاربر"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "کاربر درخت پایه"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "یک کاربر پایه DN در هر خط"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "ویژگی های جستجوی کاربر"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "اختیاری؛ یک ویژگی در هر خط"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "فیلد نام گروه"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "گروه درخت پایه "
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "یک گروه پایه DN در هر خط"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "گروه صفات جستجو"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "انجمن گروه کاربران"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "ویژگی های مخصوص"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "سهمیه بندی انجام نشد."
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "سهمیه بندی پیش فرض"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "در بایت"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "ایمیل ارسال نشد."
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "قانون نامگذاری پوشه خانه کاربر"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "خالی گذاشتن برای نام کاربری (پیش فرض). در غیر این صورت، تعیین یک ویژگی LDAP/AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "نام کاربری داخلی"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "ویژگی نام کاربری داخلی:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "نادیده گرفتن تشخیص UUID "
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "صفت UUID:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "نام کاربری - نگاشت کاربر LDAP "
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "پاک کردن نام کاربری- LDAP  نگاشت کاربر "
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "پاک کردن نام گروه -LDAP گروه نقشه برداری"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "امتحان پیکربندی"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "راه‌نما"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 8a0396f34e6..9ca82320bcc 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 09:10+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -198,23 +198,19 @@ msgstr "vuotta sitten"
 msgid "Choose"
 msgstr "Valitse"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Peru"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Kyllä"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Ei"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ok"
 
@@ -621,14 +617,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Hei!<br><br>%s jakoi kohteen »%s« kanssasi.<br><a href=\"%s\">Katso se tästä!</a><br><br>Näkemiin!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "edellinen"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "seuraava"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 7c17c30cb9e..dcf22e09ae1 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -95,12 +95,12 @@ msgstr "Tilaa ei ole riittävästi"
 msgid "Upload cancelled."
 msgstr "Lähetys peruttu."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "Verkko-osoite ei voi olla tyhjä"
 
@@ -108,8 +108,8 @@ msgstr "Verkko-osoite ei voi olla tyhjä"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Virhe"
 
@@ -185,35 +185,41 @@ msgstr "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkro
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Tallennustila on melkein loppu ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Muokattu"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n kansio"
 msgstr[1] "%n kansiota"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n tiedosto"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 6194c089988..fd6c9d78d87 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index c6d87b9c59e..9a990b0377b 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 09:10+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "ei voitu määrittää"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Sovellusta ei ole otettu käyttöön"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 4281890e9da..1b8127f5e66 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,11 @@ msgstr "Virhe sovellusta päivittäessä"
 msgid "Updated"
 msgstr "Päivitetty"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Tallennetaan..."
 
@@ -166,7 +170,7 @@ msgstr "Virhe käyttäjää luotaessa"
 msgid "A valid password must be provided"
 msgstr "Anna kelvollinen salasana"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "_kielen_nimi_"
 
@@ -237,106 +241,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Jakaminen"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Käytä jakamisen ohjelmointirajapintaa"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Salli linkit"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Salli käyttäjien jakaa kohteita käyttäen linkkejä"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Salli uudelleenjakaminen"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Mahdollistaa käyttäjien jakavan uudelleen heidän kanssaan jaettuja kohteita"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Salli käyttäjien jakaa kenen tahansa kanssa"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Tietoturva"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Pakota HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Lokitaso"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Enemmän"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Vähemmän"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Versio"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Käytä tätä osoitetta <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">päästäksesi käsiksi tiedostoihisi WebDAVin kautta</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Salaus"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Kirjautumisnimi"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index a935ca4f827..394517b9292 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "Login suodatus"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Määrittelee käytettävän suodattimen, kun sisäänkirjautumista yritetään. %%uid korvaa sisäänkirjautumisessa käyttäjätunnuksen."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "käytä %%uid paikanvaraajaa, ts. \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Käyttäjien suodatus"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Määrittelee käytettävän suodattimen, kun käyttäjiä haetaan.  "
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "ilman paikanvaraustermiä, ts. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Ryhmien suodatus"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Määrittelee käytettävän suodattimen, kun ryhmiä haetaan.  "
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Yhteysasetukset"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Portti"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Poista pääpalvelin käytöstä"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Käytä TLS:ää"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Poista käytöstä SSL-varmenteen vahvistus"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Ei suositella, käytä vain testausta varten."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "sekunneissa. Muutos tyhjentää välimuistin."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Hakemistoasetukset"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Käyttäjän näytettävän nimen kenttä"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Oletuskäyttäjäpuu"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Ryhmän \"näytettävä nimi\"-kenttä"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Ryhmien juuri"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Ryhmän ja jäsenen assosiaatio (yhteys)"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "tavuissa"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Sähköpostikenttä"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Ohje"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 8246c9644de..b5e48526b0a 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -146,55 +146,55 @@ msgstr "décembre"
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "il y a quelques secondes"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "aujourd'hui"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "hier"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "le mois dernier"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "il y a plusieurs mois"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "l'année dernière"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "il y a plusieurs années"
 
@@ -202,23 +202,19 @@ msgstr "il y a plusieurs années"
 msgid "Choose"
 msgstr "Choisir"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Annuler"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Erreur de chargement du modèle du sélecteur de fichier"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Oui"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Non"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ok"
 
@@ -625,14 +621,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Salut,<br><br>je veux juste vous signaler %s partagé »%s« avec vous.<br><a href=\"%s\">Voyez-le!</a><br><br>Bonne continuation!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "précédent"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "suivant"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index b13ec6d53c3..175956137dc 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -97,12 +97,12 @@ msgstr "Espace disponible insuffisant"
 msgid "Upload cancelled."
 msgstr "Envoi annulé."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "L'URL ne peut-être vide"
 
@@ -110,8 +110,8 @@ msgstr "L'URL ne peut-être vide"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Erreur"
 
@@ -187,35 +187,41 @@ msgstr "Votre espage de stockage est plein, les fichiers ne peuvent plus être t
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 67c79c9ec35..c6eae4ea599 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 0658f16d435..1c17ec9eeaa 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "impossible à déterminer"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "L'application n'est pas activée"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 168a33c9ec9..a237f608976 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -124,7 +124,11 @@ msgstr "Erreur lors de la mise à jour de l'application"
 msgid "Updated"
 msgstr "Mise à jour effectuée avec succès"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Enregistrement..."
 
@@ -169,7 +173,7 @@ msgstr "Erreur lors de la création de l'utilisateur"
 msgid "A valid password must be provided"
 msgstr "Un mot de passe valide doit être saisi"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Français"
 
@@ -240,106 +244,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Exécute une tâche à chaque chargement de page"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Partage"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Activer l'API de partage"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Autoriser les applications à utiliser l'API de partage"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Autoriser les liens"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Autoriser le repartage"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Autoriser les utilisateurs à partager avec tout le monde"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Sécurité"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Forcer HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Niveau de log"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Moins"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -469,6 +473,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Utilisez cette adresse pour <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accéder à vos fichiers via WebDAV</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Chiffrement"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Nom de la connexion"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 39d520c2b30..9729b2532b7 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -155,198 +155,185 @@ msgstr "Modèle d'authentification utilisateurs"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtre d'utilisateurs"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "sans élément de substitution, par exemple \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Filtre de groupes"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Définit le filtre à appliquer lors de la récupération des groupes."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Paramètres de connexion"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Configuration active"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Lorsque non cochée, la configuration sera ignorée."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Serveur de backup (réplique)"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Fournir un serveur de backup optionnel.  Il doit s'agir d'une réplique du serveur LDAP/AD principal."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Port du serveur de backup (réplique)"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Désactiver le serveur principal"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Utiliser TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "À ne pas utiliser pour les connexions LDAPS (cela échouera)."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Serveur LDAP insensible à la casse (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Désactiver la validation du certificat SSL."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Non recommandé, utilisation pour tests uniquement."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Durée de vie du cache"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "en secondes. Tout changement vide le cache."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Paramètres du répertoire"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Champ \"nom d'affichage\" de l'utilisateur"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "DN racine de l'arbre utilisateurs"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Un DN racine utilisateur par ligne"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Recherche des attributs utilisateur"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Optionnel, un attribut par ligne"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Champ \"nom d'affichage\" du groupe"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "DN racine de l'arbre groupes"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Un DN racine groupe par ligne"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Recherche des attributs du groupe"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Association groupe-membre"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Attributs spéciaux"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Champ du quota"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Quota par défaut"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Champ Email"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Convention de nommage du répertoire utilisateur"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Laisser vide "
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Nom d'utilisateur interne"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Nom d'utilisateur interne:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Surcharger la détection d'UUID"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "Attribut UUID :"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Association Nom d'utilisateur-Utilisateur LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Supprimer l'association utilisateur interne-utilisateur LDAP"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Supprimer l'association nom de groupe-groupe LDAP"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Tester la configuration"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Aide"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 465eb303ab1..50cf7e0e18d 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 10:30+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -198,23 +198,19 @@ msgstr "anos atrás"
 msgid "Choose"
 msgstr "Escoller"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Produciuse un erro ao cargar o modelo do selector de ficheiros"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Si"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Non"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -621,14 +617,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Ola,<br><br>só facerlle saber que %s compartiu «%s» con vostede.<br><a href=\"%s\">Véxao!</a><br><br>Saúdos!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "anterior"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "seguinte"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index bf0d006d7ae..1d4342dddee 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -95,12 +95,12 @@ msgstr "O espazo dispoñíbel é insuficiente"
 msgid "Upload cancelled."
 msgstr "Envío cancelado."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "O URL non pode quedar baleiro."
 
@@ -108,8 +108,8 @@ msgstr "O URL non pode quedar baleiro."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Erro"
 
@@ -185,35 +185,41 @@ msgstr "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de cartafol incorrecto. O uso de «Shared» está reservado por Owncloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n cartafol"
 msgstr[1] "%n cartafoles"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n ficheiro"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index 13e9cefab47..887502a08be 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 8f5d1c95fa9..49881baaafb 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 10:30+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr "Descargue os ficheiros en cachos máis pequenos e por separado, ou pídallos amabelmente ao seu administrador."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "non foi posíbel determinalo"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "O aplicativo non está activado"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 35d5432fae3..02d7a03a194 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -121,7 +121,11 @@ msgstr "Produciuse un erro mentres actualizaba o aplicativo"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Gardando..."
 
@@ -166,7 +170,7 @@ msgstr "Produciuse un erro ao crear o usuario"
 msgid "A valid password must be provided"
 msgstr "Debe fornecer un contrasinal"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Galego"
 
@@ -237,106 +241,106 @@ msgstr "Este servidor non ten conexión a Internet. Isto significa que algunhas
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Executar unha tarefa con cada páxina cargada"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php unha vez por minuto a través de HTTP."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Use o servizo de sistema cron para chamar ao ficheiro cron.php unha vez por minuto."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Compartindo"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Activar o API para compartir"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que os aplicativos empreguen o API para compartir"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Permitir ligazóns"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que os usuarios compartan elementos ao público con ligazóns"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Permitir os envíos públicos"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Permitir que os usuarios lle permitan a outros enviar aos seus cartafoles compartidos publicamente"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Permitir compartir"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que os usuarios compartan de novo os elementos compartidos con eles"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Permitir que os usuarios compartan con calquera"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que os usuarios compartan só cos usuarios dos seus grupos"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Seguranza"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forzar que os clientes se conecten a %s empregando unha conexión cifrada."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Conéctese a %s empregando HTTPS para activar ou desactivar o forzado de SSL."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Rexistro"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Nivel de rexistro"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Máis"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Empregue esta ligazón <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Nome de acceso"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 0202018f3d4..74fb6d131b0 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -155,198 +155,185 @@ msgstr "Filtro de acceso de usuarios"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "usar a marca de posición %%uid, p.ex «uid=%%uid»"
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtro da lista de usuarios"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Define o filtro a aplicar cando se recompilan os usuarios."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "sen ningunha marca de posición, como p.ex «objectClass=persoa»."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Define o filtro a aplicar cando se recompilan os grupos."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix»."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Axustes da conexión"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Configuración activa"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Se está sen marcar, omítese esta configuración."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Porto"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Servidor da copia de seguranza (Réplica)"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Indicar un servidor de copia de seguranza opcional. Debe ser unha réplica do servidor principal LDAP/AD."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Porto da copia de seguranza (Réplica)"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Desactivar o servidor principal"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr "Conectar só co servidor de réplica."
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Non utilizalo ademais para conexións LDAPS xa que fallará."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Desactiva a validación do certificado SSL."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no teu servidor %s."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Non se recomenda. Só para probas."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Tempo de persistencia da caché"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Calquera cambio baleira a caché."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Axustes do directorio"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Campo de mostra do nome de usuario"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr "O atributo LDAP a empregar para xerar o nome de usuario para amosar."
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Base da árbore de usuarios"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Un DN base de usuario por liña"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Atributos de busca do usuario"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Opcional; un atributo por liña"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Campo de mostra do nome de grupo"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr "O atributo LDAP úsase para xerar os nomes dos grupos que amosar."
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Base da árbore de grupo"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Un DN base de grupo por liña"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Atributos de busca do grupo"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Asociación de grupos e membros"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Atributos especiais"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Campo de cota"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Cota predeterminada"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Campo do correo"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Regra de nomeado do cartafol do usuario"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Nome de usuario interno"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario é único e de non ter que converter os caracteres. O nome de usuario interno ten a limitación de que só están permitidos estes caracteres: [ a-zA-Z0-9_.@- ].  Os outros caracteres substitúense pola súa correspondencia ASCII ou simplemente omítense. Nas colisións engadirase/incrementarase un número. O nome de usuario interno utilizase para identificar a un usuario interno. É tamén o nome predeterminado do cartafol persoal do usuario. Tamén é parte dun URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP."
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Atributo do nome de usuario interno:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Ignorar a detección do UUID"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "De xeito predeterminado, o atributo UUID é detectado automaticamente. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP."
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "Atributo do UUID:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Asignación do usuario ao «nome de usuario LDAP»"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
 "experimental stage."
 msgstr "Os nomes de usuario empreganse para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais."
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Limpar a asignación do usuario ao «nome de usuario LDAP»"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Limpar a asignación do grupo ao «nome de grupo LDAP»"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Probar a configuración"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Axuda"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 44845c5b9e7..4919323ca05 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -142,55 +142,55 @@ msgstr "דצמבר"
 msgid "Settings"
 msgstr "הגדרות"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "שניות"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "היום"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "אתמול"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "חודש שעבר"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "חודשים"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "שנה שעברה"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "שנים"
 
@@ -198,23 +198,19 @@ msgstr "שנים"
 msgid "Choose"
 msgstr "בחירה"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "ביטול"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "שגיאה בטעינת תבנית בחירת הקבצים"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "כן"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "לא"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "בסדר"
 
@@ -621,14 +617,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "הקודם"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "הבא"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 523cab114d4..1b7e785ebf1 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -95,12 +95,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "ההעלאה בוטלה."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "קישור אינו יכול להיות ריק."
 
@@ -108,8 +108,8 @@ msgstr "קישור אינו יכול להיות ריק."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "שגיאה"
 
@@ -185,35 +185,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "שם"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "זמן שינוי"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 9ce5f7cc91e..0af4dee2ecc 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index a5297272430..ba288940743 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "יישומים אינם מופעלים"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index e4eee2b12b4..469aab5a95c 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,11 @@ msgstr "אירעה שגיאה בעת עדכון היישום"
 msgid "Updated"
 msgstr "מעודכן"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "שמירה…"
 
@@ -166,7 +170,7 @@ msgstr "יצירת המשתמש נכשלה"
 msgid "A valid password must be provided"
 msgstr "יש לספק ססמה תקנית"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "עברית"
 
@@ -237,106 +241,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "יש להפעיל משימה אחת עם כל עמוד שנטען"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "שיתוף"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "הפעלת API השיתוף"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "לאפשר ליישום להשתמש ב־API השיתוף"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "לאפשר קישורים"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "לאפשר למשתמשים לשתף פריטים "
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "לאפשר שיתוף מחדש"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "לאפשר למשתמשים לשתף הלאה פריטים ששותפו אתם"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "לאפשר למשתמשים לשתף עם כל אחד"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "לאפשר למשתמשים לשתף עם משתמשים בקבוצות שלהם בלבד"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "אבטחה"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "לאלץ HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "יומן"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "רמת הדיווח"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "יותר"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "פחות"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "גרסא"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "הצפנה"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "שם כניסה"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 8f989bc1fae..af6906d1973 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -155,198 +155,185 @@ msgstr "סנן כניסת משתמש"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "סנן רשימת משתמשים"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "סנן קבוצה"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "פורט"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "בשניות. שינוי מרוקן את המטמון."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "בבתים"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "עזרה"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index b9bb38c3e73..27c6e564ae4 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -142,55 +142,55 @@ msgstr "दिसम्बर"
 msgid "Settings"
 msgstr "सेटिंग्स"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -198,23 +198,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -621,14 +617,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "पिछला"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "अगला"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index e15750a9842..f3bce0ac149 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "त्रुटि"
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index d2b0c7fad22..28b270f1948 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 66da608edd3..6c4da2cc6c6 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 69b89ecdf7d..053000fe64c 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "सहयोग"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 521c5d60347..fc513b2f685 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -141,59 +141,59 @@ msgstr "Prosinac"
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "danas"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "jučer"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "prošli mjesec"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "mjeseci"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "prošlu godinu"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "godina"
 
@@ -201,23 +201,19 @@ msgstr "godina"
 msgid "Choose"
 msgstr "Izaberi"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Odustani"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "U redu"
 
@@ -624,14 +620,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "prethodan"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "sljedeći"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index ad1dd62f473..b15680bceff 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "Slanje poništeno."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Greška"
 
@@ -185,36 +185,42 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 74836110cc8..ee7cc3cc679 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index c9c913ffa16..32395b83128 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index e8be72648d0..660714684d6 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Spremanje..."
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__ime_jezika__"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "dnevnik"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "više"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 28599c68dc6..bbd09586144 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Pomoć"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 5348acb3a5d..715adea419f 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -143,55 +143,55 @@ msgstr "december"
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "pár másodperce"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "ma"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "tegnap"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "múlt hónapban"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "több hónapja"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "tavaly"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "több éve"
 
@@ -199,23 +199,19 @@ msgstr "több éve"
 msgid "Choose"
 msgstr "Válasszon"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Nem sikerült betölteni a fájlkiválasztó sablont"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Igen"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Nem"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ok"
 
@@ -622,14 +618,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Üdv!<br><br>Új hír: %s megosztotta Önnel ezt:  »%s«.<br><a href=\"%s\">Itt nézhető meg!</a><br><br>Minden jót!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "előző"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "következő"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index f3c43820b2d..cc2316c691e 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -95,12 +95,12 @@ msgstr "Nincs elég szabad hely"
 msgid "Upload cancelled."
 msgstr "A feltöltést megszakítottuk."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "Az URL nem lehet semmi."
 
@@ -108,8 +108,8 @@ msgstr "Az URL nem lehet semmi."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Hiba"
 
@@ -185,35 +185,41 @@ msgstr "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhat
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "A tároló majdnem tele van ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Érvénytelen mappanév. A név használata csak a Owncloud számára lehetséges."
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Név"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Módosítva"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index ea31ac3f6fc..43059eac1fc 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:50+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index d517cddd328..e508505f741 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -75,10 +75,6 @@ msgid ""
 "administrator."
 msgstr "Tölts le a fileokat kisebb chunkokban, kölün vagy kérj segitséget a rendszergazdádtól."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "nem határozható meg"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Az alkalmazás nincs engedélyezve"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index e9f13f44d64..c0b8de03bf2 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: ebela <bela@dandre.hu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -123,7 +123,11 @@ msgstr "Hiba történt a programfrissítés közben"
 msgid "Updated"
 msgstr "Frissítve"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Mentés..."
 
@@ -168,7 +172,7 @@ msgstr "A felhasználó nem hozható létre"
 msgid "A valid password must be provided"
 msgstr "Érvényes jelszót kell megadnia"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -239,106 +243,106 @@ msgstr "A kiszolgálónak nincs müködő internet kapcsolata. Ez azt jelenti, h
 msgid "Cron"
 msgstr "Ütemezett feladatok"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "A cron.php webcron szolgáltatásként van regisztrálva. Hívja meg a cron.php állományt http-n keresztül percenként egyszer."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "A rendszer cron szolgáltatásának használata. Hívja meg a cron.php állományt percenként egyszer a rendszer cron szolgáltatásának segítségével."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Megosztás"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "A megosztás API-jának engedélyezése"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Linkek engedélyezése"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Lehetővé teszi, hogy a felhasználók linkek segítségével külsősökkel is megoszthassák az adataikat"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Feltöltést engedélyezése mindenki számára"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Engedélyezni a felhasználóknak, hogy beállíithassák, hogy mások feltölthetnek a nyilvánosan megosztott mappákba."
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "A továbbosztás engedélyezése"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Lehetővé teszi, hogy a felhasználók a velük megosztott állományokat megosszák egy további, harmadik féllel"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "A felhasználók bárkivel megoszthatják állományaikat"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "A felhasználók csak olyanokkal oszthatják meg állományaikat, akikkel közös csoportban vannak"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Biztonság"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Kötelező HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak a %s szolgáltatáshoz."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Kérjük kapcsolodjon a %s rendszerhez HTTPS protokollon keresztül, hogy be vagy ki kapcsoljaa kötelező SSL beállítást."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Naplózás"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Naplózási szint"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Több"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Kevesebb"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Verzió"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -468,6 +472,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Ezt a címet használja, ha <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV-on keresztül szeretné elérni az állományait</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Bejelentkezési név"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 0d0100a200e..166a16c7f81 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -156,198 +156,185 @@ msgstr "Szűrő a bejelentkezéshez"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "használja az %%uid változót, pl. \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "A felhasználók szűrője"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Ez a szűrő érvényes a felhasználók listázásakor."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "itt ne használjon változót, pl. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "A csoportok szűrője"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Ez a szűrő érvényes a csoportok listázásakor."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "itt ne használjunk változót, pl. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Kapcsolati beállítások"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "A beállítás aktív"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ha nincs kipipálva, ez a beállítás kihagyódik."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Másodkiszolgáló (replika)"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Adjon meg egy opcionális másodkiszolgálót. Ez a fő LDAP/AD kiszolgáló szinkron másolata (replikája) kell legyen."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "A másodkiszolgáló (replika) portszáma"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "A fő szerver kihagyása"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Használjunk TLS-t"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "LDAPS kapcsolatok esetén ne kapcsoljuk be, mert nem fog működni."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Ne ellenőrizzük az SSL-tanúsítvány érvényességét"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Nem javasolt, csak tesztelésre érdemes használni."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "A gyorsítótár tárolási időtartama"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "másodpercben. A változtatás törli a cache tartalmát."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Címtár beállítások"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "A felhasználónév mezője"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "A felhasználói fa gyökere"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Soronként egy felhasználói fa gyökerét adhatjuk meg"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "A felhasználók lekérdezett attribútumai"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Nem kötelező megadni, soronként egy attribútum"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "A csoport nevének mezője"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "A csoportfa gyökere"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Soronként egy csoportfa gyökerét adhatjuk meg"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "A csoportok lekérdezett attribútumai"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "A csoporttagság attribútuma"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Különleges attribútumok"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Kvóta mező"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Alapértelmezett kvóta"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "bájtban"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Email mező"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "A home könyvtár elérési útvonala"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!"
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Belső felhasználónév"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -363,15 +350,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "A belső felhasználónév attribútuma:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Az UUID-felismerés felülbírálása"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -382,15 +369,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "UUID attribútum:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Felhasználó - LDAP felhasználó hozzárendelés"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -404,18 +391,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "A felhasználó - LDAP felhasználó hozzárendelés törlése"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "A csoport - LDAP csoport hozzárendelés törlése"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "A beállítások tesztelése"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Súgó"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 0b7d7fdbaac..e2aceb5731c 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -141,55 +141,55 @@ msgstr "Դեկտեմբեր"
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -197,23 +197,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 43c435dd47c..4769f28713c 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr ""
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index 59d5e3109f5..bdb47a3fbc9 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index a5d0fdb5e62..c4bd9162a85 100644
--- a/l10n/hy/lib.po
+++ b/l10n/hy/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 0cb76a2fd2f..a4f0a39f2e3 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index 40ead5a3d60..8b2b904fe7f 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index cb317dbb059..901f0476070 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -141,55 +141,55 @@ msgstr "Decembre"
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -197,23 +197,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Cancellar"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "prev"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "prox"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index d9fb2c5d01d..0ef13b54839 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Error"
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index ac0a658eb5e..6fb91fb6c7e 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index c60af2f1aa1..2d76564c421 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index be9966dae6c..45bea595cdd 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Interlingua"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 31b0570076c..a8bd30ff193 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Adjuta"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index b3db7059779..abd8fc9cd4d 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -141,51 +141,51 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "hari ini"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "kemarin"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "beberapa bulan lalu"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
@@ -193,23 +193,19 @@ msgstr "beberapa tahun lalu"
 msgid "Choose"
 msgstr "Pilih"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Batal"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Ya"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Tidak"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Oke"
 
@@ -616,14 +612,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "sebelumnya"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "selanjutnya"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 72b3b847353..2afa9512605 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr "Ruang penyimpanan tidak mencukupi"
 msgid "Upload cancelled."
 msgstr "Pengunggahan dibatalkan."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL tidak boleh kosong"
 
@@ -107,8 +107,8 @@ msgstr "URL tidak boleh kosong"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Galat"
 
@@ -183,34 +183,40 @@ msgstr "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkr
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nama folder salah. Nama 'Shared' telah digunakan oleh Owncloud."
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 79f5f77df10..1a7fb0fbb08 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index e1a8dc80a69..a687ac2f3ef 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "tidak dapat ditentukan"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Aplikasi tidak diaktifkan"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 12086b8b8a3..0593869e6de 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr "Gagal ketika memperbarui aplikasi"
 msgid "Updated"
 msgstr "Diperbarui"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Menyimpan..."
 
@@ -165,7 +169,7 @@ msgstr "Gagal membuat pengguna"
 msgid "A valid password must be provided"
 msgstr "Tuliskan sandi yang valid"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Jalankan tugas setiap kali halaman dimuat"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Berbagi"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Aktifkan API Pembagian"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Izinkan aplikasi untuk menggunakan API Pembagian"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Izinkan tautan"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Izinkan pengguna untuk berbagi item kepada publik lewat tautan"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Izinkan pembagian ulang"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka."
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Izinkan pengguna untuk berbagi kepada siapa saja"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Hanya izinkan pengguna untuk berbagi dengan pengguna pada grup mereka sendiri"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Keamanan"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Selalu Gunakan HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Catat"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Level pencatatan"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Lainnya"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Ciutkan"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Versi"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Enkripsi"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Nama Masuk"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index f2e6d29fcce..e165b0b8d33 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "gunakan saringan login"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "gunakan pengganti %%uid, mis. \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Daftar Filter Pengguna"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definisikan filter untuk diterapkan saat menerima pengguna."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "tanpa pengganti apapun, mis. \"objectClass=seseorang\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "saringan grup"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definisikan filter untuk diterapkan saat menerima grup."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Pengaturan Koneksi"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Konfigurasi Aktif"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Jika tidak dicentang, konfigurasi ini dilewati."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "port"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Host Cadangan (Replika)"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Port Cadangan (Replika)"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Nonaktifkan Server Utama"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "gunakan TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Server LDAP dengan kapitalisasi tidak sensitif (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "matikan validasi sertivikat SSL"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "tidak disarankan, gunakan hanya untuk pengujian."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Gunakan Tembolok untuk Time-To-Live"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "dalam detik. perubahan mengosongkan cache"
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Pengaturan Direktori"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Bidang Tampilan Nama Pengguna"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Pohon Pengguna Dasar"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Satu Pengguna Base DN per baris"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Atribut Pencarian Pengguna"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Pilihan; satu atribut per baris"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Bidang Tampilan Nama Grup"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Pohon Grup Dasar"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Satu Grup Base DN per baris"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Atribut Pencarian Grup"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "asosiasi Anggota-Grup"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Atribut Khusus"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Bidang Kuota"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Kuota Baku"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "dalam bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Bidang Email"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Aturan Penamaan Folder Home Pengguna"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Uji Konfigurasi"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Bantuan"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 478150b094b..875e468f20a 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -142,55 +142,55 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Stillingar"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "sek."
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "í dag"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "í gær"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "síðasta mánuði"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "mánuðir síðan"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "síðasta ári"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "einhverjum árum"
 
@@ -198,23 +198,19 @@ msgstr "einhverjum árum"
 msgid "Choose"
 msgstr "Veldu"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Hætta við"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Já"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Nei"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Í lagi"
 
@@ -621,14 +617,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "fyrra"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "næsta"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 516265cd8bc..0cc47cc2229 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr "Ekki nægt pláss tiltækt"
 msgid "Upload cancelled."
 msgstr "Hætt við innsendingu."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "Vefslóð má ekki vera tóm."
 
@@ -107,8 +107,8 @@ msgstr "Vefslóð má ekki vera tóm."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Villa"
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Óleyfilegt nafn á möppu. Nafnið 'Shared' er frátekið fyrir Owncloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Stærð"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Breytt"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index e4966a548d8..20e744006b8 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index 5926c37fa9f..426da0a471f 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Forrit ekki virkt"
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 6e26f787fdf..8c1bc1c835a 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,11 @@ msgstr ""
 msgid "Updated"
 msgstr "Uppfært"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Er að vista ..."
 
@@ -166,7 +170,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__nafn_tungumáls__"
 
@@ -237,106 +241,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Meira"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Minna"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Útgáfa"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Dulkóðun"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 344e82af525..389e4c206ef 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -155,198 +155,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Prúfa uppsetningu"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Hjálp"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 84687acd093..e2a608899bb 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -144,55 +144,55 @@ msgstr "Dicembre"
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "oggi"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "mese scorso"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "mesi fa"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "anno scorso"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "anni fa"
 
@@ -200,23 +200,19 @@ msgstr "anni fa"
 msgid "Choose"
 msgstr "Scegli"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Annulla"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Errore durante il caricamento del modello del selezionatore di file"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Sì"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ok"
 
@@ -623,14 +619,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Ehilà,<br><br>volevo solamente farti sapere che %s ha condiviso «%s» con te.<br><a href=\"%s\">Guarda!</a><br><br>Saluti!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "precedente"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "successivo"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/it/files.po b/l10n/it/files.po
index b45c88102ae..5f8c561cb46 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -96,12 +96,12 @@ msgstr "Spazio disponibile insufficiente"
 msgid "Upload cancelled."
 msgstr "Invio annullato"
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "L'URL non può essere vuoto."
 
@@ -109,8 +109,8 @@ msgstr "L'URL non può essere vuoto."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Errore"
 
@@ -186,35 +186,41 @@ msgstr "Lo spazio di archiviazione è pieno, i file non possono essere più aggi
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato da ownCloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index b2ebeff4403..f314ab509b1 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 506821d1d77..0802ffca262 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -75,10 +75,6 @@ msgid ""
 "administrator."
 msgstr "Scarica i file in blocchi più piccoli, separatamente o chiedi al tuo amministratore."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "non può essere determinato"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "L'applicazione  non è abilitata"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 0f2c1b0c371..a2e51a418bf 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -123,7 +123,11 @@ msgstr "Errore durante l'aggiornamento"
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Salvataggio in corso..."
 
@@ -168,7 +172,7 @@ msgstr "Errore durante la creazione dell'utente"
 msgid "A valid password must be provided"
 msgstr "Deve essere fornita una password valida"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Italiano"
 
@@ -239,106 +243,106 @@ msgstr "Questo server ownCloud non ha una connessione a Internet funzionante. Ci
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Esegui un'operazione con ogni pagina caricata"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php è registrato su un servizio webcron per invocare la pagina cron.php ogni minuto su http."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Usa il servizio cron di sistema per invocare il file cron.php ogni minuto."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Condivisione"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Abilita API di condivisione"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Consenti alle applicazioni di utilizzare le API di condivisione"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Consenti collegamenti"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Consenti caricamenti pubblici"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Consenti agli utenti di abilitare altri al caricamento nelle loro cartelle pubbliche condivise"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Consenti la ri-condivisione"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Consenti agli utenti di condividere a loro volta elementi condivisi da altri"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Consenti agli utenti di condividere con chiunque"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Consenti agli utenti di condividere solo con utenti dei loro gruppi"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Protezione"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Forza HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forza i client a connettersi a %s tramite una connessione cifrata."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Livello di log"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Altro"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Meno"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Versione"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -468,6 +472,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Utilizza questo indirizzo per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedere ai tuoi file via WebDAV</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Cifratura"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Nome utente"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 833085b49f3..c9793a8644e 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -155,198 +155,185 @@ msgstr "Filtro per l'accesso utente"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "utilizza il segnaposto %%uid, ad esempio \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtro per l'elenco utenti"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Specifica quale filtro utilizzare durante il recupero degli utenti."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "senza nessun segnaposto, per esempio \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Filtro per il gruppo"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Specifica quale filtro utilizzare durante il recupero dei gruppi."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "senza nessun segnaposto, per esempio \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Impostazioni di connessione"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Configurazione attiva"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Se deselezionata, questa configurazione sarà saltata."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Porta"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Host di backup (Replica)"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Fornisci un host di backup opzionale. Deve essere una replica del server AD/LDAP principale."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Porta di backup (Replica)"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Disabilita server principale"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr "Collegati solo al server di replica."
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Usa TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Da non utilizzare per le connessioni LDAPS, non funzionerà."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Case insensitve LDAP server (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Disattiva il controllo del certificato SSL."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server %s."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Non consigliato, utilizzare solo per test."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Tempo di vita della cache"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "in secondi. Il cambio svuota la cache."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Impostazioni delle cartelle"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Campo per la visualizzazione del nome utente"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr "L'attributo LDAP da usare per generare il nome visualizzato dell'utente."
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Struttura base dell'utente"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Un DN base utente per riga"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Attributi di ricerca utente"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Opzionale; un attributo per riga"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Campo per la visualizzazione del nome del gruppo"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr "L'attributo LDAP da usare per generare il nome visualizzato del gruppo."
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Struttura base del gruppo"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Un DN base gruppo per riga"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Attributi di ricerca gruppo"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Associazione gruppo-utente "
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Attributi speciali"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Campo Quota"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Quota predefinita"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "in byte"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Campo Email"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Regola di assegnazione del nome della cartella utente"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Nome utente interno"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri:  [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà aggiunto/incrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una parte di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti)."
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Attributo nome utente interno:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Ignora rilevamento UUID"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "In modo predefinito, l'attributo UUID viene rilevato automaticamente. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti)."
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "Attributo UUID:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Associazione Nome utente-Utente LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
 "experimental stage."
 msgstr "I nomi utente sono utilizzati per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate. Il nome utente interno è utilizzato dappertutto. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione, ma solo in una fase sperimentale o di test."
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Cancella associazione Nome utente-Utente LDAP"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Cancella associazione Nome gruppo-Gruppo LDAP"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Prova configurazione"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Aiuto"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 07c9dd2169d..93d6745203d 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -5,13 +5,14 @@
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
 # plazmism <gomidori@live.jp>, 2013
+# Koichi MATSUMOTO <mzch@me.com>, 2013
 # tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -144,51 +145,51 @@ msgstr "12月"
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "数秒前"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n 分前"
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n 時間後"
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n 日後"
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "一月前"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n カ月後"
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "一年前"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "年前"
 
@@ -196,23 +197,19 @@ msgstr "年前"
 msgid "Choose"
 msgstr "選択"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "ファイルピッカーのテンプレートの読み込みエラー"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "はい"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "いいえ"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "OK"
 
@@ -379,7 +376,7 @@ msgstr "更新に成功しました。今すぐownCloudにリダイレクトし
 #: lostpassword/controller.php:61
 #, php-format
 msgid "%s password reset"
-msgstr ""
+msgstr "%s パスワードリセット"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -619,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>それでは。"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "前"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "次"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 158193bb446..8f9e9397d54 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -5,14 +5,15 @@
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
 # plazmism <gomidori@live.jp>, 2013
+# Koichi MATSUMOTO <mzch@me.com>, 2013
 # pabook <pabook.32@gmail.com>, 2013
 # tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -98,12 +99,12 @@ msgstr "利用可能なスペースが十分にありません"
 msgid "Upload cancelled."
 msgstr "アップロードはキャンセルされました。"
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URLは空にできません。"
 
@@ -111,8 +112,8 @@ msgstr "URLは空にできません。"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "エラー"
 
@@ -159,7 +160,7 @@ msgstr "元に戻す"
 #: js/filelist.js:453
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
-msgstr[0] ""
+msgstr[0] "%n 個のファイルをアップロード中"
 
 #: js/filelist.js:518
 msgid "files uploading"
@@ -187,34 +188,40 @@ msgstr "あなたのストレージは一杯です。ファイルの更新と同
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "あなたのストレージはほぼ一杯です（{usedSpacePercent}%）"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。"
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "名前"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "変更"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n個のフォルダ"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n個のファイル"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index 305eb2256c2..a2bd99586b9 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 09:37+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index b0374271597..d6a42e38c1d 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Koichi MATSUMOTO <mzch@me.com>, 2013
 # tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +75,6 @@ msgid ""
 "administrator."
 msgstr "ファイルは、小さいファイルに分割されてダウンロードされます。もしくは、管理者にお尋ねください。"
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "測定できませんでした"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "アプリケーションは無効です"
@@ -209,12 +206,12 @@ msgstr "数秒前"
 #: template/functions.php:81
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n 分前"
 
 #: template/functions.php:82
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n 時間後"
 
 #: template/functions.php:83
 msgid "today"
@@ -227,7 +224,7 @@ msgstr "昨日"
 #: template/functions.php:85
 msgid "%n day go"
 msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n 日後"
 
 #: template/functions.php:86
 msgid "last month"
@@ -236,7 +233,7 @@ msgstr "一月前"
 #: template/functions.php:87
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n カ月後"
 
 #: template/functions.php:88
 msgid "last year"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index b9a7baa144b..a82413dc150 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -123,7 +123,11 @@ msgstr "アプリの更新中にエラーが発生"
 msgid "Updated"
 msgstr "更新済み"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "保存中..."
 
@@ -168,7 +172,7 @@ msgstr "ユーザ作成エラー"
 msgid "A valid password must be provided"
 msgstr "有効なパスワードを指定する必要があります"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Japanese (日本語)"
 
@@ -239,106 +243,106 @@ msgstr "このサーバーはインターネットに接続していません。
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "各ページの読み込み時にタスクを実行する"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "http経由で1分間に1回cron.phpを呼び出すように cron.phpがwebcron サービスに登録されています。"
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "cron.phpファイルを1分間に1回実行する為にサーバーのcronサービスを利用する。"
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "共有"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "共有APIを有効にする"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "アプリからの共有APIの利用を許可する"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "リンクを許可する"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "リンクによりアイテムを公開することを許可する"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "パブリックなアップロードを許可"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "公開している共有フォルダへのアップロードを共有しているメンバーにも許可"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "再共有を許可する"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "ユーザが共有しているアイテムの再共有を許可する"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "ユーザが誰とでも共有することを許可する"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "ユーザにグループ内のユーザとのみ共有を許可する"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "セキュリティ"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "常にHTTPSを使用する"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "クライアントから %sへの接続を常に暗号化する。"
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "強制的なSSL接続を有効／無効にするために、HTTPS経由で %s へ接続してください。"
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "ログレベル"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "もっと見る"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "閉じる"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "バージョン"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -468,6 +472,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV経由でファイルにアクセス</a>するにはこのアドレスを利用してください"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "ログイン名"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index 294bcdd8cc2..69cc0333ba7 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-13 09:11-0400\n"
-"PO-Revision-Date: 2013-08-13 04:30+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -156,198 +156,185 @@ msgstr "ユーザログインフィルタ"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。"
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "ユーザリストフィルタ"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "ユーザーを取得するときに適用するフィルターを定義する。"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "プレースホルダーを利用しないでください。例 \"objectClass=person\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "グループフィルタ"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "グループを取得するときに適用するフィルターを定義する。"
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "接続設定"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "設定はアクティブです"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "チェックを外すと、この設定はスキップされます。"
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "ポート"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "バックアップ（レプリカ）ホスト"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "バックアップホストをオプションで指定することができます。メインのLDAP/ADサーバのレプリカである必要があります。"
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "バックアップ（レプリカ）ポート"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "メインサーバを無効にする"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr "レプリカサーバーにのみ接続します。"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "TLSを利用"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "LDAPS接続のために追加でそれを利用しないで下さい。失敗します。"
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大文字／小文字を区別しないLDAPサーバ（Windows）"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "SSL証明書の確認を無効にする。"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書を %s サーバにインポートしてください。"
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "推奨しません、テスト目的でのみ利用してください。"
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "キャッシュのTTL"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "秒。変更後にキャッシュがクリアされます。"
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "ディレクトリ設定"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "ユーザ表示名のフィールド"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr "ユーザの表示名の生成に利用するLDAP属性"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "ベースユーザツリー"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "1行に1つのユーザベースDN"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "ユーザ検索属性"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "オプション：1行に1属性"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "グループ表示名のフィールド"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr "ユーザのグループ表示名の生成に利用するLDAP属性"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "ベースグループツリー"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "1行に1つのグループベースDN"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "グループ検索属性"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "グループとメンバーの関連付け"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "特殊属性"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "クォータフィールド"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "クォータのデフォルト"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "バイト"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "メールフィールド"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "ユーザのホームフォルダ命名規則"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "ユーザ名を空のままにしてください（デフォルト）。そうでない場合は、LDAPもしくはADの属性を指定してください。"
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "内部ユーザ名"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -363,15 +350,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "デフォルトでは、内部ユーザ名はUUID属性から作成されます。これにより、ユーザ名がユニークであり、かつ文字の変換が不要であることを保証します。内部ユーザ名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザ名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダ名としても用いられます。例えば*DAVサービスのように、リモートURLの一部でもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザ表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング（追加）されたLDAPユーザにおいてのみ有効となります。"
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "内部ユーザ名属性:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "UUID検出を再定義する"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -382,15 +369,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザ名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザとLDAPグループに対してのみ有効となります。"
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "UUID属性:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "ユーザ名とLDAPユーザのマッピング"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -404,18 +391,18 @@ msgid ""
 "experimental stage."
 msgstr "ユーザ名は（メタ）データの保存と割り当てに使用されます。ユーザを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザ名からLDAPユーザへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "ユーザ名とLDAPユーザのマッピングをクリアする"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "グループ名とLDAPグループのマッピングをクリアする"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "設定をテスト"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "ヘルプ"
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index a553cde32b6..16224d91946 100644
--- a/l10n/ka/core.po
+++ b/l10n/ka/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -141,51 +141,51 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -193,23 +193,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -616,14 +612,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ka/files.po b/l10n/ka/files.po
index 00dc4cd0813..0ba377534ee 100644
--- a/l10n/ka/files.po
+++ b/l10n/ka/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr ""
 
@@ -183,34 +183,40 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po
index 5bc5f41fc52..64ba6094207 100644
--- a/l10n/ka/files_sharing.po
+++ b/l10n/ka/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka/lib.po b/l10n/ka/lib.po
index 32eb5dd2cd0..cf8cf5f9064 100644
--- a/l10n/ka/lib.po
+++ b/l10n/ka/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po
index 82c0600bc84..e4fb05fac6b 100644
--- a/l10n/ka/settings.po
+++ b/l10n/ka/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po
index 2ed240f9a6f..537446f5b40 100644
--- a/l10n/ka/user_ldap.po
+++ b/l10n/ka/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "შველა"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 1da987a21ed..13d2a8bc987 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -141,51 +141,51 @@ msgstr "დეკემბერი"
 msgid "Settings"
 msgstr "პარამეტრები"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "გასულ თვეში"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "თვის წინ"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "ბოლო წელს"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "წლის წინ"
 
@@ -193,23 +193,19 @@ msgstr "წლის წინ"
 msgid "Choose"
 msgstr "არჩევა"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "უარყოფა"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "კი"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "არა"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "დიახ"
 
@@ -616,14 +612,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "წინა"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "შემდეგი"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 81c86807103..1706eb1ccdd 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr "საკმარისი ადგილი არ არის"
 msgid "Upload cancelled."
 msgstr "ატვირთვა შეჩერებულ იქნა."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას"
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL არ შეიძლება იყოს ცარიელი."
 
@@ -107,8 +107,8 @@ msgstr "URL არ შეიძლება იყოს ცარიელი."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "შეცდომა"
 
@@ -183,34 +183,40 @@ msgstr "თქვენი საცავი გადაივსო. ფა
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "დაუშვებელი ფოლდერის სახელი.  'Shared'–ის გამოყენება რეზერვირებულია Owncloud–ის მიერ"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "სახელი"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "ზომა"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "შეცვლილია"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index 31c89e7e6cd..65b24c1c116 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 9546faa3400..3a986486330 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "ვერ განისაზღვრა"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "აპლიკაცია არ არის აქტიური"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index c24e0dc7206..a9a26c5bc0b 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,11 @@ msgstr "შეცდომა აპლიკაციის განახლ
 msgid "Updated"
 msgstr "განახლებულია"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "შენახვა..."
 
@@ -166,7 +170,7 @@ msgstr "შეცდომა მომხმარებლის შექმ
 msgid "A valid password must be provided"
 msgstr "უნდა მიუთითოთ არსებული პაროლი"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -237,106 +241,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron–ი"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "გაზიარება"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Share API–ის ჩართვა"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "დაუშვი აპლიკაციების უფლება  Share API –ზე"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "ლინკების დაშვება"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "მიეცი მომხმარებლებს უფლება რომ გააზიაროს ელემენტები საჯაროდ ლინკებით"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "გადაზიარების დაშვება"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "მიეცით მომხმარებლებს უფლება რომ გააზიაროს მისთვის გაზიარებული"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "მიეცით უფლება მომხმარებლებს გააზიაროს ყველასთვის"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "მიეცით უფლება მომხმარებლებს რომ გააზიაროს მხოლოდ თავიანთი ჯგუფისთვის"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "უსაფრთხოება"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "HTTPS–ის ჩართვა"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "ლოგი"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "ლოგირების დონე"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "უფრო მეტი"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "უფრო ნაკლები"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "ვერსია"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "მომხმარებლის სახელი"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index a2f98736a22..da010f03eee 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "მომხმარებლის ფილტრი"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "როცა შემოსვლა განხორციელდება ასეიძლება მოვახდინოთ გაფილტვრა. %%uid შეიცვლება იუზერნეიმით მომხმარებლის ველში."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "გამოიყენეთ %%uid დამასრულებელი მაგ: \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "მომხმარებლებიის სიის ფილტრი"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "გაფილტვრა განხორციელდება, როცა მომხმარებლების სია ჩამოიტვირთება."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "ჯგუფის ფილტრი"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "გაფილტვრა განხორციელდება, როცა ჯგუფის სია ჩამოიტვირთება."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "კავშირის პარამეტრები"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "კონფიგურაცია აქტიურია"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "როცა გადანიშნულია, ეს კონფიგურაცია გამოტოვებული იქნება."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "პორტი"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "ბექაფ  (რეპლიკა)  ჰოსტი"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "მიუთითეთ რაიმე ბექაფ ჰოსტი. ის უნდა იყოს ძირითადი LDAP/AD სერვერის რეპლიკა."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "ბექაფ (რეპლიკა) პორტი"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "გამორთეთ ძირითადი სერვერი"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "გამოიყენეთ TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "არ გამოიყენოთ დამატებით LDAPS კავშირი. ის წარუმატებლად დასრულდება."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "გამორთეთ SSL სერთიფიკატის ვალიდაცია."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "არ არის რეკომენდირებული, გამოიყენეთ მხოლოდ სატესტოდ."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "ქეშის სიცოცხლის ხანგრძლივობა"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "წამებში. ცვლილება ასუფთავებს ქეშს."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "დირექტორიის პარამეტრები"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "მომხმარებლის დისფლეის სახელის ფილდი"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "ძირითად მომხმარებელთა სია"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "ერთი მომხმარებლის საწყისი DN ერთ ხაზზე"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "მომხმარებლის ძებნის ატრიბუტი"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "ოფციონალური; თითო ატრიბუტი თითო ხაზზე"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "ჯგუფის დისფლეის სახელის ფილდი"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "ძირითად ჯგუფთა სია"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "ერთი ჯგუფის საწყისი DN ერთ ხაზზე"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "ჯგუფური ძებნის ატრიბუტი"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "ჯგუფის წევრობის ასოციაცია"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "სპეციალური ატრიბუტები"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "ქვოტას ველი"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "საწყისი ქვოტა"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "ბაიტებში"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "იმეილის ველი"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "მომხმარებლის Home დირექტორიის სახელების დარქმევის წესი"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "დატოვეთ ცარიელი მომხმარებლის სახელი (default). სხვა დანარჩენში მიუთითეთ LDAP/AD ატრიბუტი."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "კავშირის ტესტირება"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "დახმარება"
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index a6e47dc7edd..1ebb511ac38 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -141,51 +141,51 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -193,23 +193,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -616,14 +612,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index 5bee995f8da..810fccb7bf6 100644
--- a/l10n/kn/files.po
+++ b/l10n/kn/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr ""
 
@@ -183,34 +183,40 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index 6e1f85cdd10..63406f842e7 100644
--- a/l10n/kn/lib.po
+++ b/l10n/kn/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index 224c7063ecd..cc0192feeb9 100644
--- a/l10n/kn/settings.po
+++ b/l10n/kn/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
index e24987ef4dd..24c7a343258 100644
--- a/l10n/kn/user_ldap.po
+++ b/l10n/kn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index f8be8d34af6..f99e2b89d90 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -143,51 +143,51 @@ msgstr "12월"
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "초 전"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "오늘"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "어제"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "지난 달"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "개월 전"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "작년"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "년 전"
 
@@ -195,23 +195,19 @@ msgstr "년 전"
 msgid "Choose"
 msgstr "선택"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "취소"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "예"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "아니요"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "승락"
 
@@ -618,14 +614,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "이전"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "다음"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index ea560820d2e..cdab5cceeb1 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -96,12 +96,12 @@ msgstr "여유 공간이 부족합니다"
 msgid "Upload cancelled."
 msgstr "업로드가 취소되었습니다."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL을 입력해야 합니다."
 
@@ -109,8 +109,8 @@ msgstr "URL을 입력해야 합니다."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "오류"
 
@@ -185,34 +185,40 @@ msgstr "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "폴더 이름이 유효하지 않습니다. "
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "이름"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "수정됨"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index f3be635c899..6de0e6cf3d2 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 7b58ff4c090..780a12d6343 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "결정할 수 없음"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "앱이 활성화되지 않았습니다"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 72c04c28e10..b3f6b33db6d 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,11 @@ msgstr "앱을 업데이트하는 중 오류 발생"
 msgid "Updated"
 msgstr "업데이트됨"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "저장 중..."
 
@@ -166,7 +170,7 @@ msgstr "사용자 생성 오류"
 msgid "A valid password must be provided"
 msgstr "올바른 암호를 입력해야 함"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "한국어"
 
@@ -237,106 +241,106 @@ msgstr ""
 msgid "Cron"
 msgstr "크론"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "개별 페이지를 불러올 때마다 실행"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "공유"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "공유 API 사용하기"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "앱에서 공유 API를 사용할 수 있도록 허용"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "링크 허용"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "사용자가 개별 항목의 링크를 공유할 수 있도록 허용"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "재공유 허용"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "사용자에게 공유된 항목을 다시 공유할 수 있도록 허용"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "누구나와 공유할 수 있도록 허용"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "사용자가 속해 있는 그룹의 사용자와만 공유할 수 있도록 허용"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "보안"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "HTTPS 강제 사용"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "로그"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "로그 단계"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "더 중요함"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "덜 중요함"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "버전"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "암호화"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "로그인 이름"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index f583c109bdf..903dc63b87f 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "사용자 로그인 필터"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "로그인을 시도할 때 적용할 필터입니다. %%uid는 로그인 작업에서의 사용자 이름으로 대체됩니다."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "%%uid 자리 비움자를 사용하십시오. 예제: \"uid=%%uid\"\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "사용자 목록 필터"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "사용자를 검색할 때 적용할 필터를 정의합니다."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=person\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "그룹 필터"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "그룹을 검색할 때 적용할 필터를 정의합니다."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "연결 설정"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "구성 활성화"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "포트"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "백업 (복제) 포트"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "백업 (복제) 포트"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "주 서버 비활성화"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "TLS 사용"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "서버에서 대소문자를 구분하지 않음 (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "SSL 인증서 유효성 검사를 해제합니다."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "추천하지 않음, 테스트로만 사용하십시오."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "초. 항목 변경 시 캐시가 갱신됩니다."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "디렉토리 설정"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "사용자의 표시 이름 필드"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "기본 사용자 트리"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "사용자 DN을 한 줄에 하나씩 입력하십시오"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "사용자 검색 속성"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "그룹의 표시 이름 필드"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "기본 그룹 트리"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "그룹 기본 DN을 한 줄에 하나씩 입력하십시오"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "그룹 검색 속성"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "그룹-회원 연결"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "바이트"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "도움말"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index bb8c2a9f710..d258cb5e7f3 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -141,55 +141,55 @@ msgstr ""
 msgid "Settings"
 msgstr "ده‌ستكاری"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -197,23 +197,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "پێشتر"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "دواتر"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index b2937589101..6a342f3dfac 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت."
 
@@ -107,8 +107,8 @@ msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "هه‌ڵه"
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "ناو"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index 764a162a141..83b88021ea2 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index 4ae5859b98a..983e005aa24 100644
--- a/l10n/ku_IQ/lib.po
+++ b/l10n/ku_IQ/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index 86c93e12fab..9a21f1af384 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "پاشکه‌وتده‌کات..."
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "نهێنیکردن"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 2e3b32f82f7..c2ca53a1932 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "یارمەتی"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 8af84cd24e0..998bef35792 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -142,55 +142,55 @@ msgstr "Dezember"
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "Sekonnen hir"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "haut"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "gëschter"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "leschte Mount"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "Méint hir"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "Lescht Joer"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "Joren hir"
 
@@ -198,23 +198,19 @@ msgstr "Joren hir"
 msgid "Choose"
 msgstr "Auswielen"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Ofbriechen"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Feeler beim Luede vun der Virlag fir d'Fichiers-Selektioun"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Jo"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Nee"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "OK"
 
@@ -621,14 +617,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Hallo,<br><br>ech wëll just Bescheed soen dass den/d' %s,  »%s« mat dir gedeelt huet.<br><a href=\"%s\">Kucken!</a><br><br>E schéine Bonjour!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "zeréck"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "weider"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 0c2ffd231e4..2043b2dca23 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "Upload ofgebrach."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Fehler"
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Geännert"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index d221e3871f4..caaaa536d10 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index 1e270aee7ae..8ee53d4cf04 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 5dc543150ee..9a9db6a3fc5 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Speicheren..."
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Share API aschalten"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Erlab Apps d'Share API ze benotzen"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Links erlaben"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Resharing erlaben"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Useren erlaben mat egal wiem ze sharen"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Méi"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index ef9cdec3bf8..291529dde43 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Hëllef"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 40770b80fd5..bb9ac1fab08 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -143,59 +143,59 @@ msgstr "Gruodis"
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "prieš sekundę"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "šiandien"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "praeitą mėnesį"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "prieš mėnesį"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "praeitais metais"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "prieš metus"
 
@@ -203,23 +203,19 @@ msgstr "prieš metus"
 msgid "Choose"
 msgstr "Pasirinkite"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Atšaukti"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Klaida pakraunant failų naršyklę"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Taip"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Gerai"
 
@@ -626,14 +622,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "atgal"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "kitas"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 0c3e536b2b6..e4819c2b8f5 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -95,12 +95,12 @@ msgstr "Nepakanka vietos"
 msgid "Upload cancelled."
 msgstr "Įkėlimas atšauktas."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL negali būti tuščias."
 
@@ -108,8 +108,8 @@ msgstr "URL negali būti tuščias."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Klaida"
 
@@ -186,36 +186,42 @@ msgstr "Jūsų visa vieta serveryje užimta"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index 54d647f95f3..20ba007ff21 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 14bb5eb6343..34cc04cbf53 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Programa neįjungta"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 5dd33ac3419..57e2f762a4e 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,11 @@ msgstr "Įvyko klaida atnaujinant programą"
 msgid "Updated"
 msgstr "Atnaujinta"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Saugoma..."
 
@@ -166,7 +170,7 @@ msgstr "Klaida kuriant vartotoją"
 msgid "A valid password must be provided"
 msgstr "Slaptažodis turi būti tinkamas"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Kalba"
 
@@ -237,106 +241,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Dalijimasis"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Lesti nuorodas"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Leisti dalintis"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Saugumas"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Žurnalas"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Žurnalo išsamumas"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Daugiau"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Mažiau"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Vartotojo vardas"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index c432e2956b7..af344de49a7 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Grupės filtras"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Prievadas"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Naudoti TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Išjungti SSL sertifikato tikrinimą."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Nerekomenduojama, naudokite tik testavimui."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Pagalba"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index c4920a2fa3a..c5a0608398f 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# stendec <stendec@inbox.lv>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +21,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s kopīgots »%s« ar jums"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -141,59 +142,59 @@ msgstr "Decembris"
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "sekundes atpakaļ"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Tagad, %n minūtes"
+msgstr[1] "Pirms %n minūtes"
+msgstr[2] "Pirms %n minūtēm"
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Šodien, %n stundas"
+msgstr[1] "Pirms %n stundas"
+msgstr[2] "Pirms %n stundām"
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "šodien"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Šodien, %n dienas"
+msgstr[1] "Pirms %n dienas"
+msgstr[2] "Pirms %n dienām"
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "pagājušajā mēnesī"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Šomēnes, %n mēneši"
+msgstr[1] "Pirms %n mēneša"
+msgstr[2] "Pirms %n mēnešiem"
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "mēnešus atpakaļ"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "gājušajā gadā"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "gadus atpakaļ"
 
@@ -201,23 +202,19 @@ msgstr "gadus atpakaļ"
 msgid "Choose"
 msgstr "Izvēlieties"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Atcelt"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
-msgstr ""
+msgstr "Kļūda ielādējot datņu ņēmēja veidni"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Jā"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Nē"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Labi"
 
@@ -288,7 +285,7 @@ msgstr "Parole"
 
 #: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "Ļaut publisko augšupielādi."
 
 #: js/share.js:202
 msgid "Email link to person"
@@ -384,7 +381,7 @@ msgstr "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud."
 #: lostpassword/controller.php:61
 #, php-format
 msgid "%s password reset"
-msgstr ""
+msgstr "%s paroles maiņa"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -395,11 +392,11 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "Saite uz paroles atjaunošanas vietu ir nosūtīta uz epastu.<br>Ja vēstu nav atnākusi, pārbaudiet epasta mēstuļu mapi.<br>Jā tās tur nav, jautājiet sistēmas administratoram."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "Pieprasījums neizdevās!<br>Vai Jūs pārliecinājāties ka epasts/lietotājvārds ir pareizi?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -416,11 +413,11 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr ""
+msgstr "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Jā, Es tiešām vēlos mainīt savu paroli"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
@@ -479,7 +476,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
+msgstr "Sveiks,\nTikai daru tev zināmu ka %s dalās %s ar tevi.\nApskati to: %s\n\nJaukiņi Labiņi!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -496,12 +493,12 @@ msgstr "Brīdinājums par drošību"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "Jūsu PHP ir ievainojamība pret NULL Byte uzbrukumiem (CVE-2006-7243)"
 
 #: templates/installation.php:26
 #, php-format
 msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Lūdzu atjauniniet PHP instalāciju lai varētu droši izmantot %s."
 
 #: templates/installation.php:32
 msgid ""
@@ -526,7 +523,7 @@ msgstr "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta,
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>."
 
 #: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
@@ -577,7 +574,7 @@ msgstr "Pabeigt iestatīšanu"
 #: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s ir pieejams. Uzziniet vairāk kā atjaunināt."
 
 #: templates/layout.user.php:66
 msgid "Log out"
@@ -585,7 +582,7 @@ msgstr "Izrakstīties"
 
 #: templates/layout.user.php:100
 msgid "More apps"
-msgstr ""
+msgstr "Vairāk programmu"
 
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
@@ -622,15 +619,7 @@ msgstr "Alternatīvās pieteikšanās"
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
-
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "iepriekšējā"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "nākamā"
+msgstr "Sveiks,<br><br>Tikai daru tev zināmu ka %s dalās %s ar tevi.<br><a href=\"%s\">Apskati to!</a><br><br>Jaukiņi Labiņi!"
 
 #: templates/update.php:3
 #, php-format
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index bc8feee326f..3b3ce3b88ed 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# stendec <stendec@inbox.lv>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -29,11 +30,11 @@ msgstr "Nevarēja pārvietot %s"
 
 #: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Nevar uzstādīt augšupielādes mapi."
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
-msgstr ""
+msgstr "Nepareiza pilnvara"
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
@@ -94,21 +95,21 @@ msgstr "Nepietiek brīvas vietas"
 msgid "Upload cancelled."
 msgstr "Augšupielāde ir atcelta."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL nevar būt tukšs."
 
 #: js/file-upload.js:238 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Kļūdains mapes nosaukums. 'Shared' lietošana ir rezervēta no ownCloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Kļūda"
 
@@ -155,13 +156,13 @@ msgstr "atsaukt"
 #: js/filelist.js:453
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n"
+msgstr[1] "Augšupielāde %n failu"
+msgstr[2] "Augšupielāde %n failus"
 
 #: js/filelist.js:518
 msgid "files uploading"
-msgstr ""
+msgstr "fails augšupielādējas"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -185,46 +186,52 @@ msgstr "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhron
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nederīgs mapes nosaukums. “Koplietots” izmantojums ir rezervēts ownCloud servisam."
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Mainīts"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n mapes"
+msgstr[1] "%n mape"
+msgstr[2] "%n mapes"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n faili"
+msgstr[1] "%n fails"
+msgstr[2] "%n faili"
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s nevar tikt pārsaukts"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -326,11 +333,11 @@ msgstr "Šobrīd tiek caurskatīts"
 
 #: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "direktorija"
 
 #: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "direktorijas"
 
 #: templates/part.list.php:85
 msgid "file"
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index ac2e481d533..87322e13a61 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# stendec <stendec@inbox.lv>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-23 01:55-0400\n"
-"PO-Revision-Date: 2013-07-23 05:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-16 07:00+0000\n"
+"Last-Translator: stendec <stendec@inbox.lv>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,7 +18,7 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
 msgid "Access granted"
 msgstr "Piešķirta pieeja"
 
@@ -25,7 +26,7 @@ msgstr "Piešķirta pieeja"
 msgid "Error configuring Dropbox storage"
 msgstr "Kļūda, konfigurējot Dropbox krātuvi"
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:65 js/google.js:86
 msgid "Grant access"
 msgstr "Piešķirt pieeju"
 
@@ -33,29 +34,29 @@ msgstr "Piešķirt pieeju"
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu."
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:42 js/google.js:121
 msgid "Error configuring Google Drive storage"
 msgstr "Kļūda, konfigurējot Google Drive krātuvi"
 
-#: lib/config.php:447
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Brīdinājums:</b> nav uzinstalēts “smbclient”. Nevar montēt CIFS/SMB koplietojumus. Lūdzu, vaicājiet savam sistēmas administratoram, lai to uzinstalē."
 
-#: lib/config.php:450
+#: lib/config.php:457
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Brīdinājums: </b> uz PHP nav aktivēts vai instalēts FTP atbalsts. Nevar montēt FTP koplietojumus. Lūdzu, vaicājiet savam sistēmas administratoram, lai to uzinstalē."
 
-#: lib/config.php:453
+#: lib/config.php:460
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
 "your system administrator to install it."
-msgstr ""
+msgstr "<b>Brīdinājums:</b> PHP Curl atbalsts nav instalēts.  OwnCloud / WebDAV vai GoogleDrive montēšana nav iespējama. Lūdziet sistēmas administratoram lai tas tiek uzstādīts."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 1afacc6cca0..71c4b1fd73f 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index 0bee8becab5..06237b847d0 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# stendec <stendec@inbox.lv>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-16 08:10+0000\n"
+"Last-Translator: stendec <stendec@inbox.lv>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,20 +55,20 @@ msgstr "Dzēsts"
 #: js/trash.js:191
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nekas, %n mapes"
+msgstr[1] "%n mape"
+msgstr[2] "%n mapes"
 
 #: js/trash.js:197
 msgid "%n file"
 msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Neviens! %n faaili"
+msgstr[1] "%n fails"
+msgstr[2] "%n faili"
 
 #: lib/trash.php:819 lib/trash.php:821
 msgid "restored"
-msgstr ""
+msgstr "atjaunots"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index 94dcd5afe01..36471317d5a 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# stendec <stendec@inbox.lv>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -40,7 +41,7 @@ msgstr "Administratori"
 #: app.php:836
 #, php-format
 msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "Kļūda atjauninot \"%s\""
 
 #: defaults.php:35
 msgid "web services under your control"
@@ -49,7 +50,7 @@ msgstr "tīmekļa servisi tavā varā"
 #: files.php:66 files.php:98
 #, php-format
 msgid "cannot open \"%s\""
-msgstr ""
+msgstr "Nevar atvērt \"%s\""
 
 #: files.php:226
 msgid "ZIP download is turned off."
@@ -71,11 +72,7 @@ msgstr "Izvēlētās datnes ir pārāk lielas, lai izveidotu zip datni."
 msgid ""
 "Download the files in smaller chunks, seperately or kindly ask your "
 "administrator."
-msgstr ""
-
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "nevarēja noteikt"
+msgstr "Lejupielādējiet savus failus mazākās daļās, atsevišķi vai palūdziet tos administratoram."
 
 #: json.php:28
 msgid "Application is not enabled"
@@ -167,7 +164,7 @@ msgstr "Izmest šo lietotāju no MySQL."
 
 #: setup/oci.php:34
 msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Nevar izveidot savienojumu ar Oracle"
 
 #: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
@@ -210,14 +207,14 @@ msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "Pirms %n minūtēm"
 
 #: template/functions.php:82
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "Pirms %n stundām"
 
 #: template/functions.php:83
 msgid "today"
@@ -232,7 +229,7 @@ msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "Pirms %n dienām"
 
 #: template/functions.php:86
 msgid "last month"
@@ -243,7 +240,7 @@ msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "Pirms %n mēnešiem"
 
 #: template/functions.php:88
 msgid "last year"
@@ -255,7 +252,7 @@ msgstr "gadus atpakaļ"
 
 #: template.php:297
 msgid "Caused by:"
-msgstr ""
+msgstr "Cēlonis:"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index a4ece9b54c1..da5e348552e 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# stendec <stendec@inbox.lv>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +29,7 @@ msgstr "Autentifikācijas kļūda"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "Jūsu redzamais vārds ir mainīts."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
@@ -120,7 +121,11 @@ msgstr "Kļūda, atjauninot lietotni"
 msgid "Updated"
 msgstr "Atjaunināta"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Saglabā..."
 
@@ -165,7 +170,7 @@ msgstr "Kļūda, veidojot lietotāju"
 msgid "A valid password must be provided"
 msgstr "Jānorāda derīga parole"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__valodas_nosaukums__"
 
@@ -180,7 +185,7 @@ msgid ""
 "configure your webserver in a way that the data directory is no longer "
 "accessible or you move the data directory outside the webserver document "
 "root."
-msgstr ""
+msgstr "Jūsu datu direktorija un faili visticamāk ir pieejami no interneta. .htaccess fails nedarbojas. Ir rekomendēts konfigurēt serveri tā lai jūsu datu direktorija nav lasāma vai pārvietot to ārpus tīmekļa servera dokumentu mapes."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
@@ -195,7 +200,7 @@ msgstr "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datn
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Lūdzu kārtīgi izlasiet <a href=\"%s\">uzstādīšanas norādījumus</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
@@ -217,7 +222,7 @@ msgid ""
 "System locale can't be set to %s. This means that there might be problems "
 "with certain characters in file names. We strongly suggest to install the "
 "required packages on your system to support %s."
-msgstr ""
+msgstr "Sistēmas lokalizāciju nevar nomainīt uz %s. Tas nozīmē ka var rasties sarežģījumi ar dažu burtu attēlošanu failu nosaukumos. Ir rekomendēts uzstādīt nepieciešamās pakotnes lai atbalstītu %s lokalizāciju."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
@@ -230,112 +235,112 @@ msgid ""
 "installation of 3rd party apps don´t work. Accessing files from remote and "
 "sending of notification emails might also not work. We suggest to enable "
 "internet connection for this server if you want to have all features."
-msgstr ""
+msgstr "Šim serverim nav savienojums ar internetu. Tas nozīmē ka nebūs tādas iespējas kā ārējo datu nesēju montēšana, paziņojumi par atjauninājumiem vai citu izstrādātāju programmu uzstādīšana. Attālināta failu piekļuve vai paziņojumu epastu sūtīšana iespējams arī nedarbosies. Ir rekomendēts iespējot interneta savienojumu lai gūtu iespēju izmantotu visus risinājumus."
 
 #: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Izpildīt vienu uzdevumu ar katru ielādēto lapu"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
-msgstr ""
+msgstr "cron.php ir reģistrēts webcron servisā lai izsauktu cron.php vienreiz minūtē caur http."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "Izmantojiet sistēmas cron servisu lai izsauktu cron.php reizi minūtē."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Dalīšanās"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Aktivēt koplietošanas API"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Ļauj lietotnēm izmantot koplietošanas API"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Atļaut saites"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Ļaut lietotājiem publiski dalīties ar vienumiem, izmantojot saites"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
-msgstr ""
+msgstr "Atļaut publisko augšupielādi"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "Ļaut lietotājiem iespējot atļaut citiem augšupielādēt failus viņu publiskajās mapēs"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Atļaut atkārtotu koplietošanu"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Ļaut lietotājiem dalīties ar vienumiem atkārtoti"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Ļaut lietotājiem dalīties ar visiem"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Ļaut lietotājiem dalīties ar lietotājiem to grupās"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Drošība"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Uzspiest HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
-msgstr ""
+msgstr "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu"
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Žurnāls"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Žurnāla līmenis"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Vairāk"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Mazāk"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -463,6 +468,22 @@ msgstr "WebDAV"
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
+msgstr "Lietojiet šo adresi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">lai piekļūtu saviem failiem ar WebDAV</a>"
+
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
 msgstr ""
 
 #: templates/users.php:21
@@ -475,13 +496,13 @@ msgstr "Izveidot"
 
 #: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr ""
+msgstr "Administratora atgūšanas parole"
 
 #: templates/users.php:37 templates/users.php:38
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā."
 
 #: templates/users.php:42
 msgid "Default Storage"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 92d33e2add1..3811f911bae 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "Lietotāja ierakstīšanās filtrs"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Definē filtru, ko izmantot, kad mēģina ierakstīties. %%uid ierakstīšanās darbībā aizstāj lietotājvārdu."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "lieto %%uid vietturi, piemēram, \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lietotāju saraksta filtrs"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definē filtru, ko izmantot, kad saņem lietotāju sarakstu."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "bez jebkādiem vietturiem, piemēram, \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Grupu filtrs"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definē filtru, ko izmantot, kad saņem grupu sarakstu."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "bez jebkādiem vietturiem, piemēram, \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Savienojuma iestatījumi"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Konfigurācija ir aktīva"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ja nav atzīmēts, šī konfigurācija tiks izlaista."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Ports"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Rezerves (kopija) serveris"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Norādi rezerves serveri (nav obligāti). Tam ir jābūt galvenā LDAP/AD servera kopijai."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Rezerves (kopijas) ports"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Deaktivēt galveno serveri"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Lietot TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Neizmanto papildu LDAPS savienojumus! Tas nestrādās."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Reģistrnejutīgs LDAP serveris (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Izslēgt SSL sertifikātu validēšanu."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Nav ieteicams, izmanto tikai testēšanai!"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Kešatmiņas dzīvlaiks"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "sekundēs. Izmaiņas iztukšos kešatmiņu."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Direktorijas iestatījumi"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Lietotāja redzamā vārda lauks"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Bāzes lietotāju koks"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Viena lietotāju bāzes DN rindā"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Lietotāju meklēšanas atribūts"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Neobligāti; viens atribūts rindā"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Grupas redzamā nosaukuma lauks"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Bāzes grupu koks"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Viena grupu bāzes DN rindā"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Grupu meklēšanas atribūts"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Grupu piederības asociācija"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Īpašie atribūti"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Kvotu lauks"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Kvotas noklusējums"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "baitos"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "E-pasta lauks"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Lietotāja mājas mapes nosaukšanas kārtula"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Testa konfigurācija"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Palīdzība"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index b99d5913b45..701879cd51a 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -141,55 +141,55 @@ msgstr "Декември"
 msgid "Settings"
 msgstr "Подесувања"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "пред секунди"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "денеска"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "минатиот месец"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "пред месеци"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "минатата година"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "пред години"
 
@@ -197,23 +197,19 @@ msgstr "пред години"
 msgid "Choose"
 msgstr "Избери"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Откажи"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Да"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Не"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Во ред"
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "претходно"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "следно"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 7273af472ee..a5d3ad32194 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "Преземањето е прекинато."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "Адресата неможе да биде празна."
 
@@ -107,8 +107,8 @@ msgstr "Адресата неможе да биде празна."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Грешка"
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Променето"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index ffd5a17d6e7..f669e2ffd24 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index a8128ea681f..e22d5843f50 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Апликацијата не е овозможена"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 8745b876368..63eed628e92 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Снимам..."
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Записник"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Ниво на логирање"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Повеќе"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Помалку"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Енкрипција"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index c98528b81ec..323404d6364 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Помош"
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index 9cf341368a1..fccd1c57f6e 100644
--- a/l10n/ml_IN/core.po
+++ b/l10n/ml_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -141,55 +141,55 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -197,23 +197,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po
index 6152a6603be..83b5a5da14d 100644
--- a/l10n/ml_IN/files.po
+++ b/l10n/ml_IN/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr ""
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/ml_IN/lib.po b/l10n/ml_IN/lib.po
index 8da360f24d9..0e8c35fca63 100644
--- a/l10n/ml_IN/lib.po
+++ b/l10n/ml_IN/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po
index e3333f6983a..ae59755b18c 100644
--- a/l10n/ml_IN/settings.po
+++ b/l10n/ml_IN/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ml_IN/user_ldap.po b/l10n/ml_IN/user_ldap.po
index ec0a03b42ce..a7b06da5286 100644
--- a/l10n/ml_IN/user_ldap.po
+++ b/l10n/ml_IN/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 12142533623..cfb078e9e2a 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -141,51 +141,51 @@ msgstr "Disember"
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -193,23 +193,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Batal"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Ya"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Tidak"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ok"
 
@@ -616,14 +612,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "sebelum"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "seterus"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 4ac055f2b8d..83db5d48b58 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "Muatnaik dibatalkan."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Ralat"
 
@@ -183,34 +183,40 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index 954e77ca28a..7ce6237f3d0 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 529c2d96124..7f34225a016 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index ea53a0cd7ea..c18b8be698a 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Simpan..."
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "_nama_bahasa_"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Tahap Log"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Lanjutan"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 80b893685cf..de6d8fa0134 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Bantuan"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 29ad3b362d7..a1e4d461931 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -141,51 +141,51 @@ msgstr "ဒီဇင်ဘာ"
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "စက္ကန့်အနည်းငယ်က"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "ယနေ့"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "မနေ့က"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "ပြီးခဲ့သောလ"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "မနှစ်က"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "နှစ် အရင်က"
 
@@ -193,23 +193,19 @@ msgstr "နှစ် အရင်က"
 msgid "Choose"
 msgstr "ရွေးချယ်"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "ပယ်ဖျက်မည်"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "ဟုတ်"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "မဟုတ်ဘူး"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "အိုကေ"
 
@@ -616,14 +612,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "ယခင်"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "နောက်သို့"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index e13e42e4def..84606a993f6 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr ""
 
@@ -183,34 +183,40 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index d04bb04647c..77d34ee18f7 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index bac9d830bf4..a8a9bc152a8 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "မဆုံးဖြတ်နိုင်ပါ။"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index 903834397b0..f537d21d9e2 100644
--- a/l10n/my_MM/settings.po
+++ b/l10n/my_MM/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index f9f369565af..62ed04aa882 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "အကူအညီ"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 0201469d378..6533a847d21 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -142,55 +142,55 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "forrige måned"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "forrige år"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "år siden"
 
@@ -198,23 +198,19 @@ msgstr "år siden"
 msgid "Choose"
 msgstr "Velg"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Nei"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ok"
 
@@ -621,14 +617,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "forrige"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "neste"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index bc5dd59d240..ea723ff9903 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Hans Nesse <>, 2013
+# TheLugal <thelugal@gmail.com>, 2013
 # Stein-Aksel Basma <stabasm@hotmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +36,7 @@ msgstr "Kunne ikke sette opplastingskatalog."
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
-msgstr ""
+msgstr "Ugyldig nøkkel"
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
@@ -96,12 +97,12 @@ msgstr "Ikke nok lagringsplass"
 msgid "Upload cancelled."
 msgstr "Opplasting avbrutt."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL-en kan ikke være tom."
 
@@ -109,8 +110,8 @@ msgstr "URL-en kan ikke være tom."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Feil"
 
@@ -124,7 +125,7 @@ msgstr "Slett permanent"
 
 #: js/fileactions.js:192
 msgid "Rename"
-msgstr "Omdøp"
+msgstr "Gi nytt navn"
 
 #: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
@@ -148,7 +149,7 @@ msgstr "avbryt"
 
 #: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
-msgstr "erstatt {new_name} med {old_name}"
+msgstr "erstattet {new_name} med {old_name}"
 
 #: js/filelist.js:350
 msgid "undo"
@@ -157,8 +158,8 @@ msgstr "angre"
 #: js/filelist.js:453
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Laster opp %n fil"
+msgstr[1] "Laster opp %n filer"
 
 #: js/filelist.js:518
 msgid "files uploading"
@@ -184,46 +185,52 @@ msgstr "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkro
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)"
+msgstr "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n mappe"
+msgstr[1] "%n mapper"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "Kunne ikke gi nytt navn til %s"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -317,7 +324,7 @@ msgstr "Filene du prøver å laste opp er for store for å laste opp til denne s
 
 #: templates/index.php:112
 msgid "Files are being scanned, please wait."
-msgstr "Skanner etter filer, vennligst vent."
+msgstr "Skanner filer, vennligst vent."
 
 #: templates/index.php:115
 msgid "Current scanning"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index c3ad85d42b1..ccc3611f726 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 72e2ce3e7bf..8a0267ad7cb 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-17 22:20+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -56,13 +56,13 @@ msgstr "Slettet"
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n mapper"
 
 #: js/trash.js:197
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n filer"
 
 #: lib/trash.php:819 lib/trash.php:821
 msgid "restored"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 5e2ffdb8ffe..81cf9faa238 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Applikasjon er ikke påslått"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index e812e0ae327..ee56bbd7a82 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -122,7 +122,11 @@ msgstr "Feil ved oppdatering av app"
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Lagrer..."
 
@@ -167,7 +171,7 @@ msgstr "Feil ved oppretting av bruker"
 msgid "A valid password must be provided"
 msgstr "Oppgi et gyldig passord"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -238,106 +242,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Utfør en oppgave med hver side som blir lastet"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Aktiver API for Deling"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Tillat apps å bruke API for Deling"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Tillat lenker"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Tillat brukere å dele filer med lenker"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "TIllat videredeling"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Tillat brukere å dele filer som allerede har blitt delt med dem"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Tillat brukere å dele med alle"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillat kun deling med andre brukere i samme gruppe"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Tving HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Loggnivå"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Versjon"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Bruk denne adressen for å <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">få tilgang til filene dine via WebDAV</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Logginn navn"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index ae3612c0d98..037b9206594 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "Brukerpålogging filter"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Definerer filteret som skal brukes når et påloggingsforsøk blir utført. %%uid erstatter brukernavnet i innloggingshandlingen."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "bruk %%uid plassholder, f.eks. \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Brukerliste filter"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definerer filteret som skal brukes, når systemet innhenter brukere."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "uten noe plassholder, f.eks. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Gruppefilter"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definerer filteret som skal brukes, når systemet innhenter grupper."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "uten noe plassholder, f.eks. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Konfigurasjon aktiv"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Når ikke huket av så vil denne konfigurasjonen bli hoppet over."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Sikkerhetskopierings (Replica) vert"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Bruk TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Case-insensitiv LDAP tjener (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Slå av SSL-sertifikat validering"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Ikke anbefalt, bruk kun for testing"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "i sekunder. En endring tømmer bufferen."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Vis brukerens navnfelt"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Hovedbruker tre"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "En Bruker Base DN pr. linje"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Vis gruppens navnfelt"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Hovedgruppe tre"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "En gruppe hoved-DN pr. linje"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "gruppe-medlem assosiasjon"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Hjelp"
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index d20e5a3d3ab..8278426322d 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -141,55 +141,55 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -197,23 +197,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index 306604617a3..d09313ed514 100644
--- a/l10n/ne/files.po
+++ b/l10n/ne/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr ""
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index 4fcfd8bc3ea..8852f856cc1 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index 20fa4cf7fb4..578a57af945 100644
--- a/l10n/ne/settings.po
+++ b/l10n/ne/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index 5ca0bf8245f..823ea6ee1a6 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 0502d440988..59e41074d63 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -144,55 +144,55 @@ msgstr "december"
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "seconden geleden"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n minuten geleden"
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n uur geleden"
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "vandaag"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "gisteren"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n dagen geleden"
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "vorige maand"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n maanden geleden"
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "maanden geleden"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "vorig jaar"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "jaar geleden"
 
@@ -200,23 +200,19 @@ msgstr "jaar geleden"
 msgid "Choose"
 msgstr "Kies"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Annuleer"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Fout bij laden van bestandsselectie sjabloon"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Nee"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ok"
 
@@ -383,7 +379,7 @@ msgstr "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud."
 #: lostpassword/controller.php:61
 #, php-format
 msgid "%s password reset"
-msgstr ""
+msgstr "%s wachtwoord reset"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -623,14 +619,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Hallo daar,<br><br> %s deelde »%s« met jou.<br><a href=\"%s\">Bekijk!</a><br><br>Veel plezier!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "vorige"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "volgende"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 59bcbd7a4f3..37c004124a6 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # André Koot <meneer@tken.net>, 2013
+# kwillems <kwillems@zonnet.nl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -95,12 +96,12 @@ msgstr "Niet genoeg ruimte beschikbaar"
 msgid "Upload cancelled."
 msgstr "Uploaden geannuleerd."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL kan niet leeg zijn."
 
@@ -108,8 +109,8 @@ msgstr "URL kan niet leeg zijn."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Fout"
 
@@ -156,8 +157,8 @@ msgstr "ongedaan maken"
 #: js/filelist.js:453
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n bestand aan het uploaden"
+msgstr[1] "%n bestanden aan het uploaden"
 
 #: js/filelist.js:518
 msgid "files uploading"
@@ -185,39 +186,45 @@ msgstr "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Naam"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Grootte"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Aangepast"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n mappen"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n bestanden"
 
 #: lib/app.php:73
 #, php-format
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index cf2ebc5ccc0..a9f681aaee2 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-13 09:11-0400\n"
-"PO-Revision-Date: 2013-08-12 10:20+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: Len <lenny@weijl.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 9227cb640a5..ba5a8671355 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-17 06:30+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,14 +55,14 @@ msgstr "Verwijderd"
 #: js/trash.js:191
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n map"
+msgstr[1] "%n mappen"
 
 #: js/trash.js:197
 msgid "%n file"
 msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n bestand"
+msgstr[1] "%n bestanden"
 
 #: lib/trash.php:819 lib/trash.php:821
 msgid "restored"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 833787fb045..eba0796878e 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -75,10 +75,6 @@ msgid ""
 "administrator."
 msgstr "Download de bestanden in kleinere brokken, appart of vraag uw administrator."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "kon niet worden vastgesteld"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "De applicatie is niet actief"
@@ -210,14 +206,14 @@ msgstr "seconden geleden"
 #: template/functions.php:81
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n minuut geleden"
+msgstr[1] "%n minuten geleden"
 
 #: template/functions.php:82
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n uur geleden"
+msgstr[1] "%n uur geleden"
 
 #: template/functions.php:83
 msgid "today"
@@ -230,8 +226,8 @@ msgstr "gisteren"
 #: template/functions.php:85
 msgid "%n day go"
 msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n dag terug"
+msgstr[1] "%n dagen geleden"
 
 #: template/functions.php:86
 msgid "last month"
@@ -240,8 +236,8 @@ msgstr "vorige maand"
 #: template/functions.php:87
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n maand geleden"
+msgstr[1] "%n maanden geleden"
 
 #: template/functions.php:88
 msgid "last year"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index f2b74b11fb0..ca4063b207f 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -5,14 +5,15 @@
 # Translators:
 # André Koot <meneer@tken.net>, 2013
 # helonaut, 2013
+# kwillems <kwillems@zonnet.nl>, 2013
 # Len <lenny@weijl.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-13 09:11-0400\n"
-"PO-Revision-Date: 2013-08-12 10:30+0000\n"
-"Last-Translator: Len <lenny@weijl.org>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -123,7 +124,11 @@ msgstr "Fout bij bijwerken app"
 msgid "Updated"
 msgstr "Bijgewerkt"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Opslaan"
 
@@ -168,7 +173,7 @@ msgstr "Fout bij aanmaken gebruiker"
 msgid "A valid password must be provided"
 msgstr "Er moet een geldig wachtwoord worden opgegeven"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Nederlands"
 
@@ -183,7 +188,7 @@ msgid ""
 "configure your webserver in a way that the data directory is no longer "
 "accessible or you move the data directory outside the webserver document "
 "root."
-msgstr ""
+msgstr "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet.  We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datamap niet bereikbaar is vanaf het internet of om uw datamap te verplaatsen naar een locatie buiten de document root van de webserver."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
@@ -220,7 +225,7 @@ msgid ""
 "System locale can't be set to %s. This means that there might be problems "
 "with certain characters in file names. We strongly suggest to install the "
 "required packages on your system to support %s."
-msgstr ""
+msgstr "De systeemtaal kan niet worden ingesteld op %s. Hierdoor kunnen er problemen optreden met bepaalde karakters in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren, zodat %s ondersteund wordt."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
@@ -233,112 +238,112 @@ msgid ""
 "installation of 3rd party apps don´t work. Accessing files from remote and "
 "sending of notification emails might also not work. We suggest to enable "
 "internet connection for this server if you want to have all features."
-msgstr ""
+msgstr "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken."
 
 #: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Bij laden van elke pagina één taak uitvoeren"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php is geregistreerd bij een webcron service om cron.php eens per minuut aan te roepen via http."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Gebruik de systeem cron service om het bestand cron.php eens per minuut aan te roepen."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Delen"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Activeren Share API"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Apps toestaan de Share API te gebruiken"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Toestaan links"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Toestaan dat gebruikers objecten met links delen met anderen"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Sta publieke uploads toe"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Sta gebruikers toe anderen in hun publiek gedeelde mappen bestanden te uploaden"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Toestaan opnieuw delen"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Toestaan dat gebruikers met iedereen delen"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Instellen dat gebruikers alleen met leden binnen hun groepen delen"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Beveiliging"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Afdwingen HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Dwingt de clients om een versleutelde verbinding te maken met %s"
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Meer"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Minder"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Versie"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -468,6 +473,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Gebruik dit adres <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">toegang tot uw bestanden via WebDAV</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Versleuteling"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Inlognaam"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index cea243ef797..121b8643e5e 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # André Koot <meneer@tken.net>, 2013
+# kwillems <kwillems@zonnet.nl>, 2013
 # Len <lenny@weijl.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-13 09:11-0400\n"
-"PO-Revision-Date: 2013-08-12 10:20+0000\n"
-"Last-Translator: Len <lenny@weijl.org>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -156,198 +157,185 @@ msgstr "Gebruikers Login Filter"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Definiëerd de toe te passen filter indien er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam in de login actie."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "gebruik %%uid placeholder, bijv. \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Gebruikers Lijst Filter"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definiëerd de toe te passen filter voor het ophalen van gebruikers."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "zonder een placeholder, bijv. \"objectClass=person\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Groep Filter"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definiëerd de toe te passen filter voor het ophalen van groepen."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "zonder een placeholder, bijv. \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Verbindingsinstellingen"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Configuratie actief"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Als dit niet is ingeschakeld wordt deze configuratie overgeslagen."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Poort"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Backup (Replica) Host"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Opgeven optionele backup host. Het moet een replica van de hoofd LDAP/AD server."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Backup (Replica) Poort"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Deactiveren hoofdserver"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr "Maak alleen een verbinding met de replica server."
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Gebruik TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Gebruik het niet voor LDAPS verbindingen, dat gaat niet lukken."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Niet-hoofdlettergevoelige LDAP server (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Schakel SSL certificaat validatie uit."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar de %s server."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Niet aangeraden, gebruik alleen voor test doeleinden."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Cache time-to-live"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "in seconden. Een verandering maakt de cache leeg."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Mapinstellingen"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Gebruikers Schermnaam Veld"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de gebruiker."
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Basis Gebruikers Structuur"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Een User Base DN per regel"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Attributen voor gebruikerszoekopdrachten"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Optioneel; één attribuut per regel"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Groep Schermnaam Veld"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de groepen."
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Basis Groupen Structuur"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Een Group Base DN per regel"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Attributen voor groepszoekopdrachten"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Groepslid associatie"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Speciale attributen"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Quota veld"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Quota standaard"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "in bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "E-mailveld"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Gebruikers Home map naamgevingsregel"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Interne gebruikersnaam"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,17 +349,17 @@ msgid ""
 "behavior as before ownCloud 5 enter the user display name attribute in the "
 "following field. Leave it empty for default behavior. Changes will have "
 "effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Standaard wordt de interne gebruikersnaam aangemaakt op basis van het UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan​​: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een ​​gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle *DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van vóór ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op gekoppelde (toegevoegde) LDAP-gebruikers."
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Interne gebruikersnaam attribuut:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Negeren UUID detectie"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,17 +368,17 @@ msgid ""
 "You must make sure that the attribute of your choice can be fetched for both"
 " users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Standaard herkent ownCloud het UUID-attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij deze hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw gekoppelde (toegevoegde) LDAP-gebruikers en-groepen."
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "UUID Attribuut:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Gebruikersnaam-LDAP gebruikers vertaling"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,20 +390,20 @@ msgid ""
 " is not configuration sensitive, it affects all LDAP configurations! Never "
 "clear the mappings in a production environment, only in a testing or "
 "experimental stage."
-msgstr ""
+msgstr "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, krijgt elke LDAP-gebruiker ook een interne gebruikersnaam. Dit vereist een koppeling van de ownCloud gebruikersnaam aan een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Aanvullend wordt ook de 'DN' gecached om het aantal LDAP-interacties te verminderen, maar dit wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden. De interne naam wordt overal gebruikt. Het wissen van de koppeling zal overal resten achterlaten. Het wissen van koppelingen is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze koppelingen nooit in een productieomgeving gewist worden. Maak ze alleen leeg in een test- of ontwikkelomgeving."
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Leegmaken Groepsnaam-LDAP groep vertaling"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Test configuratie"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Help"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 29908b4d1b9..d7afc5bf410 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -143,55 +143,55 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "sekund sidan"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "førre månad"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "månadar sidan"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "i fjor"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "år sidan"
 
@@ -199,23 +199,19 @@ msgstr "år sidan"
 msgid "Choose"
 msgstr "Vel"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Nei"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Greitt"
 
@@ -622,14 +618,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "førre"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "neste"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 383366110d4..fe27f782683 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -96,12 +96,12 @@ msgstr "Ikkje nok lagringsplass tilgjengeleg"
 msgid "Upload cancelled."
 msgstr "Opplasting avbroten."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "Nettadressa kan ikkje vera tom."
 
@@ -109,8 +109,8 @@ msgstr "Nettadressa kan ikkje vera tom."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Feil"
 
@@ -186,35 +186,41 @@ msgstr "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Lagringa di er nesten full ({usedSpacePercent} %)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 4b2ff875d13..53090ff185e 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index a344f828b7b..cb71c6e589f 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index b451c6fb503..ca6c39e33cb 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -122,7 +122,11 @@ msgstr "Feil ved oppdatering av app"
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Lagrar …"
 
@@ -167,7 +171,7 @@ msgstr "Feil ved oppretting av brukar"
 msgid "A valid password must be provided"
 msgstr "Du må oppgje eit gyldig passord"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Nynorsk"
 
@@ -238,106 +242,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Utfør éi oppgåve for kvar sidelasting"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Slå på API-et for deling"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "La app-ar bruka API-et til deling"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Tillat lenkjer"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "La brukarar dela ting offentleg med lenkjer"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Tillat vidaredeling"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "La brukarar vidaredela delte ting"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "La brukarar dela med kven som helst"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "La brukarar dela berre med brukarar i deira grupper"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Tryggleik"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Krev HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Log nivå"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Meir"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Utgåve"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Innloggingsnamn"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index f634ba786a4..8ded31122df 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Hjelp"
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 33d3488ee96..0fee2d59130 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -141,55 +141,55 @@ msgstr "Decembre"
 msgid "Settings"
 msgstr "Configuracion"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "uèi"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "ièr"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "mes passat"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "meses  a"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "an passat"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "ans a"
 
@@ -197,23 +197,19 @@ msgstr "ans a"
 msgid "Choose"
 msgstr "Causís"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Annula"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Òc"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Non"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "D'accòrdi"
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "dariièr"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "venent"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index fc4c603ab8f..89aa3f3477c 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "Amontcargar anullat."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. "
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Error"
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Talha"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index 48225563d0e..253801f6c9f 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 7624e587690..cfa24f83de8 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 9cdc67cd70f..39b43f27c7f 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Enregistra..."
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Executa un prètfach amb cada pagina cargada"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Al partejar"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Activa API partejada"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Jornal"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Mai d'aquò"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index e2d1715e8c7..b4c7072825e 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 5f7f67f6df2..1917f75d114 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -143,59 +143,59 @@ msgstr "Grudzień"
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "dziś"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "w zeszłym miesiącu"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "miesięcy temu"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "w zeszłym roku"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "lat temu"
 
@@ -203,23 +203,19 @@ msgstr "lat temu"
 msgid "Choose"
 msgstr "Wybierz"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Błąd podczas ładowania pliku wybranego szablonu"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Tak"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Nie"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "OK"
 
@@ -626,14 +622,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Cześć,<br><br>Informuję cię że %s udostępnia ci »%s«.\n<br><a href=\"%s\">Zobacz</a><br><br>Pozdrawiam!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "wstecz"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "naprzód"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 6a873b2103e..4afe550b713 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -96,12 +96,12 @@ msgstr "Za mało miejsca"
 msgid "Upload cancelled."
 msgstr "Wczytywanie anulowane."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL nie może być pusty."
 
@@ -109,8 +109,8 @@ msgstr "URL nie może być pusty."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Błąd"
 
@@ -187,36 +187,42 @@ msgstr "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchro
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Twój magazyn jest prawie pełny ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nieprawidłowa nazwa folderu. Korzystanie z nazwy „Shared” jest zarezerwowane dla ownCloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Modyfikacja"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 1a6992cd4b6..8241e75f710 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 6cdef8fb479..ea1272f2a8e 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr "Pobierz pliki w mniejszy kawałkach, oddzielnie lub poproś administratora o zwiększenie limitu."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "nie może zostać znaleziony"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Aplikacja nie jest włączona"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 66939daefc5..43eac002a05 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-13 09:11-0400\n"
-"PO-Revision-Date: 2013-08-13 12:00+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -122,7 +122,11 @@ msgstr "Błąd podczas aktualizacji aplikacji"
 msgid "Updated"
 msgstr "Zaktualizowano"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Zapisywanie..."
 
@@ -167,7 +171,7 @@ msgstr "Błąd podczas tworzenia użytkownika"
 msgid "A valid password must be provided"
 msgstr "Należy podać prawidłowe hasło"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "polski"
 
@@ -238,106 +242,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Wykonuj jedno zadanie wraz z każdą wczytaną stroną"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Udostępnianie"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Włącz API udostępniania"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Zezwalaj aplikacjom na korzystanie z API udostępniania"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Zezwalaj na odnośniki"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Pozwól na  publiczne wczytywanie"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Zezwalaj na ponowne udostępnianie"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Zezwalaj użytkownikom na współdzielenie z kimkolwiek"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Wymuś HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Poziom logów"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Więcej"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Mniej"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Wersja"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Login"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index ba28976a182..f2571b2fb2a 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -156,198 +156,185 @@ msgstr "Filtr logowania użytkownika"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Definiuje filtr do zastosowania, gdy podejmowana jest próba logowania. %%uid zastępuje nazwę użytkownika w działaniu logowania."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "Użyj %%uid zastępczy, np. \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lista filtrów użytkownika"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definiuje filtry do zastosowania, podczas pobierania użytkowników."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "bez żadnych symboli zastępczych np. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Grupa filtrów"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definiuje filtry do zastosowania, podczas pobierania grup."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Konfiguracja połączeń"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Konfiguracja archiwum"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Gdy niezaznaczone, ta konfiguracja zostanie pominięta."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Kopia zapasowa (repliki) host"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Dać opcjonalnie  hosta kopii zapasowej . To musi być repliką głównego serwera LDAP/AD."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Kopia zapasowa (repliki) Port"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Wyłącz serwer główny"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Użyj TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Nie używaj go dodatkowo dla połączeń protokołu LDAPS, zakończy się niepowodzeniem."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Wielkość liter serwera LDAP (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Wyłączyć sprawdzanie poprawności certyfikatu SSL."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Niezalecane, użyj tylko testowo."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Przechowuj czas życia"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "w sekundach. Zmiana opróżnia pamięć podręczną."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Ustawienia katalogów"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Pole wyświetlanej nazwy użytkownika"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Drzewo bazy użytkowników"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Jeden użytkownik Bazy DN na linię"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Szukaj atrybutów"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Opcjonalnie; jeden atrybut w wierszu"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Pole wyświetlanej nazwy grupy"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Drzewo bazy grup"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Jedna grupa bazy DN na linię"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Grupa atrybutów wyszukaj"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Członek grupy stowarzyszenia"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Specjalne atrybuty"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Pole przydziału"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Przydział domyślny"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "w bajtach"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Pole email"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Reguły nazewnictwa folderu domowego użytkownika"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Wewnętrzna nazwa użytkownika"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -363,15 +350,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Wewnętrzny atrybut nazwy uzżytkownika:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Zastąp wykrywanie UUID"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -382,15 +369,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "Atrybuty UUID:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Mapowanie użytkownika LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -404,18 +391,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Czyść Mapowanie użytkownika LDAP"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Czyść Mapowanie nazwy grupy LDAP"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Konfiguracja testowa"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Pomoc"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index d1f5964e4b1..703b1feb263 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 09:30+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -199,23 +199,19 @@ msgstr "anos atrás"
 msgid "Choose"
 msgstr "Escolha"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Template selecionador Erro ao carregar arquivo"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Sim"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Não"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ok"
 
@@ -622,14 +618,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Olá,<br><br>apenas para você saber que %s compartilhou %s com você.<br><a href=\"%s\">Veja: </a><br><br>Abraços!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "anterior"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "próximo"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index e8563501ebf..d9250a024c1 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -97,12 +97,12 @@ msgstr "Espaço de armazenamento insuficiente"
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL não pode ficar em branco"
 
@@ -110,8 +110,8 @@ msgstr "URL não pode ficar em branco"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Erro"
 
@@ -187,35 +187,41 @@ msgstr "Seu armazenamento está cheio, arquivos não podem mais ser atualizados
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de pasta inválido. O uso de 'Shared' é reservado para o Owncloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 453ca120b6f..511813205a7 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index b8ce85263af..80a90875c3a 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr "Baixe os arquivos em pedaços menores, separadamente ou solicite educadamente  ao seu administrador."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "não pôde ser determinado"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Aplicação não está habilitada"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 4fefbdfdef3..7dae52323c0 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -122,7 +122,11 @@ msgstr "Erro ao atualizar aplicativo"
 msgid "Updated"
 msgstr "Atualizado"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Salvando..."
 
@@ -167,7 +171,7 @@ msgstr "Erro ao criar usuário"
 msgid "A valid password must be provided"
 msgstr "Forneça uma senha válida"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Português (Brasil)"
 
@@ -238,106 +242,106 @@ msgstr "Este servidor não tem conexão com a internet. Isso significa que algum
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Execute uma tarefa com cada página carregada"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php está registrado em um serviço webcron chamar cron.php uma vez por minuto usando http."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Utilizar sistema de serviços cron para chamar o arquivo cron.php uma vez por minuto."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Compartilhamento"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Habilitar API de Compartilhamento"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que aplicativos usem a API de Compartilhamento"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Permitir links"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que usuários compartilhem itens com o público usando links"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Permitir envio público"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Permitir que usuários deem permissão a outros para enviarem arquivios para suas pastas compartilhadas publicamente"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Permitir recompartilhamento"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que usuários compartilhem novamente itens compartilhados com eles"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Permitir que usuários compartilhem com qualquer um"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que usuários compartilhem somente com usuários em seus grupos"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Forçar HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Obrigar os clientes que se conectem a %s através de uma conexão criptografada."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Por favor, se conectar ao seu %s via HTTPS para forçar ativar ou desativar SSL."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Nível de registro"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Use esse endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acessar seus arquivos via WebDAV</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Nome de Login"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 94ddf91fe14..8e83ab7e75d 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
-"Last-Translator: tuliouel\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -156,198 +156,185 @@ msgstr "Filtro de Login de Usuário"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Define o filtro pra aplicar ao efetuar uma tentativa de login. %%uuid substitui o nome de usuário na ação de login."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "use %%uid placeholder, ex. \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtro de Lista de Usuário"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Define filtro a ser aplicado ao obter usuários."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "sem nenhum espaço reservado, ex. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Filtro de Grupo"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Define o filtro a aplicar ao obter grupos."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "sem nenhum espaço reservado, ex.  \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Configurações de Conexão"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Configuração ativa"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Quando não marcada, esta configuração será ignorada."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Porta"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Servidor de Backup (Réplica)"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Defina um servidor de backup opcional. Ele deverá ser uma réplica do servidor LDAP/AD principal."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Porta do Backup (Réplica)"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Desativar Servidor Principal"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr "Conectar-se somente ao servidor de réplica."
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Não use adicionalmente para conexões LDAPS, pois falhará."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP sensível à caixa alta (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Desligar validação de certificado SSL."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Se a conexão só funciona com esta opção, importe o certificado SSL do servidor LDAP no seu servidor %s."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Não recomendado, use somente para testes."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Cache Time-To-Live"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "em segundos. Uma mudança esvaziará o cache."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Configurações de Diretório"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Campo Nome de Exibição de Usuário"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr "O atributo LDAP para usar para gerar o nome de exibição do usuário."
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Árvore de Usuário Base"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Um usuário-base DN por linha"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Atributos de Busca de Usuário"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Opcional; um atributo por linha"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Campo Nome de Exibição de Grupo"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr "O atributo LDAP para usar para gerar o nome de apresentação do grupo."
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Árvore de Grupo Base"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Um grupo-base DN por linha"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Atributos de Busca de Grupo"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Associação Grupo-Membro"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Atributos Especiais"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Campo de Cota"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Cota Padrão"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "em bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Campo de Email"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Regra para Nome da Pasta Pessoal do Usuário"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Nome de usuário interno"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -363,15 +350,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Ele garante que o nome de usuário é único e que caracteres não precisam ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9_.@- ]. Outros caracteres são substituídos por seus correspondentes em ASCII ou simplesmente serão omitidos. Em caso de colisão um número será adicionado/aumentado. O nome de usuário interno é usado para identificar um usuário internamente. É também o nome padrão da pasta \"home\" do usuário. É também parte de URLs remotas, por exemplo, para todos as instâncias *DAV. Com esta definição, o comportamento padrão pode ser sobrescrito. Para alcançar um comportamento semelhante ao de antes do ownCloud 5, forneça o atributo do nome de exibição do usuário no campo seguinte. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários LDAP recém mapeados (adicionados)."
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Atributo Interno de Nome de Usuário:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Substituir detecção UUID"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -382,15 +369,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Por padrão, o atributo UUID é detectado automaticamente. O atributo UUID é usado para identificar, sem dúvidas, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificado acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser lido tanto para usuários como para grupos, e que seja único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários e grupos LDAP recém mapeados (adicionados)."
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "Atributo UUID:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Usuário-LDAP Mapeamento de Usuário"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -404,18 +391,18 @@ msgid ""
 "experimental stage."
 msgstr "Nomes de usuários sãi usados para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Adicionalmente, o DN fica em cache, assim como para reduzir a interação LDAP, mas não é utilizado para a identificação. Se o DN muda, as mudanças serão encontradas. O nome de usuário interno é utilizado em todo lugar. Limpar os mapeamentos não influencia a configuração. Limpar os mapeamentos deixará rastros em todo lugar. Limpar os mapeamentos não influencia a configuração, mas afeta as configurações LDAP! Somente limpe os mapeamentos em embiente de testes ou em estágio experimental."
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Limpar Mapeamento de Usuário Nome de Usuário-LDAP"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Limpar NomedoGrupo-LDAP Mapeamento do Grupo"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Teste de Configuração"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 7b568baecac..d1bc08b13f1 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -145,55 +145,55 @@ msgstr "Dezembro"
 msgid "Settings"
 msgstr "Configurações"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "Minutos atrás"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "ultímo mês"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "ano passado"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -201,23 +201,19 @@ msgstr "anos atrás"
 msgid "Choose"
 msgstr "Escolha"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Erro ao carregar arquivo do separador modelo"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Sim"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Não"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ok"
 
@@ -624,14 +620,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Olá,<br><br>Apenas para lhe informar que %s partilhou »%s« consigo.<br><a href=\"%s\">Consulte-o aqui!</a><br><br>Cumprimentos!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "anterior"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "seguinte"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 6c6d02291a7..3534f1cc596 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -96,12 +96,12 @@ msgstr "Espaço em disco insuficiente!"
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "O URL não pode estar vazio."
 
@@ -109,8 +109,8 @@ msgstr "O URL não pode estar vazio."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Erro"
 
@@ -186,35 +186,41 @@ msgstr "O seu armazenamento está cheio, os ficheiros não podem ser sincronizad
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de pasta inválido. O Uso de 'shared' é reservado para o ownCloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index b69a517b10a..200f818e9f3 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-08 11:00+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index 890855582cf..c1a7fac6ec2 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr "Descarregue os ficheiros em partes menores, separados ou peça gentilmente ao seu administrador."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "Não foi possível determinar"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "A aplicação não está activada"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index b367d9ee7e4..c43a1c98a2c 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -124,7 +124,11 @@ msgstr "Erro enquanto actualizava a aplicação"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "A guardar..."
 
@@ -169,7 +173,7 @@ msgstr "Erro a criar utilizador"
 msgid "A valid password must be provided"
 msgstr "Uma password válida deve ser fornecida"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -240,106 +244,106 @@ msgstr "Este servidor ownCloud não tem uma ligação de internet a funcionar. I
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Executar uma tarefa com cada página carregada"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php está registado num serviço webcron para chamar a página cron.php por http uma vez por minuto."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Use o serviço cron do sistema para chamar o ficheiro cron.php uma vez por minuto."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Partilha"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Activar a API de partilha"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que os utilizadores usem a API de partilha"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Permitir links"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que os utilizadores partilhem itens com o público utilizando um link."
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Permitir Envios Públicos"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Permitir aos utilizadores que possam definir outros utilizadores para carregar ficheiros para as suas pastas publicas"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Permitir repartilha"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que os utilizadores partilhem itens partilhados com eles"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Permitir que os utilizadores partilhem com todos"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Forçar HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forçar os clientes a ligar a %s através de uma ligação encriptada"
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL"
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Registo"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Nível do registo"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -469,6 +473,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Use este endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">aceder aos seus ficheiros via WebDav</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Nome de utilizador"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index b843c86fd17..435fb626098 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -157,198 +157,185 @@ msgstr "Filtro de login de utilizador"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Define o filtro a aplicar, para aquando de uma tentativa de login. %%uid substitui o nome de utilizador utilizado."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "Use a variável %%uid , exemplo: \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Utilizar filtro"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Defina o filtro a aplicar, ao recuperar utilizadores."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "Sem variável. Exemplo: \"objectClass=pessoa\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Filtrar por grupo"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Defina o filtro a aplicar, ao recuperar grupos."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Definições de ligação"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Configuração activa"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Se não estiver marcada, esta definição não será tida em conta."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Porto"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Servidor de Backup (Réplica)"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Forneça um servidor (anfitrião) de backup. Deve ser uma réplica do servidor principal de LDAP/AD "
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Porta do servidor de backup (Replica)"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Desactivar servidor principal"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Não utilize para adicionar ligações LDAP, irá falhar!"
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP (Windows) não sensível a maiúsculas."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Desligar a validação de certificado SSL."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Não recomendado, utilizado apenas para testes!"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Cache do tempo de vida dos objetos no servidor"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "em segundos. Uma alteração esvazia a cache."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Definições de directorias"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Mostrador do nome de utilizador."
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Base da árvore de utilizadores."
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Uma base de utilizador DN por linha"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Utilizar atributos de pesquisa"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Opcional; Um atributo por linha"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Mostrador do nome do grupo."
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Base da árvore de grupos."
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Uma base de grupo DN por linha"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Atributos de pesquisa de grupo"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Associar utilizador ao grupo."
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Atributos especiais"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Quota"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Quota padrão"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "em bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Campo de email"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Regra da pasta inicial do utilizador"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Nome de utilizador interno"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -364,15 +351,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Atributo do nome de utilizador interno"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Passar a detecção do UUID"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -383,15 +370,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "Atributo UUID:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Mapeamento do utilizador LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -405,18 +392,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Limpar mapeamento do utilizador-LDAP"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Limpar o mapeamento do nome de grupo LDAP"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Testar a configuração"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 39cd512c1a5..94a85870e9b 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -145,59 +145,59 @@ msgstr "Decembrie"
 msgid "Settings"
 msgstr "Setări"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "secunde în urmă"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "astăzi"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "ultima lună"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "luni în urmă"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "ultimul an"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "ani în urmă"
 
@@ -205,23 +205,19 @@ msgstr "ani în urmă"
 msgid "Choose"
 msgstr "Alege"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Anulare"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Eroare la încărcarea șablonului selectorului de fișiere"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Nu"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ok"
 
@@ -628,14 +624,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Salutare, <br><br>Vă aduc la cunoștință că %s a partajat %s cu tine.<br><a href=\"%s\">Accesează-l!</a><br><br>Numai bine!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "precedentul"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "următorul"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 93dc92fbfb4..7f0ae89b77f 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -97,12 +97,12 @@ msgstr "Nu este suficient spațiu disponibil"
 msgid "Upload cancelled."
 msgstr "Încărcare anulată."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "Adresa URL nu poate fi goală."
 
@@ -110,8 +110,8 @@ msgstr "Adresa URL nu poate fi goală."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Eroare"
 
@@ -188,36 +188,42 @@ msgstr "Spatiul de stocare este plin, nu mai puteti incarca s-au sincroniza alte
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Spatiul de stocare este aproape plin ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Invalid folder name. Usage of 'Shared' is reserved by Ownclou"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index bf1518c49c3..34575f9a246 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 28319ce8b44..d09f1365448 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 13:50+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "nu poate fi determinat"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Aplicația nu este activată"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 1889d0846af..48188399867 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,11 @@ msgstr "Eroare în timpul actualizării aplicaţiei"
 msgid "Updated"
 msgstr "Actualizat"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Se salvează..."
 
@@ -166,7 +170,7 @@ msgstr "Eroare la crearea utilizatorului"
 msgid "A valid password must be provided"
 msgstr "Trebuie să furnizaţi o parolă validă"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "_language_name_"
 
@@ -237,106 +241,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Execută o sarcină la fiecare pagină încărcată"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Partajare"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Activare API partajare"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Permite aplicațiilor să folosească API-ul de partajare"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Pemite legături"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Permite utilizatorilor să partajeze fișiere în mod public prin legături"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Permite repartajarea"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Permite utilizatorilor să repartajeze fișiere partajate cu ei"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Permite utilizatorilor să partajeze cu oricine"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Permite utilizatorilor să partajeze doar cu utilizatori din același grup"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Securitate"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Jurnal de activitate"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Nivel jurnal"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Mai mult"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Mai puțin"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Versiunea"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Încriptare"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 2d78008fc4e..db4843a8a90 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "Filtrare după Nume Utilizator"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "folosiți substituentul %%uid , d.e. \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtrarea după lista utilizatorilor"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definește filtrele care trebui aplicate, când se peiau utilzatorii."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "fără substituenți, d.e. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Fitrare Grup"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definește filtrele care se aplică, când se preiau grupurile."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "fără substituenți, d.e. \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Portul"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Utilizează TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Server LDAP insensibil la majuscule (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Oprește validarea certificatelor SSL "
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Nu este recomandat, a se utiliza doar pentru testare."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "în secunde. O schimbare curăță memoria tampon."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Câmpul cu numele vizibil al utilizatorului"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Arborele de bază al Utilizatorilor"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Un User Base DN pe linie"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Câmpul cu numele grupului"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Arborele de bază al Grupurilor"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Un Group Base DN pe linie"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Asocierea Grup-Membru"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "în octeți"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Ajutor"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 81dee27e6ca..0eea0c71445 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -6,6 +6,7 @@
 # alfsoft <alfsoft@gmail.com>, 2013
 # lord93 <lordakryl@gmail.com>, 2013
 # foool <andrglad@mail.ru>, 2013
+# eurekafag <rkfg@rkfg.me>, 2013
 # Victor Bravo <>, 2013
 # Vyacheslav Muranov <s@neola.ru>, 2013
 # Den4md <denstarr@mail.md>, 2013
@@ -14,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -148,59 +149,59 @@ msgstr "Декабрь"
 msgid "Settings"
 msgstr "Конфигурация"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "несколько секунд назад"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n минуту назад"
+msgstr[1] "%n минуты назад"
+msgstr[2] "%n минут назад"
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n час назад"
+msgstr[1] "%n часа назад"
+msgstr[2] "%n часов назад"
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "сегодня"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n день назад"
+msgstr[1] "%n дня назад"
+msgstr[2] "%n дней назад"
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "в прошлом месяце"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n месяц назад"
+msgstr[1] "%n месяца назад"
+msgstr[2] "%n месяцев назад"
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "несколько месяцев назад"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "в прошлом году"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "несколько лет назад"
 
@@ -208,23 +209,19 @@ msgstr "несколько лет назад"
 msgid "Choose"
 msgstr "Выбрать"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Отменить"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Ошибка при загрузке файла выбора шаблона"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Да"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Нет"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ок"
 
@@ -391,7 +388,7 @@ msgstr "Обновление прошло успешно. Перенаправл
 #: lostpassword/controller.php:61
 #, php-format
 msgid "%s password reset"
-msgstr ""
+msgstr "%s сброс пароля"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -592,7 +589,7 @@ msgstr "Выйти"
 
 #: templates/layout.user.php:100
 msgid "More apps"
-msgstr ""
+msgstr "Ещё приложения"
 
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
@@ -631,14 +628,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Приветствую,<br><br>просто даю знать, что %s поделился »%s« с вами.<br><a href=\"%s\">Посмотреть!</a><br><br>Удачи!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "пред"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "след"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 1c35fe5430d..a34e9fe5a4c 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # lord93 <lordakryl@gmail.com>, 2013
+# eurekafag <rkfg@rkfg.me>, 2013
 # Victor Bravo <>, 2013
 # hackproof <hackproof.ai@gmail.com>, 2013
 # Friktor <antonshramko@yandex.ru>, 2013
@@ -11,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -98,12 +99,12 @@ msgstr "Недостаточно свободного места"
 msgid "Upload cancelled."
 msgstr "Загрузка отменена."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "Ссылка не может быть пустой."
 
@@ -111,8 +112,8 @@ msgstr "Ссылка не может быть пустой."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Ошибка"
 
@@ -159,9 +160,9 @@ msgstr "отмена"
 #: js/filelist.js:453
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Закачка %n файла"
+msgstr[1] "Закачка %n файлов"
+msgstr[2] "Закачка %n файлов"
 
 #: js/filelist.js:518
 msgid "files uploading"
@@ -189,41 +190,47 @@ msgstr "Ваше дисковое пространство полностью з
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше хранилище почти заполнено ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Загрузка началась. Это может потребовать много времени, если файл большого размера."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Имя"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Изменён"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n папка"
+msgstr[1] "%n папки"
+msgstr[2] "%n папок"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n файл"
+msgstr[1] "%n файла"
+msgstr[2] "%n файлов"
 
 #: lib/app.php:73
 #, php-format
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index c8c997b80a2..fc4c452a0a9 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -7,14 +7,15 @@
 # alfsoft <alfsoft@gmail.com>, 2013
 # lord93 <lordakryl@gmail.com>, 2013
 # jekader <jekader@gmail.com>, 2013
+# eurekafag <rkfg@rkfg.me>, 2013
 # Victor Bravo <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:59+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-17 10:40+0000\n"
+"Last-Translator: eurekafag <rkfg@rkfg.me>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,20 +67,20 @@ msgid ""
 "files."
 msgstr "Ваш секретный ключ не действителен! Вероятно, ваш пароль был изменен вне системы OwnCloud (например, корпоративный каталог). Вы можете обновить секретный ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. "
 
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
 msgid "Missing requirements."
 msgstr "Требования отсутствуют."
 
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
-msgstr ""
+msgstr "Пожалуйста, убедитесь, что версия PHP 5.3.3 или новее, а также, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования отключено."
 
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
 msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Для следующих пользователей шифрование не настроено:"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 244bdea5e0b..5553e3a10ad 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: Den4md <denstarr@mail.md>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index c0a473a4e6d..da4605cba1b 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-17 10:40+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -57,14 +57,14 @@ msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "%n папок"
 
 #: js/trash.js:197
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "%n файлов"
 
 #: lib/trash.php:819 lib/trash.php:821
 msgid "restored"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index fe99071b8b5..a2908e78ace 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Alexander Shashkevych <alex@stunpix.com>, 2013
+# eurekafag <rkfg@rkfg.me>, 2013
 # Friktor <antonshramko@yandex.ru>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -75,10 +76,6 @@ msgid ""
 "administrator."
 msgstr "Загрузите файл маленьшими порциями, раздельно или вежливо попросите Вашего администратора."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "Невозможно установить"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Приложение не разрешено"
@@ -210,16 +207,16 @@ msgstr "несколько секунд назад"
 #: template/functions.php:81
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n минута назад"
+msgstr[1] "%n минуты назад"
+msgstr[2] "%n минут назад"
 
 #: template/functions.php:82
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n час назад"
+msgstr[1] "%n часа назад"
+msgstr[2] "%n часов назад"
 
 #: template/functions.php:83
 msgid "today"
@@ -232,9 +229,9 @@ msgstr "вчера"
 #: template/functions.php:85
 msgid "%n day go"
 msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n день назад"
+msgstr[1] "%n дня назад"
+msgstr[2] "%n дней назад"
 
 #: template/functions.php:86
 msgid "last month"
@@ -243,9 +240,9 @@ msgstr "в прошлом месяце"
 #: template/functions.php:87
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n месяц назад"
+msgstr[1] "%n месяца назад"
+msgstr[2] "%n месяцев назад"
 
 #: template/functions.php:88
 msgid "last year"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 32a1640562d..effbf173e9d 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -6,16 +6,16 @@
 # Alexander Shashkevych <alex@stunpix.com>, 2013
 # alfsoft <alfsoft@gmail.com>, 2013
 # lord93 <lordakryl@gmail.com>, 2013
-# eurekafag <eurekafag@eureka7.ru>, 2013
+# eurekafag <rkfg@rkfg.me>, 2013
 # hackproof <hackproof.ai@gmail.com>, 2013
 # Friktor <antonshramko@yandex.ru>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: Alexander Shashkevych <alex@stunpix.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -126,7 +126,11 @@ msgstr "Ошибка при обновлении приложения"
 msgid "Updated"
 msgstr "Обновлено"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Сохранение..."
 
@@ -171,7 +175,7 @@ msgstr "Ошибка создания пользователя"
 msgid "A valid password must be provided"
 msgstr "Укажите валидный пароль"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Русский "
 
@@ -242,106 +246,106 @@ msgstr "Этот сервер не имеет подключения к сети
 msgid "Cron"
 msgstr "Планировщик задач по расписанию"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Выполнять одно задание с каждой загруженной страницей"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php зарегистрирован в сервисе webcron, чтобы cron.php вызывался раз в минуту используя http."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Использовать системный сервис cron для вызова cron.php раз в минуту."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Общий доступ"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Включить API общего доступа"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Позволить приложениям использовать API общего доступа"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Разрешить ссылки"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Разрешить пользователям открывать в общий доступ элементы с публичной ссылкой"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Разрешить открытые загрузки"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Разрешить пользователям позволять другим загружать в их открытые папки"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Разрешить переоткрытие общего доступа"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Позволить пользователям открывать общий доступ к эллементам уже открытым в общий доступ"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Разрешить пользователя делать общий доступ любому"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Разрешить пользователям делать общий доступ только для пользователей их групп"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Безопасность"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Принудить к HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Принудить клиентов подключаться к %s через шифрованное соединение."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить принудительное SSL."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Лог"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Уровень лога"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Больше"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Меньше"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -471,6 +475,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Используйте этот адрес чтобы получить доступ к вашим файлам через WebDav - <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Шифрование"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Имя пользователя"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index a2e443c735b..f47972aa0b7 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: Alexander Shashkevych <alex@stunpix.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -157,198 +157,185 @@ msgstr "Фильтр входа пользователей"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "используйте заполнитель %%uid, например: \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Фильтр списка пользователей"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Определяет фильтр для применения при получении пользователей."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "без заполнителя, например: \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Фильтр группы"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Определяет фильтр для применения при получении группы."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "без заполнения, например \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Настройки подключения"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Конфигурация активна"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Когда галочка снята, эта конфигурация будет пропущена."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Адрес резервного сервера"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Порт резервного сервера"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Отключение главного сервера"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Использовать TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Не используйте совместно с безопасными подключениями (LDAPS), это не сработает."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Нечувствительный к регистру сервер LDAP (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Отключить проверку сертификата SSL."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Не рекомендуется, используйте только для тестирования."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Кэш времени жизни"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "в секундах. Изменение очистит кэш."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Настройки каталога"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Поле отображаемого имени пользователя"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "База пользовательского дерева"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "По одной базовому DN пользователей в строке."
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Поисковые атрибуты пользователя"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Опционально; один атрибут на линию"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Поле отображаемого имени группы"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "База группового дерева"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "По одной базовому DN групп в строке."
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Атрибуты поиска для группы"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Ассоциация Группа-Участник"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Специальные атрибуты"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Поле квота"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Квота по умолчанию"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Поле адресса эллектронной почты"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Правило именования Домашней Папки Пользователя"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Внутреннее имя пользователя"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -364,15 +351,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Аттрибут для внутреннего имени:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Переопределить нахождение UUID"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -383,15 +370,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "Аттрибут для UUID:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Соответствия Имя-Пользователь LDAP"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -405,18 +392,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Очистить соответствия Имя-Пользователь LDAP"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Очистить соответствия Группа-Группа LDAP"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Тестовая конфигурация"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Помощь"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 01e83cce14a..1f04852c7aa 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -141,55 +141,55 @@ msgstr "දෙසැම්බර්"
 msgid "Settings"
 msgstr "සිටුවම්"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "තත්පරයන්ට පෙර"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "අද"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "ඊයේ"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "පෙර මාසයේ"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "මාස කීපයකට පෙර"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "පෙර අවුරුද්දේ"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "අවුරුදු කීපයකට පෙර"
 
@@ -197,23 +197,19 @@ msgstr "අවුරුදු කීපයකට පෙර"
 msgid "Choose"
 msgstr "තෝරන්න"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "එපා"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "ඔව්"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "එපා"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "හරි"
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "පෙර"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "ඊළඟ"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 57a6b5a168a..b0ac13562ad 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "උඩුගත කිරීම අත් හරින්න ලදී"
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත"
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "යොමුව හිස් විය නොහැක"
 
@@ -107,8 +107,8 @@ msgstr "යොමුව හිස් විය නොහැක"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "දෝෂයක්"
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "නම"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "ප්‍රමාණය"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "වෙනස් කළ"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index 83f086d0d7c..b281c905bc2 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index 838b32a1fdc..8bd7dedc627 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "යෙදුම සක්‍රිය කර නොමැත"
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 1d82e019d90..364c8db12f0 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "සුරැකෙමින් පවතී..."
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "හුවමාරු කිරීම"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "යොමු සලසන්න"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "යළි යළිත් හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "හුවමාරු කළ  හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "ඕනෑම අයෙකු හා හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "තම කණ්ඩායමේ අයෙකු හා පමණක් හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "ලඝුව"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "වැඩි"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "අඩු"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "ගුප්ත කේතනය"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index fef4fb3d55a..d45dc541340 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "පරිශීලක පිවිසුම් පෙරහන"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "පරිශීලක ලැයිස්තු පෙරහන"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "කණ්ඩායම් පෙරහන"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "කණ්ඩායම් සොයා ලබාගන්නා විට, යොදන පෙරහන නියම කරයි"
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "තොට"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "TLS භාවිතා කරන්න"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "නිර්දේශ කළ නොහැක. පරීක්ෂණ සඳහා පමණක් භාවිත කරන්න"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "උදව්"
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index d92fbb15323..d3d50d2c755 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -141,59 +141,59 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -201,23 +201,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -624,14 +620,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index 03e5389517a..df3871ecaa7 100644
--- a/l10n/sk/files.po
+++ b/l10n/sk/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr ""
 
@@ -185,36 +185,42 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index 1956868b0db..00f4b5abfa4 100644
--- a/l10n/sk/lib.po
+++ b/l10n/sk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index bb053c28194..44c3a024c0e 100644
--- a/l10n/sk/settings.po
+++ b/l10n/sk/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index 96f620bab61..0c3d5db2fe9 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 025c8016e01..d8c9901c99f 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -142,59 +142,59 @@ msgstr "December"
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "minulý mesiac"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "pred mesiacmi"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "pred rokmi"
 
@@ -202,23 +202,19 @@ msgstr "pred rokmi"
 msgid "Choose"
 msgstr "Výber"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Zrušiť"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Chyba pri načítaní šablóny výberu súborov"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Áno"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Nie"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ok"
 
@@ -625,14 +621,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Ahoj,<br><br>chcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: <br><a href=\"%s\">zde</a>.<br><br>Vďaka"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "späť"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "ďalej"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 998fb959654..869a701eaab 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -95,12 +95,12 @@ msgstr "Nie je k dispozícii dostatok miesta"
 msgid "Upload cancelled."
 msgstr "Odosielanie zrušené."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Opustenie stránky zruší práve prebiehajúce odosielanie súboru."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL nemôže byť prázdne."
 
@@ -108,8 +108,8 @@ msgstr "URL nemôže byť prázdne."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Chyba"
 
@@ -186,36 +186,42 @@ msgstr "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchroniz
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Vaše úložisko je takmer plné ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Neplatné meno priečinka. Používanie mena 'Shared' je vyhradené len pre Owncloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Názov"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Upravené"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 24320a2a13c..1a88ff07b4c 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-07 19:30+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index b403893d8bb..ede2a4e9a36 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr "Stiahnite súbory po menších častiach, samostatne, alebo sa obráťte na správcu."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "nedá sa zistiť"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Aplikácia nie je zapnutá"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 2d3c21ee9a0..d32db56a5de 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,11 @@ msgstr "chyba pri aktualizácii aplikácie"
 msgid "Updated"
 msgstr "Aktualizované"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Ukladám..."
 
@@ -166,7 +170,7 @@ msgstr "Chyba pri vytváraní používateľa"
 msgid "A valid password must be provided"
 msgstr "Musíte zadať platné heslo"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Slovensky"
 
@@ -237,106 +241,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Vykonať jednu úlohu s každým načítaní stránky"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Zdieľanie"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Povoliť API zdieľania"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Povoliť aplikáciám používať API na zdieľanie"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Povoliť odkazy"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Povoliť používateľom zdieľať položky pre verejnosť cez odkazy"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Povoliť zdieľanie ďalej"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Povoliť používateľom ďalej zdieľať zdieľané položky"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Povoliť používateľom zdieľať s kýmkoľvek"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Povoliť používateľom zdieľať len s používateľmi v ich skupinách"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Zabezpečenie"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Vynútiť HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Úroveň záznamu"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Viac"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Menej"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Verzia"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Použite túto adresu <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pre prístup k súborom cez WebDAV</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Šifrovanie"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Prihlasovacie meno"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index cdf1ed0ff8c..0c495d4dbcc 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -155,198 +155,185 @@ msgstr "Filter prihlásenia používateľov"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "použite zástupný vzor %%uid, napr. \\\"uid=%%uid\\\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filter zoznamov používateľov"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definuje použitý filter, pre získanie používateľov."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "bez zástupných znakov, napr. \"objectClass=person\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Filter skupiny"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definuje použitý filter, pre získanie skupín."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "bez zástupných znakov, napr. \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Nastavenie pripojenia"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Nastavenia sú aktívne "
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ak nie je zaškrtnuté, nastavenie bude preskočené."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Záložný server (kópia) hosť"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Zadajte záložný LDAP/AD. Musí to byť kópia hlavného LDAP/AD servera."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Záložný server (kópia) port"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Zakázať hlavný server"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr "Pripojiť sa len k záložnému serveru."
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Použi TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Nepoužívajte pre pripojenie LDAPS, zlyhá."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server nerozlišuje veľkosť znakov (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Vypnúť overovanie SSL certifikátu."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Ak pripojenie pracuje len s touto možnosťou, tak naimportujte SSL certifikát LDAP servera do vášho %s servera."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Nie je doporučované, len pre testovacie účely."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Životnosť objektov v cache"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Nastavenie priečinka"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Pole pre zobrazenia mena používateľa"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr "Atribút LDAP použitý na vygenerovanie zobrazovaného mena používateľa. "
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Základný používateľský strom"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Jedna používateľská základná DN na riadok"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Atribúty vyhľadávania používateľov"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Voliteľné, jeden atribút na jeden riadok"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Pole pre zobrazenie mena skupiny"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr "Atribút LDAP použitý na vygenerovanie zobrazovaného mena skupiny."
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Základný skupinový strom"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Jedna skupinová základná DN na riadok"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Atribúty vyhľadávania skupín"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Priradenie člena skupiny"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Špeciálne atribúty"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Pole kvóty"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Predvolená kvóta"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "v bajtoch"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Pole email"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Pravidlo pre nastavenie mena používateľského priečinka dát"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Interné používateľské meno"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách používateľských mien bude číslo pridané / odobrané. Interné používateľské meno sa používa na internú identifikáciu používateľa. Je tiež predvoleným názvom používateľského domovského priečinka v ownCloud. Je tiež súčasťou URL pre vzdialený prístup, napríklad pre všetky služby * DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred verziou ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo namapovaných (pridaných) LDAP používateľov."
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Atribút interného používateľského mena:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Prepísať UUID detekciu"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "V predvolenom nastavení je UUID atribút detekovaný automaticky. UUID atribút je použitý na jedinečnú identifikáciu používateľov a skupín z LDAP. Naviac je na základe UUID vytvorené tiež interné použivateľské meno, ak nie je nastavené inak. Môžete predvolené nastavenie prepísať a použiť atribút ktorý si sami zvolíte. Musíte sa ale ubezpečiť, že atribút ktorý vyberiete bude uvedený pri použivateľoch, aj pri skupinách a je jedinečný. Ponechajte prázdne pre predvolené správanie. Zmena bude mať vplyv len na novo namapovaných (pridaných) používateľov a skupiny z LDAP."
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "UUID atribút:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Mapovanie názvov LDAP používateľských mien"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
 "experimental stage."
 msgstr "Použivateľské mená sa používajú pre uchovávanie a priraďovanie (meta)dát. Pre správnu identifikáciu a rozpoznanie používateľov bude mať každý používateľ z LDAP interné používateľské meno. To je nevyhnutné pre namapovanie používateľských mien na používateľov v LDAP. Vytvorené používateľské meno je namapované na UUID používateľa v LDAP. Naviac je cachovaná DN pre obmedzenie interakcie s LDAP, ale nie je používaná pre identifikáciu. Ak sa DN zmení, bude to správne rozpoznané. Interné používateľské meno sa používa všade. Vyčistenie namapování vymaže zvyšky všade. Vyčistenie naviac nie je špecifické, bude mať vplyv na všetky LDAP konfigurácie! Nikdy nečistite namapovanie v produkčnom prostredí, len v testovacej alebo experimentálnej fáze."
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Zrušiť mapovanie LDAP používateľských mien"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Zrušiť mapovanie názvov LDAP skupín"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Test nastavenia"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Pomoc"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index f659c22faf9..52899493b69 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -143,11 +143,11 @@ msgstr "december"
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -155,7 +155,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -163,15 +163,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "danes"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "včeraj"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -179,11 +179,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -191,15 +191,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "mesecev nazaj"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "lansko leto"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "let nazaj"
 
@@ -207,23 +207,19 @@ msgstr "let nazaj"
 msgid "Choose"
 msgstr "Izbor"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Prekliči"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Napaka pri nalaganju predloge za izbor dokumenta"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "V redu"
 
@@ -630,14 +626,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Pozdravljen/a,<br><br>sporočam, da je %s delil »%s« s teboj.<br><a href=\"%s\">Poglej vsebine!</a><br><br>Lep pozdrav!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "nazaj"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "naprej"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 00ab5c60460..693f82abed7 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -95,12 +95,12 @@ msgstr "Na voljo ni dovolj prostora."
 msgid "Upload cancelled."
 msgstr "Pošiljanje je preklicano."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "Naslov URL ne sme biti prazna vrednost."
 
@@ -108,8 +108,8 @@ msgstr "Naslov URL ne sme biti prazna vrednost."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ime mape je neveljavno. Uporaba oznake \"Souporaba\" je rezervirana za ownCloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Napaka"
 
@@ -187,29 +187,35 @@ msgstr "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in us
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud."
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
@@ -217,7 +223,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index 47e1076f579..4ee20dcd09f 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index fc3455dabda..a1879f4bce7 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "ni mogoče določiti"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Program ni omogočen"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 2733327ae90..e2de63cda07 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -122,7 +122,11 @@ msgstr "Prišlo je do napake med posodabljanjem programa."
 msgid "Updated"
 msgstr "Posodobljeno"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Poteka shranjevanje ..."
 
@@ -167,7 +171,7 @@ msgstr "Napaka ustvarjanja uporabnika"
 msgid "A valid password must be provided"
 msgstr "Navedeno mora biti veljavno geslo"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Slovenščina"
 
@@ -238,106 +242,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Periodično opravilo"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Izvedi eno nalogo z vsako naloženo stranjo."
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Souporaba"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Omogoči API souporabe"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Dovoli programom uporabo vmesnika API souporabe"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Dovoli povezave"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Uporabnikom dovoli souporabo predmetov z javnimi povezavami"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Dovoli nadaljnjo souporabo"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Uporabnikom dovoli nadaljnjo souporabo predmetov"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Uporabnikom dovoli souporabo s komerkoli"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Varnost"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Zahtevaj uporabo HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Dnevnik"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Raven beleženja"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Več"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Manj"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Različica"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Šifriranje"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Prijavno ime"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 165251eeea3..cc6fa550f76 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -155,198 +155,185 @@ msgstr "Filter prijav uporabnikov"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime v postopku prijave."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "Uporabite vsebnik %%uid, npr. \"uid=%%uid\"."
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filter seznama uporabnikov"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Določi filter za uporabo med pridobivanjem uporabnikov."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "Brez kateregakoli vsebnika, npr. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Filter skupin"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Določi filter za uporabo med pridobivanjem skupin."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Nastavitve povezave"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Dejavna nastavitev"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Neizbrana možnost preskoči nastavitev."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Vrata"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Varnostna kopija (replika) podatkov gostitelja"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natančna replika strežnika LDAP/AD."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Varnostna kopija (replika) podatka vrat"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Onemogoči glavni strežnik"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Uporabi TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Strežnika ni priporočljivo uporabljati za povezave LDAPS. Povezava bo spodletela."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Strežnik LDAP ne upošteva velikosti črk (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Onemogoči določanje veljavnosti potrdila SSL."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Predpomni podatke TTL"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "v sekundah. Sprememba izprazni predpomnilnik."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Nastavitve mape"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Polje za uporabnikovo prikazano ime"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Osnovno uporabniško drevo"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Eno osnovno uporabniško ime DN na vrstico"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Uporabi atribute iskanja"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Izbirno; en atribut na vrstico"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Polje za prikazano ime skupine"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Osnovno drevo skupine"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Eno osnovno ime skupine DN na vrstico"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Atributi iskanja skupine"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Povezava član-skupina"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Posebni atributi"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Polje količinske omejitve"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Privzeta količinska omejitev"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "v bajtih"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Polje elektronske pošte"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Pravila poimenovanja uporabniške osebne mape"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Interno uporabniško ime"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Atribut Interno uporabniško ime"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Prezri zaznavo UUID"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "Atribut UUID"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Preslikava uporabniško ime - LDAP-uporabnik"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Izbriši preslikavo Uporabniškega imena in LDAP-uporabnika"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Izbriši preslikavo Skupine in LDAP-skupine"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Preizkusne nastavitve"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Pomoč"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 0c6e10ceee2..178c2c97e10 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -143,55 +143,55 @@ msgstr "Dhjetor"
 msgid "Settings"
 msgstr "Parametra"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "sekonda më parë"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "sot"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "dje"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "muajin e shkuar"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "muaj më parë"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "vitin e shkuar"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "vite më parë"
 
@@ -199,23 +199,19 @@ msgstr "vite më parë"
 msgid "Choose"
 msgstr "Zgjidh"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Anulo"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Veprim i gabuar gjatë ngarkimit të modelit të zgjedhësit të skedarëve"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Po"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Jo"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Në rregull"
 
@@ -622,14 +618,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "mbrapa"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "para"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 11d4fda7b97..ace7c037e64 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr "Nuk ka hapësirë memorizimi e mjaftueshme"
 msgid "Upload cancelled."
 msgstr "Ngarkimi u anulua."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL-i nuk mund të jetë bosh."
 
@@ -107,8 +107,8 @@ msgstr "URL-i nuk mund të jetë bosh."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Veprim i gabuar"
 
@@ -184,35 +184,41 @@ msgstr "Hapësira juaj e memorizimit është plot, nuk mund të ngarkoni apo sin
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Hapësira juaj e memorizimit është gati plot ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i."
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Emri"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Dimensioni"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Modifikuar"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index 64007bf9f08..4e5d0ed5b8d 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 7fa5b3bf04e..e5602b240e1 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "nuk u vendos dot"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Programi nuk është i aktivizuar."
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 3b0ed93302f..22bfb9d5de0 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 67a99bb61b2..f8f129da269 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Ndihmë"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 8072e39202b..66d80402804 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -141,59 +141,59 @@ msgstr "Децембар"
 msgid "Settings"
 msgstr "Поставке"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "пре неколико секунди"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "данас"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "јуче"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "прошлог месеца"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "месеци раније"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "прошле године"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "година раније"
 
@@ -201,23 +201,19 @@ msgstr "година раније"
 msgid "Choose"
 msgstr "Одабери"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Откажи"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Да"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Не"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "У реду"
 
@@ -624,14 +620,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "претходно"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "следеће"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 53d08ff07cb..55f54da7a6f 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr "Нема довољно простора"
 msgid "Upload cancelled."
 msgstr "Отпремање је прекинуто."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "Адреса не може бити празна."
 
@@ -107,8 +107,8 @@ msgstr "Адреса не може бити празна."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Грешка"
 
@@ -185,36 +185,42 @@ msgstr "Ваше складиште је пуно. Датотеке више н
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше складиште је скоро па пуно ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Припремам преузимање. Ово може да потраје ако су датотеке велике."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Неисправно име фасцикле. Фасцикла „Shared“ је резервисана за ownCloud."
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Измењено"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 5fe336ebf12..0b670840b60 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 28031d756c0..0ae0fe074fc 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "није одређено"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Апликација није омогућена"
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index d0ab5f6c783..952338863bd 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr "Грешка при ажурирању апликације"
 msgid "Updated"
 msgstr "Ажурирано"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Чување у току..."
 
@@ -165,7 +169,7 @@ msgstr "Грешка при прављењу корисника"
 msgid "A valid password must be provided"
 msgstr "Морате унети исправну лозинку"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Изврши један задатак са сваком учитаном страницом"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Дељење"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Омогући API Share"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Дозвољава апликацијама да користе API Share"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Дозволи везе"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Дозволи корисницима да деле ставке с другима путем веза"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Дозволи поновно дељење"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Дозволи корисницима да поновно деле ставке с другима"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Дозволи корисницима да деле са било ким"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Дозволи корисницима да деле само са корисницима у њиховим групама"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Безбедност"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Наметни HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Бележење"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Ниво бележења"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Више"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Мање"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Шифровање"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Корисничко име"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index c3dad89049f..a563a3a7ca5 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "Филтер за пријаву корисника"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Одређује филтер за примењивање при покушају пријаве. %%uid замењује корисничко име."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "користите чувар места %%uid, нпр. „uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Филтер за списак корисника"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Одређује филтер за примењивање при прибављању корисника."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "без икаквог чувара места, нпр. „objectClass=person“."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Филтер групе"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Одређује филтер за примењивање при прибављању група."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "без икаквог чувара места, нпр. „objectClass=posixGroup“."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Користи TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP сервер осетљив на велика и мала слова (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Искључите потврду SSL сертификата."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Не препоручује се; користите само за тестирање."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "у секундама. Промена испражњава кеш меморију."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Име приказа корисника"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Основно стабло корисника"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Име приказа групе"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Основна стабло група"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Придруживање чланова у групу"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "у бајтовима"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Помоћ"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 507913d3bfb..8a0873def51 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -141,59 +141,59 @@ msgstr "Decembar"
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -201,23 +201,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Otkaži"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -624,14 +620,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "prethodno"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "sledeće"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 50e770f67b7..a24a15a621e 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr ""
 
@@ -185,36 +185,42 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 0b6b7c80421..370cbd5e775 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index fd83ff452b3..561b4de4318 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 95200220f7d..4253999069f 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index cab46e6a8dd..883e7aae577 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Pomoć"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 36486c22d65..84c312d3d20 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -145,55 +145,55 @@ msgstr "December"
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n minut sedan"
+msgstr[1] "%n minuter sedan"
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n timme sedan"
+msgstr[1] "%n timmar sedan"
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n dag sedan"
+msgstr[1] "%n dagar sedan"
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "förra månaden"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n månad sedan"
+msgstr[1] "%n månader sedan"
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "månader sedan"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "förra året"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "år sedan"
 
@@ -201,23 +201,19 @@ msgstr "år sedan"
 msgid "Choose"
 msgstr "Välj"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Fel vid inläsning av filväljarens mall"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Nej"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ok"
 
@@ -384,7 +380,7 @@ msgstr "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud."
 #: lostpassword/controller.php:61
 #, php-format
 msgid "%s password reset"
-msgstr ""
+msgstr "%s återställ lösenord"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -585,7 +581,7 @@ msgstr "Logga ut"
 
 #: templates/layout.user.php:100
 msgid "More apps"
-msgstr ""
+msgstr "Fler appar"
 
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
@@ -624,14 +620,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Hej där,<br><br>ville bara informera dig om att %s delade »%s« med dig.<br><a href=\"%s\">Titta på den!</a><br><br>Hörs!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "föregående"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "nästa"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 9702b4ee112..4536bbd77eb 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -98,12 +98,12 @@ msgstr "Inte tillräckligt med utrymme tillgängligt"
 msgid "Upload cancelled."
 msgstr "Uppladdning avbruten."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL kan inte vara tom."
 
@@ -111,8 +111,8 @@ msgstr "URL kan inte vara tom."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Fel"
 
@@ -159,8 +159,8 @@ msgstr "ångra"
 #: js/filelist.js:453
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Laddar upp %n fil"
+msgstr[1] "Laddar upp %n filer"
 
 #: js/filelist.js:518
 msgid "files uploading"
@@ -188,39 +188,45 @@ msgstr "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Din nedladdning förbereds. Det kan ta tid om det är stora filer."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ogiltigt mappnamn. Användande av 'Shared' är reserverat av ownCloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n mapp"
+msgstr[1] "%n mappar"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
 
 #: lib/app.php:73
 #, php-format
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 95e8da89b11..05283db1ee5 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: Magnus Höglund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index ac516cb4cb4..eafab03a7d9 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/files_trashbin.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# medialabs, 2013
 # Magnus Höglund <magnus@linux.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-18 08:40+0000\n"
+"Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,14 +56,14 @@ msgstr "Raderad"
 #: js/trash.js:191
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n mapp"
+msgstr[1] "%n mappar"
 
 #: js/trash.js:197
 msgid "%n file"
 msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
 
 #: lib/trash.php:819 lib/trash.php:821
 msgid "restored"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 1f5f24739bf..ac5e105a4e4 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -75,10 +75,6 @@ msgid ""
 "administrator."
 msgstr "Ladda ner filerna i mindre bitar, separat eller fråga din administratör."
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "kunde inte bestämmas"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Applikationen är inte aktiverad"
@@ -210,14 +206,14 @@ msgstr "sekunder sedan"
 #: template/functions.php:81
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n minut sedan"
+msgstr[1] "%n minuter sedan"
 
 #: template/functions.php:82
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n timme sedan"
+msgstr[1] "%n timmar sedan"
 
 #: template/functions.php:83
 msgid "today"
@@ -230,8 +226,8 @@ msgstr "i går"
 #: template/functions.php:85
 msgid "%n day go"
 msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n dag sedan"
+msgstr[1] "%n dagar sedan"
 
 #: template/functions.php:86
 msgid "last month"
@@ -240,8 +236,8 @@ msgstr "förra månaden"
 #: template/functions.php:87
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n månad sedan"
+msgstr[1] "%n månader sedan"
 
 #: template/functions.php:88
 msgid "last year"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index aa682e15aad..02e7554291e 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -126,7 +126,11 @@ msgstr "Fel uppstod vid uppdatering av appen"
 msgid "Updated"
 msgstr "Uppdaterad"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Sparar..."
 
@@ -171,7 +175,7 @@ msgstr "Fel vid skapande av användare"
 msgid "A valid password must be provided"
 msgstr "Ett giltigt lösenord måste anges"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -242,106 +246,106 @@ msgstr "Servern har ingen fungerande internetanslutning. Detta innebär att en d
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Exekvera en uppgift vid varje sidladdning"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php är registrerad som en webcron-tjänst för att anropa cron.php varje minut över http."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "Använd system-tjänsten cron för att anropa cron.php varje minut."
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Dela"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Aktivera delat API"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Tillåt applikationer att använda delat API"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Tillåt länkar"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Tillåt delning till allmänheten via publika länkar"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Tillåt offentlig uppladdning"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Tillåt användare att aktivera\nTillåt användare att göra det möjligt för andra att ladda upp till sina offentligt delade mappar"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Tillåt vidaredelning"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Tillåt användare att dela vidare filer som delats med dem"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Tillåt delning med alla"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillåt bara delning med användare i egna grupper"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Säkerhet"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Kräv HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Tvingar klienterna att ansluta till %s via en krypterad anslutning."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Anslut till din %s via HTTPS för att aktivera/deaktivera SSL"
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Nivå på loggning"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -471,6 +475,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "Använd denna adress för att <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">komma åt dina filer via WebDAV</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Inloggningsnamn"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 44eefd82f21..f29bad549d3 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -157,198 +157,185 @@ msgstr "Filter logga in användare"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Definierar filter att tillämpa vid inloggningsförsök. %% uid ersätter användarnamn i loginåtgärden."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "använd platshållare %%uid, t ex \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filter lista användare"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definierar filter att tillämpa vid listning av användare."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "utan platshållare, t.ex. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Gruppfilter"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definierar filter att tillämpa vid listning av grupper."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "utan platshållare, t.ex. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Uppkopplingsinställningar"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ifall denna är avbockad så kommer konfigurationen att skippas."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Säkerhetskopierings-värd (Replika)"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Ange en valfri värd för säkerhetskopiering. Den måste vara en replika av den huvudsakliga LDAP/AD-servern"
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Säkerhetskopierins-port (Replika)"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Inaktivera huvudserver"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr "Anslut endast till replikaservern."
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Använd TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Använd inte för LDAPS-anslutningar, det kommer inte att fungera."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-servern är okänslig för gemener och versaler (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Stäng av verifiering av SSL-certifikat."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Om anslutningen bara fungerar med detta alternativ, importera LDAP-serverns SSL-certifikat i din% s server."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Rekommenderas inte, använd bara för test. "
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Cache Time-To-Live"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "i sekunder. En förändring tömmer cache."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Mappinställningar"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Attribut för användarnamn"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr "LDAP-attributet som ska användas för att generera användarens visningsnamn."
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Bas för användare i katalogtjänst"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "En Användare start DN per rad"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Användarsökningsattribut"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Valfritt; ett attribut per rad"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Attribut för gruppnamn"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr "LDAP-attributet som ska användas för att generera gruppens visningsnamn."
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Bas för grupper i katalogtjänst"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "En Grupp start DN per rad"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Gruppsökningsattribut"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Attribut för gruppmedlemmar"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Specialattribut"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Kvotfält"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Datakvot standard"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "E-postfält"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Namnregel för hemkatalog"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "Internt Användarnamn"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -364,15 +351,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Som standard skapas det interna användarnamnet från UUID-attributet. Det säkerställer att användarnamnet är unikt och tecken inte behöver konverteras. Det interna användarnamnet har restriktionerna att endast följande tecken är tillåtna:  [ a-zA-Z0-9_.@- ]. Andra tecken blir ersatta av deras motsvarighet i ASCII eller utelämnas helt. En siffra kommer att läggas till eller ökas på vid en kollision. Det interna användarnamnet används för att identifiera användaren internt. Det är även förvalt som användarens användarnamn i ownCloud. Det är även en port för fjärråtkomst, t.ex. för alla *DAV-tjänster. Med denna inställning kan det förvalda beteendet åsidosättas. För att uppnå ett liknande beteende som innan ownCloud 5, ange attributet för användarens visningsnamn i detta fält. Lämna det tomt för förvalt beteende. Ändringarna kommer endast att påverka nyligen mappade (tillagda) LDAP-användare"
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "Internt Användarnamn Attribut:"
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "Åsidosätt UUID detektion"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -383,15 +370,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-attributet används för att utan tvivel identifiera LDAP-användare och grupper. Dessutom kommer interna användarnamn skapas baserat på detta UUID, om inte annat anges ovan. Du kan åsidosätta inställningen och passera ett attribut som du själv väljer. Du måste se till att attributet som du väljer kan hämtas för både användare och grupper och att det är unikt. Lämna det tomt för standard beteende. Förändringar kommer endast att påverka nyligen mappade (tillagda) LDAP-användare och grupper."
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "UUID Attribut:"
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "Användarnamn-LDAP User Mapping"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -405,18 +392,18 @@ msgid ""
 "experimental stage."
 msgstr "ownCloud använder sig av användarnamn för att lagra och tilldela (meta) data. För att exakt kunna identifiera och känna igen användare, kommer varje LDAP-användare ha ett internt användarnamn. Detta kräver en mappning från ownCloud-användarnamn till LDAP-användare. Det skapade användarnamnet mappas till UUID för LDAP-användaren. Dessutom cachas DN  samt minska LDAP-interaktionen, men den används inte för identifiering. Om DN förändras, kommer förändringarna hittas av ownCloud. Det interna ownCloud-namnet används överallt i ownCloud. Om du rensar/raderar mappningarna kommer att lämna referenser överallt i systemet. Men den är inte konfigurationskänslig, den påverkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljö. Utan gör detta endast på i testmiljö!"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Rensa Användarnamn-LDAP User Mapping"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Rensa Gruppnamn-LDAP Group Mapping"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Testa konfigurationen"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Hjälp"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 19567db98dd..e974dc0ec23 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -141,55 +141,55 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -197,23 +197,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index 80c9d290d84..66f0fff9e78 100644
--- a/l10n/sw_KE/files.po
+++ b/l10n/sw_KE/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr ""
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index ed7bf38925e..4071236d9c2 100644
--- a/l10n/sw_KE/lib.po
+++ b/l10n/sw_KE/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index 262dc578d1b..ebd60e3215e 100644
--- a/l10n/sw_KE/settings.po
+++ b/l10n/sw_KE/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index b340fa14d80..e51b2fcb6f1 100644
--- a/l10n/sw_KE/user_ldap.po
+++ b/l10n/sw_KE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index b39ec3ce71b..2ef228556c5 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -141,55 +141,55 @@ msgstr "மார்கழி"
 msgid "Settings"
 msgstr "அமைப்புகள்"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "செக்கன்களுக்கு முன்"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "இன்று"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "நேற்று"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "கடந்த மாதம்"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "மாதங்களுக்கு முன்"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "கடந்த வருடம்"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "வருடங்களுக்கு முன்"
 
@@ -197,23 +197,19 @@ msgstr "வருடங்களுக்கு முன்"
 msgid "Choose"
 msgstr "தெரிவுசெய்க "
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "இரத்து செய்க"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "ஆம்"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "இல்லை"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "சரி"
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "முந்தைய"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "அடுத்து"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index ef480f6d5f4..c724be39755 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது"
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL  வெறுமையாக இருக்கமுடியாது."
 
@@ -107,8 +107,8 @@ msgstr "URL  வெறுமையாக இருக்கமுடியாத
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "வழு"
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "பெயர்"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "அளவு"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "மாற்றப்பட்டது"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index f5ecc9d83d9..6f439f6a08f 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 7b29aad397e..f8f3518b983 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "செயலி இயலுமைப்படுத்தப்படவில்லை"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index a70525ca6c9..b0e1e81bc0d 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "சேமிக்கப்படுகிறது..."
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "_மொழி_பெயர்_"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "மேலதிக"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "குறைவான"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "மறைக்குறியீடு"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 12e9c3a0b1b..971037c4056 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "எந்த ஒதுக்கீடும் இல்லாமல், உதாரணம். \"objectClass=posixGroup\"."
-
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "துறை "
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "TLS ஐ பயன்படுத்தவும்"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "உணர்ச்சியான LDAP சேவையகம் (சாளரங்கள்)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "பரிந்துரைக்கப்படவில்லை, சோதனைக்காக மட்டும் பயன்படுத்தவும்."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "பயனாளர் காட்சிப்பெயர் புலம்"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "தள பயனாளர் மரம்"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "குழுவின் காட்சி பெயர் புலம் "
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "தள குழு மரம்"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "குழு உறுப்பினர் சங்கம்"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "bytes களில் "
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "உதவி"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 7cd1f3cd42e..97198eda635 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -141,55 +141,55 @@ msgstr "డిసెంబర్"
 msgid "Settings"
 msgstr "అమరికలు"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "క్షణాల క్రితం"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "ఈరోజు"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "నిన్న"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "పోయిన నెల"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "నెలల క్రితం"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "పోయిన సంవత్సరం"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "సంవత్సరాల క్రితం"
 
@@ -197,23 +197,19 @@ msgstr "సంవత్సరాల క్రితం"
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "రద్దుచేయి"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "అవును"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "కాదు"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "సరే"
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/te/files.po b/l10n/te/files.po
index 8f42d68cd80..b9310e4f508 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "పొరపాటు"
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "పేరు"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "పరిమాణం"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index ed3dcbca484..5094e97ebb3 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index 5a519c6cefb..ae043e953e5 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "మరిన్ని"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index bd0c8f48a74..ae1d36e9c59 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "సహాయం"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 4ad9a4187e0..4400ea2aa0f 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -198,23 +198,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -621,14 +617,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index cf40a67202c..7b6e8fb45bb 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,12 +95,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -108,8 +108,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr ""
 
@@ -185,35 +185,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index ef73dc79613..11db26b6ce7 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -60,18 +60,18 @@ msgid ""
 "files."
 msgstr ""
 
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now, "
 "the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 6fa16222813..fdf6f45f71d 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:448
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:451
+#: lib/config.php:457
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting "
 "of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:454
+#: lib/config.php:460
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 2e1bbd584b0..276ca9b375f 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 2836a306cde..c7ddd8db2e3 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index eb2c4eba9ce..e0045fe2000 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,6 +38,6 @@ msgstr ""
 msgid "No other versions available"
 msgstr ""
 
-#: js/versions.js:149
+#: js/versions.js:145
 msgid "Restore"
 msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index befa7cfebaf..feac1345df6 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 80d557594ec..43f4957beb8 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,105 +240,105 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -464,6 +468,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index e4a2c71a93a..d018b9ae41a 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -153,197 +153,184 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this "
+"option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It "
 "makes sure that the username is unique and characters do not need to be "
@@ -359,15 +346,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute "
 "is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -378,15 +365,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -400,18 +387,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 0c13a6a320b..c01c52791db 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index b3859255177..61826ac4db1 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -141,51 +141,51 @@ msgstr "ธันวาคม"
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "วินาที ก่อนหน้านี้"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "วันนี้"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "เมื่อวานนี้"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "เดือนที่แล้ว"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "เดือน ที่ผ่านมา"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "ปีที่แล้ว"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "ปี ที่ผ่านมา"
 
@@ -193,23 +193,19 @@ msgstr "ปี ที่ผ่านมา"
 msgid "Choose"
 msgstr "เลือก"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "ยกเลิก"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "ตกลง"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "ไม่ตกลง"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "ตกลง"
 
@@ -616,14 +612,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "ก่อนหน้า"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "ถัดไป"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 23054636f7a..00ad518a13b 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr "มีพื้นที่เหลือไม่เพียงพอ
 msgid "Upload cancelled."
 msgstr "การอัพโหลดถูกยกเลิก"
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL ไม่สามารถเว้นว่างได้"
 
@@ -107,8 +107,8 @@ msgstr "URL ไม่สามารถเว้นว่างได้"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
@@ -183,34 +183,40 @@ msgstr "พื้นที่จัดเก็บข้อมูลของค
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่"
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ชื่อโฟลเดอร์ไม่ถูกต้อง การใช้งาน 'แชร์' สงวนไว้สำหรับ Owncloud เท่านั้น"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "แก้ไขแล้ว"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 425f2d18d5c..ba9c49aba20 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index afaf5b524b6..c1f5a0bd746 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "ไม่สามารถกำหนดได้"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index f5076396447..88fecedbf1f 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr "เกิดข้อผิดพลาดในระหว่างก
 msgid "Updated"
 msgstr "อัพเดทแล้ว"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "กำลังบันทึกข้อมูล..."
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "ภาษาไทย"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "การแชร์ข้อมูล"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "เปิดใช้งาน API สำหรับคุณสมบัติแชร์ข้อมูล"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "อนุญาตให้ใช้งานลิงก์ได้"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ข้อมูลรายการต่างๆไปให้สาธารณะชนเป็นลิงก์ได้"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลรายการต่างๆที่ถูกแชร์มาให้ตัวผู้ใช้งานได้เท่านั้น"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลถึงใครก็ได้"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "ระดับการเก็บบันทึก log"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "มาก"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "น้อย"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "รุ่น"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "ชื่อที่ใช้สำหรับเข้าสู่ระบบ"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 4046e14dd9c..d1f63c56b87 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "ตัวกรองข้อมูลการเข้าสู่ร
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "กำหนดตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อมีความพยายามในการเข้าสู่ระบบ %%uid จะถูกนำไปแทนที่ชื่อผู้ใช้งานในการกระทำของการเข้าสู่ระบบ"
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\","
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "ตัวกรองข้อมูลกลุ่ม"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม"
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\","
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "ตั้งค่าการเชื่อมต่อ"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "พอร์ต"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "ปิดใช้งานเซิร์ฟเวอร์หลัก"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "ใช้ TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า"
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "ตั้งค่าไดเร็กทอรี่"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "รายการผู้ใช้งานหลักแบบ Tree"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "หนึ่ง User Base DN ต่อบรรทัด"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "คุณลักษณะการค้นหาชื่อผู้ใช้"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "ตัวเลือกเพิ่มเติม; หนึ่งคุณลักษณะต่อบรรทัด"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "ช่องแสดงชื่อกลุ่มที่ต้องการ"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "รายการกลุ่มหลักแบบ Tree"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "หนึ่ง Group Base DN ต่อบรรทัด"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "คุณลักษณะการค้นหาแบบกลุ่ม"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "ความสัมพันธ์ของสมาชิกในกลุ่ม"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "คุณลักษณะพิเศษ"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "ในหน่วยไบต์"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "ช่วยเหลือ"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 671988fe77e..2605b398b3f 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 10:20+0000\n"
-"Last-Translator: tridinebandim\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -199,23 +199,19 @@ msgstr "yıl önce"
 msgid "Choose"
 msgstr "seç"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "İptal"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "Seçici şablon dosya yüklemesinde hata"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Evet"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Hayır"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Tamam"
 
@@ -622,14 +618,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "Merhaba, <br><br> %s sizinle »%s« paylaşımında bulundu.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>İyi günler!"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "önceki"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "sonraki"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 8ef98d31c69..d7be2b4bff6 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -96,12 +96,12 @@ msgstr "Yeterli disk alanı yok"
 msgid "Upload cancelled."
 msgstr "Yükleme iptal edildi."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL boş olamaz."
 
@@ -109,8 +109,8 @@ msgstr "URL boş olamaz."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir."
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Hata"
 
@@ -186,35 +186,41 @@ msgstr "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkron
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir."
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "İsim"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Değiştirilme"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dizin"
 msgstr[1] "%n dizin"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n dosya"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 494628568cc..a2ea28b6b5e 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 1146ef5bfd1..bcc4af7bb56 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 10:30+0000\n"
-"Last-Translator: tridinebandim\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,10 +75,6 @@ msgid ""
 "administrator."
 msgstr "Dosyaları ayrı ayrı, küçük parçalar halinde indirin ya da yöneticinizden yardım isteyin. "
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "tespit edilemedi"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Uygulama etkinleştirilmedi"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 7521d03f553..60cc454946e 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 11:00+0000\n"
-"Last-Translator: tridinebandim\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -122,7 +122,11 @@ msgstr "Uygulama güncellenirken hata"
 msgid "Updated"
 msgstr "Güncellendi"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Kaydediliyor..."
 
@@ -167,7 +171,7 @@ msgstr "Kullanıcı oluşturulurken hata"
 msgid "A valid password must be provided"
 msgstr "Geçerli bir parola mutlaka sağlanmalı"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Türkçe"
 
@@ -238,106 +242,106 @@ msgstr "Bu sunucunun çalışan bir internet bağlantısı yok. Bu, harici depol
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Yüklenen her sayfa ile bir görev çalıştır"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "Http üzerinden dakikada bir çalıştırılmak üzere, cron.php bir webcron hizmetine kaydedildi."
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "cron.php dosyasını dakikada bir çağırmak için sistemin cron hizmetini kullan. "
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Paylaşım"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Paylaşım API'sini etkinleştir."
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Uygulamaların paylaşım API'sini kullanmasına izin ver"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Bağlantıları izin ver."
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Kullanıcıların nesneleri paylaşımı için herkese açık bağlantılara izin ver"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "Herkes tarafından yüklemeye izin ver"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Paylaşıma izin ver"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Kullanıcıların kendileri ile paylaşılan öğeleri yeniden paylaşmasına izin ver"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Kullanıcıların herşeyi paylaşmalarına izin ver"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Güvenlik"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "HTTPS bağlantısına zorla"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "İstemcileri %s a şifreli bir bağlantı ile bağlanmaya zorlar."
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen ,%s a HTTPS ile bağlanın."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Kayıtlar"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Günlük seviyesi"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Daha fazla"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Az"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Sürüm"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr " <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">Dosyalarınıza WebDAV üzerinen erişme </a> için  bu adresi kullanın"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Giriş Adı"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 71a2cad9ab6..b9254262c51 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -156,198 +156,185 @@ msgstr "Kullanıcı Oturum Filtresi"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Filter uyunlamak icin tayin ediyor, ne zaman girişmek isteminiz. % % uid adi kullanici girismeye karsi koymacak. "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Kullanıcı Liste Filtresi"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Filter uyunmak icin tayin ediyor, ne zaman adi  kullanici geri aliyor. "
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "bir yer tutucusu olmadan, örneğin \"objectClass=person\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Grup Süzgeci"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Filter uyunmak icin tayin ediyor, ne zaman grubalari tekrar aliyor. "
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "siz bir yer tutucu, mes. 'objectClass=posixGroup ('posixGrubu''. "
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Bağlantı ayarları"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ne zaman iptal, bu uynnlama isletici "
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Sigorta Kopya Cephe "
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Bir kopya cevre vermek, kopya sunucu onemli olmali. "
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Kopya Port "
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Ana sunucuyu devredışı birak"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "TLS kullan"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Bu LDAPS baglama icin kullamaminiz, basamacak. "
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Dusme sunucu LDAP zor degil. (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "SSL sertifika doğrulamasını kapat."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Önerilmez, sadece test için kullanın."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Cache Time-To-Live "
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Parametrar Listesin Adresinin "
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Temel Kullanıcı Ağacı"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Bir Temel Kullanici DN her dizgi "
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Kategorii Arama Kullanici "
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Grub Ekrane Alani Adi"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Temel Grup Ağacı"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Bir Grubu Tabani DN her dizgi. "
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Kategorii Arama Grubu"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Grup-Üye işbirliği"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "byte cinsinden"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Kullanıcı adı bölümünü boş bırakın (varsayılan). "
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -363,15 +350,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -382,15 +369,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -404,18 +391,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Yardım"
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 962ef65e3e6..0451be577d5 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -141,51 +141,51 @@ msgstr "كۆنەك"
 msgid "Settings"
 msgstr "تەڭشەكلەر"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "بۈگۈن"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "تۈنۈگۈن"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -193,23 +193,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "ۋاز كەچ"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "ھەئە"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "ياق"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "جەزملە"
 
@@ -475,7 +471,7 @@ msgstr ""
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "تۈر تەھرىر"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -616,14 +612,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index 9356e0fa389..10586fef152 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr "يېتەرلىك بوشلۇق يوق"
 msgid "Upload cancelled."
 msgstr "يۈكلەشتىن ۋاز كەچتى."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "خاتالىق"
 
@@ -183,34 +183,40 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "ئاتى"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "چوڭلۇقى"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "ئۆزگەرتكەن"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index 54a98b555d4..cf512bccd19 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index 657d41ba627..554072cebd9 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index 30a1f8a9f48..2dc8878719b 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى"
 msgid "Updated"
 msgstr "يېڭىلاندى"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "ساقلاۋاتىدۇ…"
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "ھەمبەھىر"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "بىخەتەرلىك"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "خاتىرە"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "خاتىرە دەرىجىسى"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "تېخىمۇ كۆپ"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "ئاز"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "نەشرى"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "شىفىرلاش"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "تىزىمغا كىرىش ئاتى"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index ded7b0cd7bf..fa2c51ddd26 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "ئىشلەتكۈچى تىزىمغا كىرىش سۈزگۈچى"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "ئىشلەتكۈچى تىزىم سۈزگۈچى"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "گۇرۇپپا سۈزگۈچ"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "باغلىنىش تەڭشىكى"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "سەپلىمە ئاكتىپ"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "ئېغىز"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "TLS ئىشلەت"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "ياردەم"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index e5cc3c9037d..ae0e108f162 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -141,59 +141,59 @@ msgstr "Грудень"
 msgid "Settings"
 msgstr "Налаштування"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "секунди тому"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "сьогодні"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "вчора"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "минулого місяця"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "місяці тому"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "минулого року"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "роки тому"
 
@@ -201,23 +201,19 @@ msgstr "роки тому"
 msgid "Choose"
 msgstr "Обрати"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Відмінити"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Так"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Ні"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Ok"
 
@@ -624,14 +620,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "попередній"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "наступний"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 7622ad56c5f..d348a772f94 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -95,12 +95,12 @@ msgstr "Місця більше немає"
 msgid "Upload cancelled."
 msgstr "Завантаження перервано."
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL не може бути пустим."
 
@@ -108,8 +108,8 @@ msgstr "URL не може бути пустим."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Помилка"
 
@@ -186,36 +186,42 @@ msgstr "Ваше сховище переповнене, файли більше
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше сховище майже повне ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Невірне ім'я теки. Використання \"Shared\" зарезервовано Owncloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Змінено"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index 4c747b05e0f..884b5932450 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index 7c870f656c1..ef7e00a8e4b 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "не може бути визначено"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Додаток не увімкнений"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 4daa482adfd..6380e01e2d0 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr "Помилка при оновленні програми"
 msgid "Updated"
 msgstr "Оновлено"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Зберігаю..."
 
@@ -165,7 +169,7 @@ msgstr "Помилка при створенні користувача"
 msgid "A valid password must be provided"
 msgstr "Потрібно задати вірний пароль"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Виконати одне завдання для кожної завантаженої сторінки "
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Спільний доступ"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Увімкнути API спільного доступу"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Дозволити програмам використовувати API спільного доступу"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Дозволити посилання"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Дозволити користувачам відкривати спільний доступ до елементів за допомогою посилань"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Дозволити перевідкривати спільний доступ"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Дозволити користувачам знову відкривати спільний доступ до елементів, які вже відкриті для доступу"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Дозволити користувачам відкривати спільний доступ для всіх"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "Безпека"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "Примусове застосування HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Протокол"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "Рівень протоколювання"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "Більше"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "Менше"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Версія"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Шифрування"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Ім'я Логіну"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 7b824bf2f9d..9f05e0918b7 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "Фільтр Користувачів, що під'єднуються"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Визначає фільтр, який застосовується при спробі входу. %%uid замінює ім'я користувача при вході."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Фільтр Списку Користувачів"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Визначає фільтр, який застосовується при отриманні користувачів"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "без будь-якого заповнювача, наприклад: \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Фільтр Груп"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Визначає фільтр, який застосовується при отриманні груп."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Налаштування З'єднання"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "Налаштування Активне"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Якщо \"галочка\" знята, ця конфігурація буде пропущена."
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "Сервер для резервних копій"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Вкажіть додатковий резервний сервер. Він повинен бути копією головного LDAP/AD сервера."
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Порт сервера для резервних копій"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Вимкнути Головний Сервер"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Використовуйте TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Не використовуйте це додатково для під'єднання до LDAP, бо виконано не буде."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Нечутливий до регістру LDAP сервер (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Вимкнути перевірку SSL сертифіката."
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Не рекомендується, використовуйте лише для тестів."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "Час актуальності Кеша"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "в секундах. Зміна очищує кеш."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Налаштування Каталога"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Поле, яке відображає Ім'я Користувача"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Основне Дерево Користувачів"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "Один Користувач Base DN на одній строчці"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "Пошукові Атрибути Користувача"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Додатково; один атрибут на строчку"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Поле, яке відображає Ім'я Групи"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Основне Дерево Груп"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "Одна Група Base DN на одній строчці"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Пошукові Атрибути Групи"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Асоціація Група-Член"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Спеціальні Атрибути"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "Поле Квоти"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "Квота за замовчанням"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "Поле Ел. пошти"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "Правило іменування домашньої теки користувача"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD."
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "Тестове налаштування"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Допомога"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index 4555d21ef8f..54407785c05 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -141,55 +141,55 @@ msgstr "دسمبر"
 msgid "Settings"
 msgstr "سیٹینگز"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr ""
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr ""
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -197,23 +197,19 @@ msgstr ""
 msgid "Choose"
 msgstr "منتخب کریں"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "منسوخ کریں"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "ہاں"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "نہیں"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "اوکے"
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "پچھلا"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "اگلا"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index 1a9ede9acc7..a8832be5ecc 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "ایرر"
 
@@ -184,35 +184,41 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index 4c170b1074a..89c294dd06e 100644
--- a/l10n/ur_PK/lib.po
+++ b/l10n/ur_PK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index 921b8e1edf3..d324d54bb06 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index fdfea6be1d5..085620de421 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "مدد"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index b8bfc91292b..9a6b412143e 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -142,51 +142,51 @@ msgstr "Tháng 12"
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "vài giây trước"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "hôm nay"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "hôm qua"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "tháng trước"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "tháng trước"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "năm trước"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "năm trước"
 
@@ -194,23 +194,19 @@ msgstr "năm trước"
 msgid "Choose"
 msgstr "Chọn"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Hủy"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Có"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "Không"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "Đồng ý"
 
@@ -617,14 +613,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "Lùi lại"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "Kế tiếp"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 819a857ea2e..2d6c28b2d58 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -95,12 +95,12 @@ msgstr "Không đủ chỗ trống cần thiết"
 msgid "Upload cancelled."
 msgstr "Hủy tải lên"
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này."
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL không được để trống."
 
@@ -108,8 +108,8 @@ msgstr "URL không được để trống."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "Lỗi"
 
@@ -184,34 +184,40 @@ msgstr "Your storage is full, files can not be updated or synced anymore!"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Your storage is almost full ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Your download is being prepared. This might take some time if the files are big."
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "Tên"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "Thay đổi"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 47ce6adaf75..9d990191532 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index e7c2745b8dd..9d03a4a361d 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "không thể phát hiện được"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Ứng dụng không được BẬT"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index e0da3b18616..e1945681e59 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr "Lỗi khi cập nhật ứng dụng"
 msgid "Updated"
 msgstr "Đã cập nhật"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "Đang lưu..."
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__Ngôn ngữ___"
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "Thực thi tác vụ mỗi khi trang được tải"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "Chia sẻ"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "Bật chia sẻ API"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "Cho phép các ứng dụng sử dụng chia sẻ API"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "Cho phép liên kết"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "Cho phép người dùng chia sẻ công khai các mục bằng các liên kết"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "Cho phép chia sẻ lại"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "Cho phép người dùng chia sẻ với bất cứ ai"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "hơn"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "ít"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "Phiên bản"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Mã hóa"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "Tên đăng nhập"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index abf722d3609..350cf0c3a2d 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "Lọc người dùng đăng nhập"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Xác định các bộ lọc để áp dụng, khi đăng nhập . uid%% thay thế tên người dùng trong các lần đăng nhập."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "use %%uid placeholder, e.g. \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lọc danh sách thành viên"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Xác định các bộ lọc để áp dụng, khi người dụng sử dụng."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "Bộ lọc nhóm"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Xác định các bộ lọc để áp dụng, khi nhóm sử dụng."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = osixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "Connection Settings"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "Cổng"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "Cổng sao lưu (Replica)"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "Tắt máy chủ chính"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "Sử dụng TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Do not use it additionally for LDAPS connections, it will fail."
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Trường hợp insensitve LDAP máy chủ (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "Tắt xác thực chứng nhận SSL"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Không khuyến khích, Chỉ sử dụng để thử nghiệm."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "trong vài giây. Một sự thay đổi bộ nhớ cache."
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "Directory Settings"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "Hiển thị tên người sử dụng"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Cây người dùng cơ bản"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "User Search Attributes"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "Optional; one attribute per line"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "Hiển thị tên nhóm"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Cây nhóm cơ bản"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "Group Search Attributes"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "Nhóm thành viên Cộng đồng"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "Special Attributes"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "Theo Byte"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD"
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "Giúp đỡ"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 8e8f62f373d..21e175e4ff6 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 10:20+0000\n"
-"Last-Translator: aivier <iaivier@126.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -197,23 +197,19 @@ msgstr "年前"
 msgid "Choose"
 msgstr "选择"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "取消"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "加载文件选取模板出错"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "是"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "否"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "好的"
 
@@ -620,14 +616,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "你好！<br><br>温馨提示： %s 与您共享了 %s 。<br><br>\n查看： %s <br><br> 祝顺利！"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "后退"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "前进"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 1426e0d68c7..b7c7892b60b 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -96,12 +96,12 @@ msgstr "容量不足"
 msgid "Upload cancelled."
 msgstr "上传取消了"
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传。关闭页面会取消上传。"
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "网址不能为空。"
 
@@ -109,8 +109,8 @@ msgstr "网址不能为空。"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "无效文件夹名。“Shared”已经被系统保留。"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "出错"
 
@@ -185,34 +185,40 @@ msgstr "容量已满，不能再同步/上传文件了！"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "你的空间快用满了 ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "正在下载，可能会花点时间，跟文件大小有关"
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "不正确文件夹名。Shared是保留名，不能使用。"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 个文件夹"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n 个文件"
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index e8248b6133e..72a289d0209 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 10:20+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: aivier <iaivier@126.com>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index a996e9d467c..d4a3f5836f4 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/zh_CN.GB2312/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-15 10:20+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "应用未启用"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index fe15fef6a99..a69fb19b320 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: Martin Liu <liuzh66@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -123,7 +123,11 @@ msgstr "应用升级时出现错误"
 msgid "Updated"
 msgstr "已升级"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "保存中..."
 
@@ -168,7 +172,7 @@ msgstr "新增用户时出现错误"
 msgid "A valid password must be provided"
 msgstr "请填写有效密码"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "Chinese"
 
@@ -239,106 +243,106 @@ msgstr "服务器没有可用的Internet连接。这意味着像挂载外部储
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "在每个页面载入时执行一项任务"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php 已作为 webcron 服务注册。owncloud 将通过 http 协议每分钟调用一次 cron.php。"
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "使用系统 cron 服务。通过系统 cronjob 每分钟调用一次 owncloud 文件夹下的 cron.php"
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "分享"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "开启分享API"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "允许应用使用分享API"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "允许链接"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "允许用户通过链接共享内容"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "允许公众账户上传"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "允许其它人向用户的公众共享文件夹里上传文件"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "允许转帖"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "允许用户再次共享已共享的内容"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "允许用户向任何人分享"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "只允许用户向所在群组中的其他用户分享"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "安全"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "强制HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "强制客户端通过加密连接与%s连接"
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "请通过HTTPS协议连接到 %s，需要启用或者禁止强制SSL的开关。"
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "日志等级"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "更少"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -468,6 +472,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "访问WebDAV请点击 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">此处</a>"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "登录名"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 004d02f98a0..291f44e4bcd 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "用户登录过滤器"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "定义尝试登录时要应用的过滤器。用 %%uid 替换登录操作中使用的用户名。"
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "使用 %%uid 占位符，例如 \"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "用户列表过滤器"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "定义撷取用户时要应用的过滤器。"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "不能使用占位符，例如 \"objectClass=person\"。"
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "群组过滤器"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "定义撷取群组时要应用的过滤器"
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "不能使用占位符，例如 \"objectClass=posixGroup\"。"
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "端口"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "使用 TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大小写不敏感的 LDAP 服务器 (Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "关闭 SSL 证书校验。"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "不推荐，仅供测试"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "以秒计。修改会清空缓存。"
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "用户显示名称字段"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "基本用户树"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "群组显示名称字段"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "基本群组树"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "群组-成员组合"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "以字节计"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "用户名请留空 (默认)。否则，请指定一个 LDAP/AD 属性。"
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "帮助"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index e77bfe2828e..c516d6a84d5 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -143,51 +143,51 @@ msgstr "十二月"
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n 分钟前"
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "上月"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "年前"
 
@@ -195,23 +195,19 @@ msgstr "年前"
 msgid "Choose"
 msgstr "选择(&C)..."
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "取消"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "加载文件选择器模板出错"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "是"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "否"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "好"
 
@@ -618,14 +614,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "您好，<br><br>%s 向您分享了 »%s«。<br><a href=\"%s\">查看</a>"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "上一页"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "下一页"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index db423a4fe41..f2c016bafb2 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -97,12 +97,12 @@ msgstr "没有足够可用空间"
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL不能为空"
 
@@ -110,8 +110,8 @@ msgstr "URL不能为空"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "错误"
 
@@ -186,37 +186,43 @@ msgstr "您的存储空间已满，文件将无法更新或同步！"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "您的存储空间即将用完 ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] ""
+msgstr[0] "%n 文件夹"
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
-msgstr[0] ""
+msgstr[0] "%n个文件"
 
 #: lib/app.php:73
 #, php-format
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 013eee53c4e..b526299a397 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# waterone <suiy02@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"Last-Translator: waterone <suiy02@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "用户名或密码错误！请重试"
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -31,27 +32,27 @@ msgstr "提交"
 
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "抱歉，此链接已失效"
 
 #: templates/part.404.php:4
 msgid "Reasons might be:"
-msgstr ""
+msgstr "可能原因是："
 
 #: templates/part.404.php:6
 msgid "the item was removed"
-msgstr ""
+msgstr "此项已移除"
 
 #: templates/part.404.php:7
 msgid "the link expired"
-msgstr ""
+msgstr "链接过期"
 
 #: templates/part.404.php:8
 msgid "sharing is disabled"
-msgstr ""
+msgstr "共享已禁用"
 
 #: templates/part.404.php:10
 msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "欲知详情，请联系发给你链接的人。"
 
 #: templates/public.php:15
 #, php-format
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 9be866b5f3e..3b1a2c82069 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# waterone <suiy02@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-16 16:20+0000\n"
+"Last-Translator: waterone <suiy02@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,16 +55,16 @@ msgstr "已删除"
 #: js/trash.js:191
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] ""
+msgstr[0] "%n 文件夹"
 
 #: js/trash.js:197
 msgid "%n file"
 msgid_plural "%n files"
-msgstr[0] ""
+msgstr[0] "%n个文件"
 
 #: lib/trash.php:819 lib/trash.php:821
 msgid "restored"
-msgstr ""
+msgstr "已恢复"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 79efb5ea2f0..3a6ed61af5f 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Charlie Mak <makchamhim72@gmail.com>, 2013
 # modokwang <modokwang@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +75,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "无法确定"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "应用程序未启用"
@@ -209,7 +206,7 @@ msgstr "秒前"
 #: template/functions.php:81
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n 分钟前"
 
 #: template/functions.php:82
 msgid "%n hour ago"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index d196a8a788f..6e9abe68c0e 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # m13253 <m13253@hotmail.com>, 2013
+# waterone <suiy02@gmail.com>, 2013
 # modokwang <modokwang@gmail.com>, 2013
 # zhangmin <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -123,7 +124,11 @@ msgstr "更新 app 时出错"
 msgid "Updated"
 msgstr "已更新"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "保存中"
 
@@ -168,7 +173,7 @@ msgstr "创建用户出错"
 msgid "A valid password must be provided"
 msgstr "必须提供合法的密码"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "简体中文"
 
@@ -183,7 +188,7 @@ msgid ""
 "configure your webserver in a way that the data directory is no longer "
 "accessible or you move the data directory outside the webserver document "
 "root."
-msgstr ""
+msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。"
 
 #: templates/admin.php:29
 msgid "Setup Warning"
@@ -198,7 +203,7 @@ msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "请认真检查<a href='%s'>安装指南</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
@@ -220,7 +225,7 @@ msgid ""
 "System locale can't be set to %s. This means that there might be problems "
 "with certain characters in file names. We strongly suggest to install the "
 "required packages on your system to support %s."
-msgstr ""
+msgstr "服务器无法设置系统本地化到%s. 这意味着可能文件名中有一些字符会引起问题. 我们强烈建议在你系统上安装所需的软件包来支持%s"
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
@@ -233,112 +238,112 @@ msgid ""
 "installation of 3rd party apps don´t work. Accessing files from remote and "
 "sending of notification emails might also not work. We suggest to enable "
 "internet connection for this server if you want to have all features."
-msgstr ""
+msgstr "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接."
 
 #: templates/admin.php:92
 msgid "Cron"
 msgstr "计划任务"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "每个页面加载后执行一个任务"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
-msgstr ""
+msgstr "cron.php已被注册到网络定时任务服务。通过http每分钟调用owncloud根目录的cron.php网页。"
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "使用系统定时任务服务。每分钟通过系统定时任务调用owncloud文件夹中的cron.php文件"
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "共享"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "启用共享API"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "允许应用软件使用共享API"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "允许链接"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "允许用户使用连接公开共享项目"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
-msgstr ""
+msgstr "允许公开上传"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "用户可让其他人上传到他的公开共享文件夹"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "允许再次共享"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "允许用户将共享给他们的项目再次共享"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "允许用户向任何人共享"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "允许用户只向同组用户共享"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "安全"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "强制使用 HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "强制客户端通过加密连接连接到%s。"
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
-msgstr ""
+msgstr "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL."
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "日志级别"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "更少"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +471,22 @@ msgstr "WebDAV"
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
+msgstr "使用该链接 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">通过WebDAV访问你的文件</a>"
+
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "加密"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
 msgstr ""
 
 #: templates/users.php:21
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 97f474b3166..f1052643431 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -155,198 +155,185 @@ msgstr "用户登录过滤"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "定义当尝试登录时的过滤器。 在登录过程中，%%uid将会被用户名替换"
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "使用 %%uid作为占位符，例如“uid=%%uid”"
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "用户列表过滤"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "定义拉取用户时的过滤器"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "没有任何占位符,如 \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "组过滤"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "定义拉取组信息时的过滤器"
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "无需占位符，例如\"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "连接设置"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "现行配置"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "当反选后，此配置将被忽略。"
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "端口"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "备份 (镜像) 主机"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "给出一个可选的备份主机。它必须为主 LDAP/AD 服务器的一个镜像。"
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "备份 (镜像) 端口"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "禁用主服务器"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "使用TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "对于 LDAPS 连接不要额外启用它，连接必然失败。"
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大小写敏感LDAP服务器(Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "关闭SSL证书验证"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "暂不推荐，仅供测试"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "缓存存活时间"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "以秒计。修改将清空缓存。"
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "目录设置"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "用户显示名称字段"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "基础用户树"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "每行一个用户基准判别名"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "用户搜索属性"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "可选;每行一个属性"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "组显示名称字段"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "基础组树"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "每行一个群组基准判别名"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "群组搜索属性"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "组成员关联"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "特殊属性"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "配额字段"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "默认配额"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "字节数"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "电邮字段"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "用户主目录命名规则"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "内部用户名"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr "内部用户名属性："
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr "超越UUID检测"
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr "UUID属性："
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr "用户名-LDAP用户映射"
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr "清除用户-LDAP用户映射"
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "清除组用户-LDAP级映射"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "测试配置"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "帮助"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 8c3d1f0833b..f91ec7caff1 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -141,51 +141,51 @@ msgstr "十二月"
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "前一月"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "個月之前"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr ""
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr ""
 
@@ -193,23 +193,19 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "取消"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "Yes"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "OK"
 
@@ -616,14 +612,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "前一步"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "下一步"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 5cfc4312593..ad3332276dd 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr ""
 
@@ -107,8 +107,8 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "錯誤"
 
@@ -183,34 +183,40 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index b0da2eac01a..1ab84440f23 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index f9da45cb7cf..037fcf13654 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -73,10 +73,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index ec3fc03477f..f42914d39a8 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr ""
 
@@ -165,7 +169,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr ""
 
@@ -236,106 +240,106 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr ""
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr ""
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index ab0370f6744..98bb4324137 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "連接埠"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "幫助"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 2014ec345c8..487c676ed04 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -143,51 +143,51 @@ msgstr "十二月"
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:815
+#: js/js.js:812
 msgid "seconds ago"
 msgstr "幾秒前"
 
-#: js/js.js:816
+#: js/js.js:813
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:817
+#: js/js.js:814
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:818
+#: js/js.js:815
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:819
+#: js/js.js:816
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:820
+#: js/js.js:817
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:821
+#: js/js.js:818
 msgid "last month"
 msgstr "上個月"
 
-#: js/js.js:822
+#: js/js.js:819
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:823
+#: js/js.js:820
 msgid "months ago"
 msgstr "幾個月前"
 
-#: js/js.js:824
+#: js/js.js:821
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:825
+#: js/js.js:822
 msgid "years ago"
 msgstr "幾年前"
 
@@ -195,23 +195,19 @@ msgstr "幾年前"
 msgid "Choose"
 msgstr "選擇"
 
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "取消"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
 msgid "Error loading file picker template"
 msgstr "載入檔案選擇器樣板發生錯誤"
 
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
 msgid "Yes"
 msgstr "是"
 
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
 msgid "No"
 msgstr "否"
 
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "好"
 
@@ -618,14 +614,6 @@ msgid ""
 "href=\"%s\">View it!</a><br><br>Cheers!"
 msgstr "嗨，<br><br>通知您，%s 與您分享了 %s ，<br><a href=\"%s\">看一下吧</a>"
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "上一頁"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "下一頁"
-
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index de86947869a..6bca4b0ddc8 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-16 01:29-0400\n"
-"PO-Revision-Date: 2013-08-16 05:29+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -95,12 +95,12 @@ msgstr "沒有足夠的可用空間"
 msgid "Upload cancelled."
 msgstr "上傳已取消"
 
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "檔案上傳中。離開此頁面將會取消上傳。"
 
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
 msgid "URL cannot be empty."
 msgstr "URL 不能為空白。"
 
@@ -108,8 +108,8 @@ msgstr "URL 不能為空白。"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留"
 
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
 msgid "Error"
 msgstr "錯誤"
 
@@ -184,34 +184,40 @@ msgstr "您的儲存空間已滿，沒有辦法再更新或是同步檔案！"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "您的儲存空間快要滿了 ({usedSpacePercent}%)"
 
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "正在準備您的下載，若您的檔案較大，將會需要更多時間。"
 
-#: js/files.js:344
+#: js/files.js:358
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留"
 
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:762
+#: js/files.js:778
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/files.js:768
+#: js/files.js:784
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 77a810102c4..6cf49409e59 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 9f99db8fe3c..51f5864b64c 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -74,10 +74,6 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "無法判斷"
-
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "應用程式未啟用"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 9e38838ff48..d58f0472f63 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:21+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -121,7 +121,11 @@ msgstr "更新應用程式錯誤"
 msgid "Updated"
 msgstr "已更新"
 
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
 msgid "Saving..."
 msgstr "儲存中..."
 
@@ -166,7 +170,7 @@ msgstr "建立用戶時出現錯誤"
 msgid "A valid password must be provided"
 msgstr "一定要提供一個有效的密碼"
 
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -237,106 +241,106 @@ msgstr "這臺 ownCloud 伺服器沒有連接到網際網路，因此有些功
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:101
+#: templates/admin.php:99
 msgid "Execute one task with each page loaded"
 msgstr "當頁面載入時，執行"
 
-#: templates/admin.php:111
+#: templates/admin.php:107
 msgid ""
 "cron.php is registered at a webcron service to call cron.php once a minute "
 "over http."
 msgstr "cron.php 已經註冊 webcron 服務，webcron 每分鐘會呼叫 cron.php 一次。"
 
-#: templates/admin.php:121
+#: templates/admin.php:115
 msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "使用系統的 cron 服務來呼叫 cron.php 每分鐘一次。"
 
-#: templates/admin.php:128
+#: templates/admin.php:120
 msgid "Sharing"
 msgstr "分享"
 
-#: templates/admin.php:134
+#: templates/admin.php:126
 msgid "Enable Share API"
 msgstr "啟用分享 API"
 
-#: templates/admin.php:135
+#: templates/admin.php:127
 msgid "Allow apps to use the Share API"
 msgstr "允許 apps 使用分享 API"
 
-#: templates/admin.php:142
+#: templates/admin.php:134
 msgid "Allow links"
 msgstr "允許連結"
 
-#: templates/admin.php:143
+#: templates/admin.php:135
 msgid "Allow users to share items to the public with links"
 msgstr "允許使用者以結連公開分享檔案"
 
-#: templates/admin.php:151
+#: templates/admin.php:143
 msgid "Allow public uploads"
 msgstr "允許任何人上傳"
 
-#: templates/admin.php:152
+#: templates/admin.php:144
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "允許使用者將他們公開分享的資料夾設定為「任何人皆可上傳」"
 
-#: templates/admin.php:160
+#: templates/admin.php:152
 msgid "Allow resharing"
 msgstr "允許轉貼分享"
 
-#: templates/admin.php:161
+#: templates/admin.php:153
 msgid "Allow users to share items shared with them again"
 msgstr "允許使用者分享其他使用者分享給他的檔案"
 
-#: templates/admin.php:168
+#: templates/admin.php:160
 msgid "Allow users to share with anyone"
 msgstr "允許使用者與任何人分享檔案"
 
-#: templates/admin.php:171
+#: templates/admin.php:163
 msgid "Allow users to only share with users in their groups"
 msgstr "僅允許使用者在群組內分享"
 
-#: templates/admin.php:178
+#: templates/admin.php:170
 msgid "Security"
 msgstr "安全性"
 
-#: templates/admin.php:191
+#: templates/admin.php:183
 msgid "Enforce HTTPS"
 msgstr "強制啟用 HTTPS"
 
-#: templates/admin.php:193
+#: templates/admin.php:185
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "強迫用戶端使用加密連線連接到 %s"
 
-#: templates/admin.php:199
+#: templates/admin.php:191
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "請使用 HTTPS 連線到 %s 以啓用或停用強制 SSL 加密。"
 
-#: templates/admin.php:211
+#: templates/admin.php:203
 msgid "Log"
 msgstr "紀錄"
 
-#: templates/admin.php:212
+#: templates/admin.php:204
 msgid "Log level"
 msgstr "紀錄層級"
 
-#: templates/admin.php:243
+#: templates/admin.php:235
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:244
+#: templates/admin.php:236
 msgid "Less"
 msgstr "更少"
 
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
 "target=\"_blank\">access your Files via WebDAV</a>"
 msgstr "使用<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">這個網址</a>來透過 WebDAV 存取您的檔案"
 
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "加密"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
 #: templates/users.php:21
 msgid "Login Name"
 msgstr "登入名稱"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 27102dc70b3..c8e59df49f4 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -155,198 +155,185 @@ msgstr "使用者登入過濾器"
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "試圖登入時會定義要套用的篩選器。登入過程中%%uid會取代使用者名稱。"
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
 
 #: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "請使用 %%uid placeholder，例如:\"uid=%%uid\""
-
-#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "使用者名單篩選器"
 
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "檢索使用者時定義要套用的篩選器"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "請勿使用任何placeholder，例如:\"objectClass=person\"。"
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:59
 msgid "Group Filter"
 msgstr "群組篩選器"
 
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "檢索群組時，定義要套用的篩選器"
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "請勿使用任何placeholder，例如:\"objectClass=posixGroup\"。"
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:66
 msgid "Connection Settings"
 msgstr "連線設定"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "Configuration Active"
 msgstr "設定為主動模式"
 
-#: templates/settings.php:71
+#: templates/settings.php:68
 msgid "When unchecked, this configuration will be skipped."
 msgstr "沒有被勾選時，此設定會被略過。"
 
-#: templates/settings.php:72
+#: templates/settings.php:69
 msgid "Port"
 msgstr "連接阜"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid "Backup (Replica) Host"
 msgstr "備用主機"
 
-#: templates/settings.php:73
+#: templates/settings.php:70
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "請給定一個可選的備用主機。必須是LDAP/AD中央伺服器的複本。"
 
-#: templates/settings.php:74
+#: templates/settings.php:71
 msgid "Backup (Replica) Port"
 msgstr "備用(複本)連接阜"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Disable Main Server"
 msgstr "停用主伺服器"
 
-#: templates/settings.php:75
+#: templates/settings.php:72
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Use TLS"
 msgstr "使用TLS"
 
-#: templates/settings.php:76
+#: templates/settings.php:73
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:74
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "不區分大小寫的LDAP伺服器(Windows)"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 msgid "Turn off SSL certificate validation."
 msgstr "關閉 SSL 憑證驗證"
 
-#: templates/settings.php:78
+#: templates/settings.php:75
 #, php-format
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "不推薦使用，僅供測試用途。"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "Cache Time-To-Live"
 msgstr "快取的存活時間"
 
-#: templates/settings.php:79
+#: templates/settings.php:76
 msgid "in seconds. A change empties the cache."
 msgstr "以秒為單位。更變後會清空快取。"
 
-#: templates/settings.php:81
+#: templates/settings.php:78
 msgid "Directory Settings"
 msgstr "目錄選項"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "User Display Name Field"
 msgstr "使用者名稱欄位"
 
-#: templates/settings.php:83
+#: templates/settings.php:80
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "Base User Tree"
 msgstr "Base使用者數"
 
-#: templates/settings.php:84
+#: templates/settings.php:81
 msgid "One User Base DN per line"
 msgstr "一行一個使用者Base DN"
 
-#: templates/settings.php:85
+#: templates/settings.php:82
 msgid "User Search Attributes"
 msgstr "使用者搜索屬性"
 
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
 msgid "Optional; one attribute per line"
 msgstr "可選的; 一行一項屬性"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "Group Display Name Field"
 msgstr "群組顯示名稱欄位"
 
-#: templates/settings.php:86
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "Base Group Tree"
 msgstr "Base群組樹"
 
-#: templates/settings.php:87
+#: templates/settings.php:84
 msgid "One Group Base DN per line"
 msgstr "一行一個群組Base DN"
 
-#: templates/settings.php:88
+#: templates/settings.php:85
 msgid "Group Search Attributes"
 msgstr "群組搜索屬性"
 
-#: templates/settings.php:89
+#: templates/settings.php:86
 msgid "Group-Member association"
 msgstr "群組成員的關係"
 
-#: templates/settings.php:91
+#: templates/settings.php:88
 msgid "Special Attributes"
 msgstr "特殊屬性"
 
-#: templates/settings.php:93
+#: templates/settings.php:90
 msgid "Quota Field"
 msgstr "配額欄位"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "Quota Default"
 msgstr "預設配額"
 
-#: templates/settings.php:94
+#: templates/settings.php:91
 msgid "in bytes"
 msgstr "以位元組為單位"
 
-#: templates/settings.php:95
+#: templates/settings.php:92
 msgid "Email Field"
 msgstr "電郵欄位"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid "User Home Folder Naming Rule"
 msgstr "使用者家目錄的命名規則"
 
-#: templates/settings.php:96
+#: templates/settings.php:93
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "使用者名稱請留白(預設)。若不留白請指定一個LDAP/AD屬性。"
 
-#: templates/settings.php:101
+#: templates/settings.php:98
 msgid "Internal Username"
 msgstr "內部使用者名稱"
 
-#: templates/settings.php:102
+#: templates/settings.php:99
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:100
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:101
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:102
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:106
+#: templates/settings.php:103
 msgid "UUID Attribute:"
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:104
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:108
+#: templates/settings.php:105
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:109
+#: templates/settings.php:106
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Test Configuration"
 msgstr "測試此設定"
 
-#: templates/settings.php:111
+#: templates/settings.php:108
 msgid "Help"
 msgstr "說明"
diff --git a/l10n/zh_TW/user_webdavauth.po b/l10n/zh_TW/user_webdavauth.po
index 2e684f4150b..88132e1361f 100644
--- a/l10n/zh_TW/user_webdavauth.po
+++ b/l10n/zh_TW/user_webdavauth.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Hydriz <admin@alphacorp.tk>, 2013
+# chenanyeh <chnjsn1221@gmail.com>, 2013
 # Hydriz <admin@alphacorp.tk>, 2013
 # pellaeon <nfsmwlin@gmail.com>, 2013
 # sofiasu <sofia168@livemail.tw>, 2012
@@ -11,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-17 09:30+0000\n"
+"Last-Translator: chenanyeh <chnjsn1221@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,11 +28,11 @@ msgstr "WebDAV 認證"
 
 #: templates/settings.php:4
 msgid "Address: "
-msgstr ""
+msgstr "為址"
 
 #: templates/settings.php:7
 msgid ""
 "The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr ""
+msgstr "使用者憑證將會被傳送到此位址。此外掛程式將會檢查回應，HTTP statuscodes 401與403將會被理解為無效憑證，而所有其他的回應將會被理解為有效憑證。"
diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php
index 2e95f28841e..f626dcdfda6 100644
--- a/lib/l10n/ar.php
+++ b/lib/l10n/ar.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "الملفات بحاجة الى ان يتم تحميلها واحد تلو الاخر",
 "Back to Files" => "العودة الى الملفات",
 "Selected files too large to generate zip file." => "الملفات المحددة كبيرة جدا ليتم ضغطها في ملف zip",
-"couldn't be determined" => "تعذّر تحديده",
 "Application is not enabled" => "التطبيق غير مفعّل",
 "Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
 "Token expired. Please reload page." => "انتهت صلاحية الكلمة , يرجى اعادة تحميل الصفحة",
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
index 10d3bb610af..b6cc949eb8a 100644
--- a/lib/l10n/bg_BG.php
+++ b/lib/l10n/bg_BG.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "Файловете трябва да се изтеглят един по един.",
 "Back to Files" => "Назад към файловете",
 "Selected files too large to generate zip file." => "Избраните файлове са прекалено големи за генерирането на ZIP архив.",
-"couldn't be determined" => "не може да се определи",
 "Application is not enabled" => "Приложението не е включено.",
 "Authentication error" => "Възникна проблем с идентификацията",
 "Token expired. Please reload page." => "Ключът е изтекъл, моля презаредете страницата",
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index 95faed498cd..67ccdabc636 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Torna a Fitxers",
 "Selected files too large to generate zip file." => "Els fitxers seleccionats son massa grans per generar un fitxer zip.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Baixeu els fitxers en trossos petits, de forma separada, o pregunteu a l'administrador.",
-"couldn't be determined" => "no s'ha pogut determinar",
 "Application is not enabled" => "L'aplicació no està habilitada",
 "Authentication error" => "Error d'autenticació",
 "Token expired. Please reload page." => "El testimoni ha expirat. Torneu a carregar la pàgina.",
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index ec54376024d..1a80fc78bb6 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Zpět k souborům",
 "Selected files too large to generate zip file." => "Vybrané soubory jsou příliš velké pro vytvoření ZIP souboru.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Stáhněte soubory po menších částech, samostatně, nebo se obraťte na správce.",
-"couldn't be determined" => "nelze zjistit",
 "Application is not enabled" => "Aplikace není povolena",
 "Authentication error" => "Chyba ověření",
 "Token expired. Please reload page." => "Token vypršel. Obnovte prosím stránku.",
@@ -41,13 +40,13 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server není správně nastaven pro umožnění synchronizace, rozhraní WebDAV se zdá být rozbité.",
 "Please double check the <a href='%s'>installation guides</a>." => "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
 "seconds ago" => "před pár sekundami",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n minute ago_::_%n minutes ago_" => array("před %n minutou","před %n minutami","před %n minutami"),
+"_%n hour ago_::_%n hours ago_" => array("před %n hodinou","před %n hodinami","před %n hodinami"),
 "today" => "dnes",
 "yesterday" => "včera",
-"_%n day go_::_%n days ago_" => array("","",""),
+"_%n day go_::_%n days ago_" => array("před %n dnem","před %n dny","před %n dny"),
 "last month" => "minulý měsíc",
-"_%n month ago_::_%n months ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("před %n měsícem","před %n měsíci","před %n měsíci"),
 "last year" => "minulý rok",
 "years ago" => "před lety",
 "Caused by:" => "Příčina:",
diff --git a/lib/l10n/cy_GB.php b/lib/l10n/cy_GB.php
index 649a1ebffac..6973b51878f 100644
--- a/lib/l10n/cy_GB.php
+++ b/lib/l10n/cy_GB.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "Mae angen llwytho ffeiliau i lawr fesul un.",
 "Back to Files" => "Nôl i Ffeiliau",
 "Selected files too large to generate zip file." => "Mae'r ffeiliau ddewiswyd yn rhy fawr i gynhyrchu ffeil zip.",
-"couldn't be determined" => "methwyd pennu",
 "Application is not enabled" => "Nid yw'r pecyn wedi'i alluogi",
 "Authentication error" => "Gwall dilysu",
 "Token expired. Please reload page." => "Tocyn wedi dod i ben. Ail-lwythwch y dudalen.",
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index cbf6b16debb..78859b08745 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Tilbage til Filer",
 "Selected files too large to generate zip file." => "De markerede filer er for store til at generere en ZIP-fil.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download filerne i små bider, seperat, eller kontakt venligst din administrator.",
-"couldn't be determined" => "kunne ikke fastslås",
 "Application is not enabled" => "Programmet er ikke aktiveret",
 "Authentication error" => "Adgangsfejl",
 "Token expired. Please reload page." => "Adgang er udløbet. Genindlæs siden.",
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 798322fdb47..01fe5ee0583 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Zurück zu \"Dateien\"",
 "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Lade die Dateien in kleineren, separaten, Stücken herunter oder bitte deinen Administrator.",
-"couldn't be determined" => "konnte nicht festgestellt werden",
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Fehler bei der Anmeldung",
 "Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.",
diff --git a/lib/l10n/de_CH.php b/lib/l10n/de_CH.php
index d99c144f185..188ea4e2fc0 100644
--- a/lib/l10n/de_CH.php
+++ b/lib/l10n/de_CH.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Zurück zu \"Dateien\"",
 "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu gross, um eine ZIP-Datei zu erstellen.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bitten Sie Ihren Administrator.",
-"couldn't be determined" => "konnte nicht ermittelt werden",
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 698a36bd780..9fd319b7e1b 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Zurück zu \"Dateien\"",
 "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bitten Sie Ihren Administrator.",
-"couldn't be determined" => "konnte nicht ermittelt werden",
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.",
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 0fbd134ae92..dcbf82d4a4b 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Πίσω στα Αρχεία",
 "Selected files too large to generate zip file." => "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Λήψη των αρχείων σε μικρότερα κομμάτια, χωριστά ή ρωτήστε τον διαχειριστή σας.",
-"couldn't be determined" => "δεν μπορούσε να προσδιορισθεί",
 "Application is not enabled" => "Δεν ενεργοποιήθηκε η εφαρμογή",
 "Authentication error" => "Σφάλμα πιστοποίησης",
 "Token expired. Please reload page." => "Το αναγνωριστικό έληξε. Παρακαλώ φορτώστε ξανά την σελίδα.",
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index 2029c9b17fe..14bbf6f6a13 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Volver a Archivos",
 "Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargue los archivos en trozos más pequeños, por separado o solicítelos amablemente su administrador.",
-"couldn't be determined" => "no pudo ser determinado",
 "Application is not enabled" => "La aplicación no está habilitada",
 "Authentication error" => "Error de autenticación",
 "Token expired. Please reload page." => "Token expirado. Por favor, recarga la página.",
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index 0632c754052..26f1e4ecd5e 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Volver a Archivos",
 "Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargá los archivos en partes más chicas, de forma separada, o pedíselos al administrador",
-"couldn't be determined" => "no se pudo determinar",
 "Application is not enabled" => "La aplicación no está habilitada",
 "Authentication error" => "Error al autenticar",
 "Token expired. Please reload page." => "Token expirado. Por favor, recargá la página.",
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index a7d823a62c1..912ef37a935 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Tagasi failide juurde",
 "Selected files too large to generate zip file." => "Valitud failid on ZIP-faili loomiseks liiga suured.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laadi failid alla eraldi väiksemate osadena või küsi nõu oma süsteemiadminstraatorilt.",
-"couldn't be determined" => "ei suudetud tuvastada",
 "Application is not enabled" => "Rakendus pole sisse lülitatud",
 "Authentication error" => "Autentimise viga",
 "Token expired. Please reload page." => "Kontrollkood aegus. Paelun lae leht uuesti.",
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index c5ce243f2fa..8f967314f4b 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Itzuli fitxategietara",
 "Selected files too large to generate zip file." => "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Deskargatu fitzategiak zati txikiagoetan, banan-banan edo eskatu mesedez zure administradoreari",
-"couldn't be determined" => "ezin izan da zehaztu",
 "Application is not enabled" => "Aplikazioa ez dago gaituta",
 "Authentication error" => "Autentifikazio errorea",
 "Token expired. Please reload page." => "Tokena iraungitu da. Mesedez birkargatu orria.",
diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php
index e2d8ed50aa3..e9cb695bade 100644
--- a/lib/l10n/fa.php
+++ b/lib/l10n/fa.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "فایل ها باید به صورت یکی یکی دانلود شوند",
 "Back to Files" => "بازگشت به فایل ها",
 "Selected files too large to generate zip file." => "فایل های انتخاب شده بزرگتر از آن هستند که بتوان یک فایل فشرده تولید کرد",
-"couldn't be determined" => "نمیتواند مشخص شود",
 "Application is not enabled" => "برنامه فعال نشده است",
 "Authentication error" => "خطا در اعتبار سنجی",
 "Token expired. Please reload page." => "رمز منقضی شده است. لطفا دوباره صفحه را بارگذاری نمایید.",
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index dccb1753042..4552d4627c0 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "Tiedostot on ladattava yksittäin.",
 "Back to Files" => "Takaisin tiedostoihin",
 "Selected files too large to generate zip file." => "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon.",
-"couldn't be determined" => "ei voitu määrittää",
 "Application is not enabled" => "Sovellusta ei ole otettu käyttöön",
 "Authentication error" => "Tunnistautumisvirhe",
 "Token expired. Please reload page." => "Valtuutus vanheni. Lataa sivu uudelleen.",
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index 0a040bb9e8e..cfcca28d5f8 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "Les fichiers nécessitent d'être téléchargés un par un.",
 "Back to Files" => "Retour aux Fichiers",
 "Selected files too large to generate zip file." => "Les fichiers sélectionnés sont trop volumineux pour être compressés.",
-"couldn't be determined" => "impossible à déterminer",
 "Application is not enabled" => "L'application n'est pas activée",
 "Authentication error" => "Erreur d'authentification",
 "Token expired. Please reload page." => "La session a expiré. Veuillez recharger la page.",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index f105578ace2..4d92e89ebba 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Volver aos ficheiros",
 "Selected files too large to generate zip file." => "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargue os ficheiros en cachos máis pequenos e por separado, ou pídallos amabelmente ao seu administrador.",
-"couldn't be determined" => "non foi posíbel determinalo",
 "Application is not enabled" => "O aplicativo non está activado",
 "Authentication error" => "Produciuse un erro de autenticación",
 "Token expired. Please reload page." => "Testemuña caducada. Recargue a páxina.",
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index c8aff3add72..7ec7621a655 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Vissza a Fájlokhoz",
 "Selected files too large to generate zip file." => "A kiválasztott fájlok túl nagyok a zip tömörítéshez.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Tölts le a fileokat kisebb chunkokban, kölün vagy kérj segitséget a rendszergazdádtól.",
-"couldn't be determined" => "nem határozható meg",
 "Application is not enabled" => "Az alkalmazás nincs engedélyezve",
 "Authentication error" => "Azonosítási hiba",
 "Token expired. Please reload page." => "A token lejárt. Frissítse az oldalt.",
diff --git a/lib/l10n/id.php b/lib/l10n/id.php
index eaec65516b8..080faddb321 100644
--- a/lib/l10n/id.php
+++ b/lib/l10n/id.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "Berkas harus diunduh satu persatu.",
 "Back to Files" => "Kembali ke Daftar Berkas",
 "Selected files too large to generate zip file." => "Berkas yang dipilih terlalu besar untuk dibuat berkas zip-nya.",
-"couldn't be determined" => "tidak dapat ditentukan",
 "Application is not enabled" => "Aplikasi tidak diaktifkan",
 "Authentication error" => "Galat saat autentikasi",
 "Token expired. Please reload page." => "Token kedaluwarsa. Silakan muat ulang halaman.",
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index c29ab4833e3..e734fbdbb9b 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Torna ai file",
 "Selected files too large to generate zip file." => "I  file selezionati sono troppo grandi per generare un file zip.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Scarica i file in blocchi più piccoli, separatamente o chiedi al tuo amministratore.",
-"couldn't be determined" => "non può essere determinato",
 "Application is not enabled" => "L'applicazione  non è abilitata",
 "Authentication error" => "Errore di autenticazione",
 "Token expired. Please reload page." => "Token scaduto. Ricarica la pagina.",
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 482806d4946..902170524b9 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "ファイルに戻る",
 "Selected files too large to generate zip file." => "選択したファイルはZIPファイルの生成には大きすぎます。",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "ファイルは、小さいファイルに分割されてダウンロードされます。もしくは、管理者にお尋ねください。",
-"couldn't be determined" => "測定できませんでした",
 "Application is not enabled" => "アプリケーションは無効です",
 "Authentication error" => "認証エラー",
 "Token expired. Please reload page." => "トークンが無効になりました。ページを再読込してください。",
@@ -41,13 +40,13 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。",
 "Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよく確認してください。",
 "seconds ago" => "数秒前",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n 分前"),
+"_%n hour ago_::_%n hours ago_" => array("%n 時間後"),
 "today" => "今日",
 "yesterday" => "昨日",
-"_%n day go_::_%n days ago_" => array(""),
+"_%n day go_::_%n days ago_" => array("%n 日後"),
 "last month" => "一月前",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n カ月後"),
 "last year" => "一年前",
 "years ago" => "年前",
 "Caused by:" => "原因は以下:",
diff --git a/lib/l10n/ka_GE.php b/lib/l10n/ka_GE.php
index 3cb55277d6c..8fbe34e6786 100644
--- a/lib/l10n/ka_GE.php
+++ b/lib/l10n/ka_GE.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "ფაილები უნდა გადმოიტვირთოს სათითაოდ.",
 "Back to Files" => "უკან ფაილებში",
 "Selected files too large to generate zip file." => "არჩეული ფაილები ძალიან დიდია zip ფაილის გენერაციისთვის.",
-"couldn't be determined" => "ვერ განისაზღვრა",
 "Application is not enabled" => "აპლიკაცია არ არის აქტიური",
 "Authentication error" => "ავთენტიფიკაციის შეცდომა",
 "Token expired. Please reload page." => "Token–ს ვადა გაუვიდა. გთხოვთ განაახლოთ გვერდი.",
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index 824882c984d..4dab8b816bf 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "파일을 개별적으로 다운로드해야 합니다.",
 "Back to Files" => "파일로 돌아가기",
 "Selected files too large to generate zip file." => "선택한 파일들은 ZIP 파일을 생성하기에 너무 큽니다.",
-"couldn't be determined" => "결정할 수 없음",
 "Application is not enabled" => "앱이 활성화되지 않았습니다",
 "Authentication error" => "인증 오류",
 "Token expired. Please reload page." => "토큰이 만료되었습니다. 페이지를 새로 고치십시오.",
diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php
index 2a2daee8d89..4090a36edcc 100644
--- a/lib/l10n/lv.php
+++ b/lib/l10n/lv.php
@@ -5,12 +5,14 @@ $TRANSLATIONS = array(
 "Settings" => "Iestatījumi",
 "Users" => "Lietotāji",
 "Admin" => "Administratori",
+"Failed to upgrade \"%s\"." => "Kļūda atjauninot \"%s\"",
 "web services under your control" => "tīmekļa servisi tavā varā",
+"cannot open \"%s\"" => "Nevar atvērt \"%s\"",
 "ZIP download is turned off." => "ZIP lejupielādēšana ir izslēgta.",
 "Files need to be downloaded one by one." => "Datnes var lejupielādēt tikai katru atsevišķi.",
 "Back to Files" => "Atpakaļ pie datnēm",
 "Selected files too large to generate zip file." => "Izvēlētās datnes ir pārāk lielas, lai izveidotu zip datni.",
-"couldn't be determined" => "nevarēja noteikt",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Lejupielādējiet savus failus mazākās daļās, atsevišķi vai palūdziet tos administratoram.",
 "Application is not enabled" => "Lietotne nav aktivēta",
 "Authentication error" => "Autentifikācijas kļūda",
 "Token expired. Please reload page." => "Pilnvarai ir beidzies termiņš. Lūdzu, pārlādējiet lapu.",
@@ -29,6 +31,7 @@ $TRANSLATIONS = array(
 "Drop this user from MySQL" => "Izmest šo lietotāju no MySQL",
 "MySQL user '%s'@'%%' already exists" => "MySQL lietotājs '%s'@'%%' jau eksistē",
 "Drop this user from MySQL." => "Izmest šo lietotāju no MySQL.",
+"Oracle connection could not be established" => "Nevar izveidot savienojumu ar Oracle",
 "Oracle username and/or password not valid" => "Nav derīga Oracle parole un/vai lietotājvārds",
 "Offending command was: \"%s\", name: %s, password: %s" => "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s",
 "PostgreSQL username and/or password not valid" => "Nav derīga PostgreSQL parole un/vai lietotājvārds",
@@ -37,15 +40,16 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
 "Please double check the <a href='%s'>installation guides</a>." => "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>.",
 "seconds ago" => "sekundes atpakaļ",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n minute ago_::_%n minutes ago_" => array("","","Pirms %n minūtēm"),
+"_%n hour ago_::_%n hours ago_" => array("","","Pirms %n stundām"),
 "today" => "šodien",
 "yesterday" => "vakar",
-"_%n day go_::_%n days ago_" => array("","",""),
+"_%n day go_::_%n days ago_" => array("","","Pirms %n dienām"),
 "last month" => "pagājušajā mēnesī",
-"_%n month ago_::_%n months ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("","","Pirms %n mēnešiem"),
 "last year" => "gājušajā gadā",
 "years ago" => "gadus atpakaļ",
+"Caused by:" => "Cēlonis:",
 "Could not find category \"%s\"" => "Nevarēja atrast kategoriju “%s”"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/lib/l10n/my_MM.php b/lib/l10n/my_MM.php
index b2e9ca18139..5f4b6ddc820 100644
--- a/lib/l10n/my_MM.php
+++ b/lib/l10n/my_MM.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "ဖိုင်များသည် တစ်ခုပြီး တစ်ခုဒေါင်းလုတ်ချရန်လိုအပ်သည်",
 "Back to Files" => "ဖိုင်သို့ပြန်သွားမည်",
 "Selected files too large to generate zip file." => "zip ဖိုင်အဖြစ်ပြုလုပ်ရန် ရွေးချယ်ထားသောဖိုင်များသည် အရမ်းကြီးလွန်းသည်",
-"couldn't be determined" => "မဆုံးဖြတ်နိုင်ပါ။",
 "Authentication error" => "ခွင့်ပြုချက်မအောင်မြင်",
 "Files" => "ဖိုင်များ",
 "Text" => "စာသား",
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index 2d737bd5ebd..338c3673c5b 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Terug naar bestanden",
 "Selected files too large to generate zip file." => "De geselecteerde bestanden zijn te groot om een zip bestand te maken.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download de bestanden in kleinere brokken, appart of vraag uw administrator.",
-"couldn't be determined" => "kon niet worden vastgesteld",
 "Application is not enabled" => "De applicatie is niet actief",
 "Authentication error" => "Authenticatie fout",
 "Token expired. Please reload page." => "Token verlopen.  Herlaad de pagina.",
@@ -41,13 +40,13 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
 "Please double check the <a href='%s'>installation guides</a>." => "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
 "seconds ago" => "seconden geleden",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minuut geleden","%n minuten geleden"),
+"_%n hour ago_::_%n hours ago_" => array("%n uur geleden","%n uur geleden"),
 "today" => "vandaag",
 "yesterday" => "gisteren",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("%n dag terug","%n dagen geleden"),
 "last month" => "vorige maand",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n maand geleden","%n maanden geleden"),
 "last year" => "vorig jaar",
 "years ago" => "jaar geleden",
 "Caused by:" => "Gekomen door:",
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 1740676080e..984043aa0be 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Wróć do plików",
 "Selected files too large to generate zip file." => "Wybrane pliki są zbyt duże, aby wygenerować plik zip.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Pobierz pliki w mniejszy kawałkach, oddzielnie lub poproś administratora o zwiększenie limitu.",
-"couldn't be determined" => "nie może zostać znaleziony",
 "Application is not enabled" => "Aplikacja nie jest włączona",
 "Authentication error" => "Błąd uwierzytelniania",
 "Token expired. Please reload page." => "Token wygasł. Proszę ponownie załadować stronę.",
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 4ebf587cf86..52329667174 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Voltar para Arquivos",
 "Selected files too large to generate zip file." => "Arquivos selecionados são muito grandes para gerar arquivo zip.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Baixe os arquivos em pedaços menores, separadamente ou solicite educadamente  ao seu administrador.",
-"couldn't be determined" => "não pôde ser determinado",
 "Application is not enabled" => "Aplicação não está habilitada",
 "Authentication error" => "Erro de autenticação",
 "Token expired. Please reload page." => "Token expirou. Por favor recarregue a página.",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index 3131499e130..c8a2f78cbf5 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Voltar a Ficheiros",
 "Selected files too large to generate zip file." => "Os ficheiros seleccionados são grandes demais para gerar um ficheiro zip.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descarregue os ficheiros em partes menores, separados ou peça gentilmente ao seu administrador.",
-"couldn't be determined" => "Não foi possível determinar",
 "Application is not enabled" => "A aplicação não está activada",
 "Authentication error" => "Erro na autenticação",
 "Token expired. Please reload page." => "O token expirou. Por favor recarregue a página.",
diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php
index 2b6d14d58f3..b338b349239 100644
--- a/lib/l10n/ro.php
+++ b/lib/l10n/ro.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "Fișierele trebuie descărcate unul câte unul.",
 "Back to Files" => "Înapoi la fișiere",
 "Selected files too large to generate zip file." => "Fișierele selectate sunt prea mari pentru a genera un fișier zip.",
-"couldn't be determined" => "nu poate fi determinat",
 "Application is not enabled" => "Aplicația nu este activată",
 "Authentication error" => "Eroare la autentificare",
 "Token expired. Please reload page." => "Token expirat. Te rugăm să reîncarci pagina.",
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index 92b14b9b89e..c3b6a077b72 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Назад к файлам",
 "Selected files too large to generate zip file." => "Выбранные файлы слишком велики, чтобы создать zip файл.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Загрузите файл маленьшими порциями, раздельно или вежливо попросите Вашего администратора.",
-"couldn't be determined" => "Невозможно установить",
 "Application is not enabled" => "Приложение не разрешено",
 "Authentication error" => "Ошибка аутентификации",
 "Token expired. Please reload page." => "Токен просрочен. Перезагрузите страницу.",
@@ -41,13 +40,13 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV.",
 "Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
 "seconds ago" => "несколько секунд назад",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n минута назад","%n минуты назад","%n минут назад"),
+"_%n hour ago_::_%n hours ago_" => array("%n час назад","%n часа назад","%n часов назад"),
 "today" => "сегодня",
 "yesterday" => "вчера",
-"_%n day go_::_%n days ago_" => array("","",""),
+"_%n day go_::_%n days ago_" => array("%n день назад","%n дня назад","%n дней назад"),
 "last month" => "в прошлом месяце",
-"_%n month ago_::_%n months ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("%n месяц назад","%n месяца назад","%n месяцев назад"),
 "last year" => "в прошлом году",
 "years ago" => "несколько лет назад",
 "Caused by:" => "Вызвано:",
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index ef3dc6eb977..43a4b4a0bee 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Späť na súbory",
 "Selected files too large to generate zip file." => "Zvolené súbory sú príliš veľké na vygenerovanie zip súboru.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Stiahnite súbory po menších častiach, samostatne, alebo sa obráťte na správcu.",
-"couldn't be determined" => "nedá sa zistiť",
 "Application is not enabled" => "Aplikácia nie je zapnutá",
 "Authentication error" => "Chyba autentifikácie",
 "Token expired. Please reload page." => "Token vypršal. Obnovte, prosím, stránku.",
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index 73a397f3c84..5722191aedf 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "Datoteke je mogoče prejeti le posamično.",
 "Back to Files" => "Nazaj na datoteke",
 "Selected files too large to generate zip file." => "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip.",
-"couldn't be determined" => "ni mogoče določiti",
 "Application is not enabled" => "Program ni omogočen",
 "Authentication error" => "Napaka pri overjanju",
 "Token expired. Please reload page." => "Žeton je potekel. Stran je treba ponovno naložiti.",
diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php
index ca2364f9864..c2447b7ea23 100644
--- a/lib/l10n/sq.php
+++ b/lib/l10n/sq.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "Skedarët duhet të shkarkohen një nga një.",
 "Back to Files" => "Kthehu tek skedarët",
 "Selected files too large to generate zip file." => "Skedarët e selektuar janë shumë të mëdhenj për të krijuar një skedar ZIP.",
-"couldn't be determined" => "nuk u vendos dot",
 "Application is not enabled" => "Programi nuk është i aktivizuar.",
 "Authentication error" => "Veprim i gabuar gjatë vërtetimit të identitetit",
 "Token expired. Please reload page." => "Përmbajtja ka skaduar. Ju lutemi ringarkoni faqen.",
diff --git a/lib/l10n/sr.php b/lib/l10n/sr.php
index c42419b6d92..9441d0578fc 100644
--- a/lib/l10n/sr.php
+++ b/lib/l10n/sr.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "Датотеке морате преузимати једну по једну.",
 "Back to Files" => "Назад на датотеке",
 "Selected files too large to generate zip file." => "Изабране датотеке су превелике да бисте направили ZIP датотеку.",
-"couldn't be determined" => "није одређено",
 "Application is not enabled" => "Апликација није омогућена",
 "Authentication error" => "Грешка при провери идентитета",
 "Token expired. Please reload page." => "Жетон је истекао. Поново учитајте страницу.",
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index fa3ae318cee..dd54e6ca5d3 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Tillbaka till Filer",
 "Selected files too large to generate zip file." => "Valda filer är för stora för att skapa zip-fil.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Ladda ner filerna i mindre bitar, separat eller fråga din administratör.",
-"couldn't be determined" => "kunde inte bestämmas",
 "Application is not enabled" => "Applikationen är inte aktiverad",
 "Authentication error" => "Fel vid autentisering",
 "Token expired. Please reload page." => "Ogiltig token. Ladda om sidan.",
@@ -41,13 +40,13 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
 "Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
 "seconds ago" => "sekunder sedan",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minut sedan","%n minuter sedan"),
+"_%n hour ago_::_%n hours ago_" => array("%n timme sedan","%n timmar sedan"),
 "today" => "i dag",
 "yesterday" => "i går",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("%n dag sedan","%n dagar sedan"),
 "last month" => "förra månaden",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n månad sedan","%n månader sedan"),
 "last year" => "förra året",
 "years ago" => "år sedan",
 "Caused by:" => "Orsakad av:",
diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php
index 53a150d8f1e..3344d0bb18e 100644
--- a/lib/l10n/th_TH.php
+++ b/lib/l10n/th_TH.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น",
 "Back to Files" => "กลับไปที่ไฟล์",
 "Selected files too large to generate zip file." => "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip",
-"couldn't be determined" => "ไม่สามารถกำหนดได้",
 "Application is not enabled" => "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน",
 "Authentication error" => "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
 "Token expired. Please reload page." => "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index f95933645da..498469ea8b1 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Back to Files" => "Dosyalara dön",
 "Selected files too large to generate zip file." => "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür.",
 "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Dosyaları ayrı ayrı, küçük parçalar halinde indirin ya da yöneticinizden yardım isteyin. ",
-"couldn't be determined" => "tespit edilemedi",
 "Application is not enabled" => "Uygulama etkinleştirilmedi",
 "Authentication error" => "Kimlik doğrulama hatası",
 "Token expired. Please reload page." => "Jetonun süresi geçti. Lütfen sayfayı yenileyin.",
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index 26617396e06..c1513c5bb79 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "Файли повинні бути завантаженні послідовно.",
 "Back to Files" => "Повернутися до файлів",
 "Selected files too large to generate zip file." => "Вибрані фали завеликі для генерування zip файлу.",
-"couldn't be determined" => "не може бути визначено",
 "Application is not enabled" => "Додаток не увімкнений",
 "Authentication error" => "Помилка автентифікації",
 "Token expired. Please reload page." => "Строк дії токена скінчився. Будь ласка, перезавантажте сторінку.",
diff --git a/lib/l10n/vi.php b/lib/l10n/vi.php
index ebdb3ab2810..dc0045c35ca 100644
--- a/lib/l10n/vi.php
+++ b/lib/l10n/vi.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "Tập tin cần phải được tải về từng người một.",
 "Back to Files" => "Trở lại tập tin",
 "Selected files too large to generate zip file." => "Tập tin được chọn quá lớn để tạo tập tin ZIP.",
-"couldn't be determined" => "không thể phát hiện được",
 "Application is not enabled" => "Ứng dụng không được BẬT",
 "Authentication error" => "Lỗi xác thực",
 "Token expired. Please reload page." => "Mã Token đã hết hạn. Hãy tải lại trang.",
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index b814b055a22..03bd48de74b 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "需要逐一下载文件",
 "Back to Files" => "回到文件",
 "Selected files too large to generate zip file." => "选择的文件太大，无法生成 zip 文件。",
-"couldn't be determined" => "无法确定",
 "Application is not enabled" => "应用程序未启用",
 "Authentication error" => "认证出错",
 "Token expired. Please reload page." => "Token 过期，请刷新页面。",
@@ -38,7 +37,7 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
 "Please double check the <a href='%s'>installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
 "seconds ago" => "秒前",
-"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"),
 "_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "今天",
 "yesterday" => "昨天",
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index 83e0dff3926..f405eb88ae9 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "檔案需要逐一下載。",
 "Back to Files" => "回到檔案列表",
 "Selected files too large to generate zip file." => "選擇的檔案太大以致於無法產生壓縮檔。",
-"couldn't be determined" => "無法判斷",
 "Application is not enabled" => "應用程式未啟用",
 "Authentication error" => "認證錯誤",
 "Token expired. Please reload page." => "Token 過期，請重新整理頁面。",
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 423c9cec666..97fcc6fd182 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -90,6 +90,7 @@ $TRANSLATIONS = array(
 "Language" => "اللغة",
 "Help translate" => "ساعد في الترجمه",
 "WebDAV" => "WebDAV",
+"Encryption" => "التشفير",
 "Login Name" => "اسم الدخول",
 "Create" => "انشئ",
 "Default Storage" => "وحدة التخزين الافتراضية",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index c679fcef8a2..6145c187ce3 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -54,6 +54,7 @@ $TRANSLATIONS = array(
 "Language" => "ভাষা",
 "Help translate" => "অনুবাদ করতে সহায়তা করুন",
 "WebDAV" => "WebDAV",
+"Encryption" => "সংকেতায়ন",
 "Create" => "তৈরী কর",
 "Default Storage" => "পূর্বনির্ধারিত সংরক্ষণাগার",
 "Unlimited" => "অসীম",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 68c2f42c529..051a6a1b74f 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Pomoci s překladem",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použijte <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>",
+"Encryption" => "Šifrování",
 "Login Name" => "Přihlašovací jméno",
 "Create" => "Vytvořit",
 "Admin Recovery Password" => "Heslo obnovy správce",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index a36c6bb61fd..b26f968f42f 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Hjælp med oversættelsen",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Anvend denne adresse til at <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tilgå dine filer via WebDAV</a>",
+"Encryption" => "Kryptering",
 "Login Name" => "Loginnavn",
 "Create" => "Ny",
 "Admin Recovery Password" => "Administrator gendannelse kodeord",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 3faa8858e8e..2347d60de4d 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Helfen Sie bei der Übersetzung",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>.",
+"Encryption" => "Verschlüsselung",
 "Login Name" => "Loginname",
 "Create" => "Erstellen",
 "Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 7cda89f4965..693db4710de 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -68,6 +68,7 @@ $TRANSLATIONS = array(
 "Language" => "Lingvo",
 "Help translate" => "Helpu traduki",
 "WebDAV" => "WebDAV",
+"Encryption" => "Ĉifrado",
 "Create" => "Krei",
 "Default Storage" => "Defaŭlta konservejo",
 "Unlimited" => "Senlima",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index ad8b198e1ad..9f214c54808 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Ayúdnos a traducir",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>",
+"Encryption" => "Cifrado",
 "Login Name" => "Nombre de usuario",
 "Create" => "Crear",
 "Admin Recovery Password" => "Recuperación de la contraseña de administración",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 0f0947fa5b8..a78b9b50e89 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Aita tõlkida",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Kasuta seda aadressi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
+"Encryption" => "Krüpteerimine",
 "Login Name" => "Kasutajanimi",
 "Create" => "Lisa",
 "Admin Recovery Password" => "Admin taasteparool",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 4b6c13127b7..73ca1338a57 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -99,6 +99,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Lagundu itzultzen",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
+"Encryption" => "Enkriptazioa",
 "Login Name" => "Sarrera Izena",
 "Create" => "Sortu",
 "Admin Recovery Password" => "Kudeatzaile pasahitz berreskuratzea",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 5d478bc4939..2fd79235549 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -92,6 +92,7 @@ $TRANSLATIONS = array(
 "Help translate" => "به ترجمه آن کمک کنید",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "استفاده ابن آدرس <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\"> برای دسترسی فایل های شما از طریق WebDAV </a>",
+"Encryption" => "رمزگذاری",
 "Login Name" => "نام کاربری",
 "Create" => "ایجاد کردن",
 "Admin Recovery Password" => "مدیریت بازیابی رمز عبور",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 61d0a51bf92..d388c13ee71 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -87,6 +87,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Auta kääntämisessä",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Käytä tätä osoitetta <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">päästäksesi käsiksi tiedostoihisi WebDAVin kautta</a>",
+"Encryption" => "Salaus",
 "Login Name" => "Kirjautumisnimi",
 "Create" => "Luo",
 "Default Storage" => "Oletustallennustila",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 1c64b01f566..3e1f5ddb5ef 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -92,6 +92,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Aidez à traduire",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilisez cette adresse pour <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accéder à vos fichiers via WebDAV</a>",
+"Encryption" => "Chiffrement",
 "Login Name" => "Nom de la connexion",
 "Create" => "Créer",
 "Admin Recovery Password" => "Récupération du mot de passe administrateur",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index b82e5a9b3e4..c8ef28a261b 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -89,6 +89,7 @@ $TRANSLATIONS = array(
 "Language" => "פה",
 "Help translate" => "עזרה בתרגום",
 "WebDAV" => "WebDAV",
+"Encryption" => "הצפנה",
 "Login Name" => "שם כניסה",
 "Create" => "יצירה",
 "Admin Recovery Password" => "ססמת השחזור של המנהל",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 6c3ad8b3e77..abc19560d37 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -90,6 +90,7 @@ $TRANSLATIONS = array(
 "Language" => "Bahasa",
 "Help translate" => "Bantu menerjemahkan",
 "WebDAV" => "WebDAV",
+"Encryption" => "Enkripsi",
 "Login Name" => "Nama Masuk",
 "Create" => "Buat",
 "Default Storage" => "Penyimpanan Baku",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index 2e97650bdb8..f803da8756d 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -58,6 +58,7 @@ $TRANSLATIONS = array(
 "Language" => "Tungumál",
 "Help translate" => "Hjálpa við þýðingu",
 "WebDAV" => "WebDAV",
+"Encryption" => "Dulkóðun",
 "Create" => "Búa til",
 "Default Storage" => "Sjálfgefin gagnageymsla",
 "Unlimited" => "Ótakmarkað",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index b6a508ba46b..003fc5c7bb1 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Migliora la traduzione",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilizza questo indirizzo per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedere ai tuoi file via WebDAV</a>",
+"Encryption" => "Cifratura",
 "Login Name" => "Nome utente",
 "Create" => "Crea",
 "Admin Recovery Password" => "Password di ripristino amministrativa",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 4473a2c5126..0f8f80537f1 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -91,6 +91,7 @@ $TRANSLATIONS = array(
 "Language" => "언어",
 "Help translate" => "번역 돕기",
 "WebDAV" => "WebDAV",
+"Encryption" => "암호화",
 "Login Name" => "로그인 이름",
 "Create" => "만들기",
 "Admin Recovery Password" => "관리자 복구 암호",
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index 4be8f212d39..956df725a77 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -7,6 +7,7 @@ $TRANSLATIONS = array(
 "Password" => "وشەی تێپەربو",
 "New password" => "وشەی نهێنی نوێ",
 "Email" => "ئیمه‌یل",
+"Encryption" => "نهێنیکردن",
 "Username" => "ناوی به‌کارهێنه‌ر"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index eba0f3c89ab..57b9f654c19 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nevar lejupielādēt sarakstu no lietotņu veikala",
 "Authentication error" => "Autentifikācijas kļūda",
+"Your display name has been changed." => "Jūsu redzamais vārds ir mainīts.",
 "Unable to change display name" => "Nevarēja mainīt redzamo vārdu",
 "Group already exists" => "Grupa jau eksistē",
 "Unable to add group" => "Nevar pievienot grupu",
@@ -37,25 +38,35 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Jānorāda derīga parole",
 "__language_name__" => "__valodas_nosaukums__",
 "Security Warning" => "Brīdinājums par drošību",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Jūsu datu direktorija un faili visticamāk ir pieejami no interneta. .htaccess fails nedarbojas. Ir rekomendēts konfigurēt serveri tā lai jūsu datu direktorija nav lasāma vai pārvietot to ārpus tīmekļa servera dokumentu mapes.",
 "Setup Warning" => "Iestatīšanas brīdinājums",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Lūdzu kārtīgi izlasiet <a href=\"%s\">uzstādīšanas norādījumus</a>.",
 "Module 'fileinfo' missing" => "Trūkst modulis “fileinfo”",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc iespējas labāk noteiktu mime tipus.",
 "Locale not working" => "Lokāle nestrādā",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Sistēmas lokalizāciju nevar nomainīt uz %s. Tas nozīmē ka var rasties sarežģījumi ar dažu burtu attēlošanu failu nosaukumos. Ir rekomendēts uzstādīt nepieciešamās pakotnes lai atbalstītu %s lokalizāciju.",
 "Internet connection not working" => "Interneta savienojums nedarbojas",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Šim serverim nav savienojums ar internetu. Tas nozīmē ka nebūs tādas iespējas kā ārējo datu nesēju montēšana, paziņojumi par atjauninājumiem vai citu izstrādātāju programmu uzstādīšana. Attālināta failu piekļuve vai paziņojumu epastu sūtīšana iespējams arī nedarbosies. Ir rekomendēts iespējot interneta savienojumu lai gūtu iespēju izmantotu visus risinājumus.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Izpildīt vienu uzdevumu ar katru ielādēto lapu",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php ir reģistrēts webcron servisā lai izsauktu cron.php vienreiz minūtē caur http.",
+"Use systems cron service to call the cron.php file once a minute." => "Izmantojiet sistēmas cron servisu lai izsauktu cron.php reizi minūtē.",
 "Sharing" => "Dalīšanās",
 "Enable Share API" => "Aktivēt koplietošanas API",
 "Allow apps to use the Share API" => "Ļauj lietotnēm izmantot koplietošanas API",
 "Allow links" => "Atļaut saites",
 "Allow users to share items to the public with links" => "Ļaut lietotājiem publiski dalīties ar vienumiem, izmantojot saites",
+"Allow public uploads" => "Atļaut publisko augšupielādi",
+"Allow users to enable others to upload into their publicly shared folders" => "Ļaut lietotājiem iespējot atļaut citiem augšupielādēt failus viņu publiskajās mapēs",
 "Allow resharing" => "Atļaut atkārtotu koplietošanu",
 "Allow users to share items shared with them again" => "Ļaut lietotājiem dalīties ar vienumiem atkārtoti",
 "Allow users to share with anyone" => "Ļaut lietotājiem dalīties ar visiem",
 "Allow users to only share with users in their groups" => "Ļaut lietotājiem dalīties ar lietotājiem to grupās",
 "Security" => "Drošība",
 "Enforce HTTPS" => "Uzspiest HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu",
 "Log" => "Žurnāls",
 "Log level" => "Žurnāla līmenis",
 "More" => "Vairāk",
@@ -90,8 +101,11 @@ $TRANSLATIONS = array(
 "Language" => "Valoda",
 "Help translate" => "Palīdzi tulkot",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Lietojiet šo adresi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">lai piekļūtu saviem failiem ar WebDAV</a>",
 "Login Name" => "Ierakstīšanās vārds",
 "Create" => "Izveidot",
+"Admin Recovery Password" => "Administratora atgūšanas parole",
+"Enter the recovery password in order to recover the users files during password change" => "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā.",
 "Default Storage" => "Noklusējuma krātuve",
 "Unlimited" => "Neierobežota",
 "Other" => "Cits",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 61f1b8b3bcd..9d74b69ccd1 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -54,6 +54,7 @@ $TRANSLATIONS = array(
 "Language" => "Јазик",
 "Help translate" => "Помогни во преводот",
 "WebDAV" => "WebDAV",
+"Encryption" => "Енкрипција",
 "Create" => "Создај",
 "Other" => "Останато",
 "Username" => "Корисничко име"
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 9048d89bad1..a31c6e0cd7f 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -92,6 +92,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Bidra til oversettelsen",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Bruk denne adressen for å <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">få tilgang til filene dine via WebDAV</a>",
+"Encryption" => "Kryptering",
 "Login Name" => "Logginn navn",
 "Create" => "Opprett",
 "Default Storage" => "Standard lager",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 67ddafdc3c5..2b0d4011f48 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -38,13 +38,16 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Er moet een geldig wachtwoord worden opgegeven",
 "__language_name__" => "Nederlands",
 "Security Warning" => "Beveiligingswaarschuwing",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet.  We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datamap niet bereikbaar is vanaf het internet of om uw datamap te verplaatsen naar een locatie buiten de document root van de webserver.",
 "Setup Warning" => "Instellingswaarschuwing",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Conntroleer de <a href='%s'>installatie handleiding</a> goed.",
 "Module 'fileinfo' missing" => "Module 'fileinfo' ontbreekt",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.",
 "Locale not working" => "Taalbestand werkt niet",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "De systeemtaal kan niet worden ingesteld op %s. Hierdoor kunnen er problemen optreden met bepaalde karakters in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren, zodat %s ondersteund wordt.",
 "Internet connection not working" => "Internet verbinding werkt niet",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Bij laden van elke pagina één taak uitvoeren",
 "cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php is geregistreerd bij een webcron service om cron.php eens per minuut aan te roepen via http.",
@@ -99,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Help met vertalen",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Gebruik dit adres <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">toegang tot uw bestanden via WebDAV</a>",
+"Encryption" => "Versleuteling",
 "Login Name" => "Inlognaam",
 "Create" => "Creëer",
 "Admin Recovery Password" => "Beheer herstel wachtwoord",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 0b30001e8c1..839ddf645f8 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -88,6 +88,7 @@ $TRANSLATIONS = array(
 "Language" => "Limba",
 "Help translate" => "Ajută la traducere",
 "WebDAV" => "WebDAV",
+"Encryption" => "Încriptare",
 "Create" => "Crează",
 "Default Storage" => "Stocare implicită",
 "Unlimited" => "Nelimitată",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index c58fafbf27a..16f8f67481e 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Помочь с переводом",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Используйте этот адрес чтобы получить доступ к вашим файлам через WebDav - <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">",
+"Encryption" => "Шифрование",
 "Login Name" => "Имя пользователя",
 "Create" => "Создать",
 "Admin Recovery Password" => "Восстановление Пароля Администратора",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 374990a2c0c..c45d67daa74 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -46,6 +46,7 @@ $TRANSLATIONS = array(
 "Fill in an email address to enable password recovery" => "මුරපද ප්‍රතිස්ථාපනය සඳහා විද්‍යුත් තැපැල් විස්තර ලබා දෙන්න",
 "Language" => "භාෂාව",
 "Help translate" => "පරිවර්ථන සහය",
+"Encryption" => "ගුප්ත කේතනය",
 "Create" => "තනන්න",
 "Other" => "වෙනත්",
 "Username" => "පරිශීලක නම"
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index ad602ee860f..b0a270a65ec 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -92,6 +92,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Pomôcť s prekladom",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použite túto adresu <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pre prístup k súborom cez WebDAV</a>",
+"Encryption" => "Šifrovanie",
 "Login Name" => "Prihlasovacie meno",
 "Create" => "Vytvoriť",
 "Admin Recovery Password" => "Obnovenie hesla administrátora",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 5ad921201b6..eaf975048ce 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -91,6 +91,7 @@ $TRANSLATIONS = array(
 "Language" => "Jezik",
 "Help translate" => "Sodelujte pri prevajanju",
 "WebDAV" => "WebDAV",
+"Encryption" => "Šifriranje",
 "Login Name" => "Prijavno ime",
 "Create" => "Ustvari",
 "Admin Recovery Password" => "Obnovitev administratorjevega gesla",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index b2b6538c4c3..86872df36c5 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -89,6 +89,7 @@ $TRANSLATIONS = array(
 "Language" => "Језик",
 "Help translate" => " Помозите у превођењу",
 "WebDAV" => "WebDAV",
+"Encryption" => "Шифровање",
 "Login Name" => "Корисничко име",
 "Create" => "Направи",
 "Default Storage" => "Подразумевано складиште",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index ad1660e25c9..cea9e2da4dc 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "Hjälp att översätta",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Använd denna adress för att <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">komma åt dina filer via WebDAV</a>",
+"Encryption" => "Kryptering",
 "Login Name" => "Inloggningsnamn",
 "Create" => "Skapa",
 "Admin Recovery Password" => "Admin återställningslösenord",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 0dc206c7993..e65feedbc95 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -44,6 +44,7 @@ $TRANSLATIONS = array(
 "Fill in an email address to enable password recovery" => "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக",
 "Language" => "மொழி",
 "Help translate" => "மொழிபெயர்க்க உதவி",
+"Encryption" => "மறைக்குறியீடு",
 "Create" => "உருவாக்குக",
 "Other" => "மற்றவை",
 "Username" => "பயனாளர் பெயர்"
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index d182d9198de..2c5e1a6786c 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -60,6 +60,7 @@ $TRANSLATIONS = array(
 "Language" => "تىل",
 "Help translate" => "تەرجىمىگە ياردەم",
 "WebDAV" => "WebDAV",
+"Encryption" => "شىفىرلاش",
 "Login Name" => "تىزىمغا كىرىش ئاتى",
 "Create" => "قۇر",
 "Default Storage" => "كۆڭۈلدىكى ساقلىغۇچ",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index c6a9ab28624..e58a8b7139c 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -90,6 +90,7 @@ $TRANSLATIONS = array(
 "Language" => "Мова",
 "Help translate" => "Допомогти з перекладом",
 "WebDAV" => "WebDAV",
+"Encryption" => "Шифрування",
 "Login Name" => "Ім'я Логіну",
 "Create" => "Створити",
 "Default Storage" => "сховище за замовчуванням",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 4607229b4d9..832001a02a7 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -76,6 +76,7 @@ $TRANSLATIONS = array(
 "Language" => "Ngôn ngữ",
 "Help translate" => "Hỗ trợ dịch thuật",
 "WebDAV" => "WebDAV",
+"Encryption" => "Mã hóa",
 "Login Name" => "Tên đăng nhập",
 "Create" => "Tạo",
 "Default Storage" => "Bộ nhớ mặc định",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 5a42bf06754..385c77645cd 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -38,25 +38,35 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "必须提供合法的密码",
 "__language_name__" => "简体中文",
 "Security Warning" => "安全警告",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。",
 "Setup Warning" => "设置警告",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
 "Module 'fileinfo' missing" => "模块'文件信息'丢失",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
 "Locale not working" => "本地化无法工作",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "服务器无法设置系统本地化到%s. 这意味着可能文件名中有一些字符会引起问题. 我们强烈建议在你系统上安装所需的软件包来支持%s",
 "Internet connection not working" => "因特网连接无法工作",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.",
 "Cron" => "计划任务",
 "Execute one task with each page loaded" => "每个页面加载后执行一个任务",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php已被注册到网络定时任务服务。通过http每分钟调用owncloud根目录的cron.php网页。",
+"Use systems cron service to call the cron.php file once a minute." => "使用系统定时任务服务。每分钟通过系统定时任务调用owncloud文件夹中的cron.php文件",
 "Sharing" => "共享",
 "Enable Share API" => "启用共享API",
 "Allow apps to use the Share API" => "允许应用软件使用共享API",
 "Allow links" => "允许链接",
 "Allow users to share items to the public with links" => "允许用户使用连接公开共享项目",
+"Allow public uploads" => "允许公开上传",
+"Allow users to enable others to upload into their publicly shared folders" => "用户可让其他人上传到他的公开共享文件夹",
 "Allow resharing" => "允许再次共享",
 "Allow users to share items shared with them again" => "允许用户将共享给他们的项目再次共享",
 "Allow users to share with anyone" => "允许用户向任何人共享",
 "Allow users to only share with users in their groups" => "允许用户只向同组用户共享",
 "Security" => "安全",
 "Enforce HTTPS" => "强制使用 HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "强制客户端通过加密连接连接到%s。",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL.",
 "Log" => "日志",
 "Log level" => "日志级别",
 "More" => "更多",
@@ -91,6 +101,8 @@ $TRANSLATIONS = array(
 "Language" => "语言",
 "Help translate" => "帮助翻译",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "使用该链接 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">通过WebDAV访问你的文件</a>",
+"Encryption" => "加密",
 "Login Name" => "登录名称",
 "Create" => "创建",
 "Admin Recovery Password" => "管理恢复密码",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 0a0fcf84e2d..7c1a8963cca 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Help translate" => "幫助翻譯",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "使用<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">這個網址</a>來透過 WebDAV 存取您的檔案",
+"Encryption" => "加密",
 "Login Name" => "登入名稱",
 "Create" => "建立",
 "Admin Recovery Password" => "管理者復原密碼",