[tx-robot] updated from transifex

126 files changed, 544 insertions, 2108 deletions

diff --git a/settings/l10n/ar.js b/settings/l10n/ar.js
index 8ab328e85e2..edf299d7d44 100644
--- a/settings/l10n/ar.js
+++ b/settings/l10n/ar.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Authentication error" : "لم يتم التأكد من الشخصية بنجاح",
     "Your full name has been changed." : "اسمك الكامل تم تغييره.",
     "Unable to change full name" : "لم يتم التمكن من تغيير اسمك الكامل",
-    "Backups restored successfully" : "تم إسترجاع النسخة الإحتياطية بنجاح",
     "Language changed" : "تم تغيير اللغة",
     "Invalid request" : "طلب غير مفهوم",
     "Admins can't remove themself from the admin group" : "لا يستطيع المدير إزالة حسابه من مجموعة المديرين",
@@ -44,7 +43,6 @@ OC.L10N.register(
     "Good password" : "كلمة السر جيدة",
     "Strong password" : "كلمة السر قوية",
     "Delete" : "إلغاء",
-    "Decrypting files... Please wait, this can take some time." : "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت.",
     "Groups" : "مجموعات",
     "undo" : "تراجع",
     "never" : "بتاتا",
@@ -53,7 +51,6 @@ OC.L10N.register(
     "Error creating user" : "حصل خطأ اثناء انشاء مستخدم",
     "A valid password must be provided" : "يجب ادخال كلمة مرور صحيحة",
     "__language_name__" : "__language_name__",
-    "Encryption" : "التشفير",
     "Everything (fatal issues, errors, warnings, info, debug)" : "كل شيء (مشاكل فادحة, اخطاء , تحذيرات , معلومات , تصحيح الاخطاء)",
     "Info, warnings, errors and fatal issues" : "معلومات , تحذيرات , اخطاء , مشاكل فادحة ",
     "Warnings, errors and fatal issues" : "تحذيرات , اخطاء , مشاكل فادحة ",
@@ -73,6 +70,7 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "قم بتنفيذ مهمة واحدة مع كل صفحة تم تحميلها",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "الملف cron.php تم تسجيله فى خدمه webcron  لاستدعاء الملف cron.php كل  15 دقيقه",
     "Send mode" : "وضعية الإرسال",
+    "Encryption" : "التشفير",
     "Authentication method" : "أسلوب التطابق",
     "Server address" : "عنوان الخادم",
     "Port" : "المنفذ",
@@ -84,11 +82,7 @@ OC.L10N.register(
     "Documentation:" : "التوثيق",
     "User Documentation" : "كتاب توثيق المستخدم",
     "Uninstall App" : "أزالة تطبيق",
-    "Administrator Documentation" : "كتاب توثيق المدير",
-    "Online Documentation" : "توثيق متوفر على الشبكة",
     "Forum" : "منتدى",
-    "Bugtracker" : "تعقب علة",
-    "Commercial Support" : "دعم تجاري",
     "Get the apps to sync your files" : "احصل على التطبيقات لمزامنة ملفاتك",
     "Show First Run Wizard again" : "ابدأ خطوات بداية التشغيل من جديد",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>",
@@ -110,9 +104,6 @@ OC.L10N.register(
     "Language" : "اللغة",
     "Help translate" : "ساعد في الترجمه",
     "Valid until" : "صالح حتى",
-    "The encryption app is no longer enabled, please decrypt all your files" : "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك",
-    "Log-in password" : "كلمه سر الدخول",
-    "Decrypt all Files" : "فك تشفير جميع الملفات ",
     "Username" : "إسم المستخدم",
     "Create" : "انشئ",
     "Admin Recovery Password" : "استعادة كلمة المرور للمسؤول",
diff --git a/settings/l10n/ar.json b/settings/l10n/ar.json
index 047e82c4097..32b279576d7 100644
--- a/settings/l10n/ar.json
+++ b/settings/l10n/ar.json
@@ -6,7 +6,6 @@
     "Authentication error" : "لم يتم التأكد من الشخصية بنجاح",
     "Your full name has been changed." : "اسمك الكامل تم تغييره.",
     "Unable to change full name" : "لم يتم التمكن من تغيير اسمك الكامل",
-    "Backups restored successfully" : "تم إسترجاع النسخة الإحتياطية بنجاح",
     "Language changed" : "تم تغيير اللغة",
     "Invalid request" : "طلب غير مفهوم",
     "Admins can't remove themself from the admin group" : "لا يستطيع المدير إزالة حسابه من مجموعة المديرين",
@@ -42,7 +41,6 @@
     "Good password" : "كلمة السر جيدة",
     "Strong password" : "كلمة السر قوية",
     "Delete" : "إلغاء",
-    "Decrypting files... Please wait, this can take some time." : "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت.",
     "Groups" : "مجموعات",
     "undo" : "تراجع",
     "never" : "بتاتا",
@@ -51,7 +49,6 @@
     "Error creating user" : "حصل خطأ اثناء انشاء مستخدم",
     "A valid password must be provided" : "يجب ادخال كلمة مرور صحيحة",
     "__language_name__" : "__language_name__",
-    "Encryption" : "التشفير",
     "Everything (fatal issues, errors, warnings, info, debug)" : "كل شيء (مشاكل فادحة, اخطاء , تحذيرات , معلومات , تصحيح الاخطاء)",
     "Info, warnings, errors and fatal issues" : "معلومات , تحذيرات , اخطاء , مشاكل فادحة ",
     "Warnings, errors and fatal issues" : "تحذيرات , اخطاء , مشاكل فادحة ",
@@ -71,6 +68,7 @@
     "Execute one task with each page loaded" : "قم بتنفيذ مهمة واحدة مع كل صفحة تم تحميلها",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "الملف cron.php تم تسجيله فى خدمه webcron  لاستدعاء الملف cron.php كل  15 دقيقه",
     "Send mode" : "وضعية الإرسال",
+    "Encryption" : "التشفير",
     "Authentication method" : "أسلوب التطابق",
     "Server address" : "عنوان الخادم",
     "Port" : "المنفذ",
@@ -82,11 +80,7 @@
     "Documentation:" : "التوثيق",
     "User Documentation" : "كتاب توثيق المستخدم",
     "Uninstall App" : "أزالة تطبيق",
-    "Administrator Documentation" : "كتاب توثيق المدير",
-    "Online Documentation" : "توثيق متوفر على الشبكة",
     "Forum" : "منتدى",
-    "Bugtracker" : "تعقب علة",
-    "Commercial Support" : "دعم تجاري",
     "Get the apps to sync your files" : "احصل على التطبيقات لمزامنة ملفاتك",
     "Show First Run Wizard again" : "ابدأ خطوات بداية التشغيل من جديد",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>",
@@ -108,9 +102,6 @@
     "Language" : "اللغة",
     "Help translate" : "ساعد في الترجمه",
     "Valid until" : "صالح حتى",
-    "The encryption app is no longer enabled, please decrypt all your files" : "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك",
-    "Log-in password" : "كلمه سر الدخول",
-    "Decrypt all Files" : "فك تشفير جميع الملفات ",
     "Username" : "إسم المستخدم",
     "Create" : "انشئ",
     "Admin Recovery Password" : "استعادة كلمة المرور للمسؤول",
diff --git a/settings/l10n/ast.js b/settings/l10n/ast.js
index b517ffed460..03a3fc57aa4 100644
--- a/settings/l10n/ast.js
+++ b/settings/l10n/ast.js
@@ -10,14 +10,7 @@ OC.L10N.register(
     "Authentication error" : "Fallu d'autenticación",
     "Your full name has been changed." : "Camudóse'l nome completu.",
     "Unable to change full name" : "Nun pue camudase'l nome completu",
-    "Files decrypted successfully" : "Descifráronse los ficheros",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nun pudieron descifrase sus ficheros. Revisa'l owncloud.log o consulta col alministrador",
-    "Couldn't decrypt your files, check your password and try again" : "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués",
-    "Encryption keys deleted permanently" : "Desaniciaes dafechu les claves de cifráu",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nun pudieron desaniciase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
     "Couldn't remove app." : "Nun pudo desaniciase l'aplicación.",
-    "Backups restored successfully" : "Copia de seguridá restaurada",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nun pudieron restaurase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
     "Language changed" : "Camudóse la llingua",
     "Invalid request" : "Solicitú inválida",
     "Admins can't remove themself from the admin group" : "Los alministradores nun puen desaniciase a ellos mesmos del grupu d'alministrador",
@@ -31,7 +24,6 @@ OC.L10N.register(
     "Unable to change password" : "Nun pudo camudase la contraseña",
     "Enabled" : "Habilitar",
     "Not enabled" : "Desactiváu",
-    "Recommended" : "Recomendáu",
     "Saved" : "Guardáu",
     "test email settings" : "probar configuración de corréu",
     "Email sent" : "Corréu-e unviáu",
@@ -60,9 +52,6 @@ OC.L10N.register(
     "Strong password" : "Contraseña mui bona",
     "Valid until {date}" : "Válidu fasta {date}",
     "Delete" : "Desaniciar",
-    "Decrypting files... Please wait, this can take some time." : "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
-    "Delete encryption keys permanently." : "Desaniciar dafechu les claves de cifráu.",
-    "Restore encryption keys." : "Restaurar claves de cifráu.",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "Nun pue desaniciase {objName}",
     "Error creating group" : "Fallu creando grupu",
@@ -78,7 +67,6 @@ OC.L10N.register(
     "A valid password must be provided" : "Tien d'apurrise una contraseña válida",
     "__language_name__" : "Asturianu",
     "SSL root certificates" : "Certificaos raíz SSL",
-    "Encryption" : "Cifráu",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Too (Información, Avisos, Fallos, debug y problemes fatales)",
     "Info, warnings, errors and fatal issues" : "Información, Avisos, Fallos y problemes fatales",
     "Warnings, errors and fatal issues" : "Avisos, fallos y problemes fatales",
@@ -114,6 +102,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el serviciu cron del sistema pa llamar al ficheru cron.php cada 15 mins.",
     "This is used for sending out notifications." : "Esto úsase pa unviar notificaciones.",
     "Send mode" : "Mou d'unviu",
+    "Encryption" : "Cifráu",
     "From address" : "Dende la direición",
     "mail" : "corréu",
     "Authentication method" : "Métodu d'autenticación",
@@ -136,11 +125,7 @@ OC.L10N.register(
     "Enable only for specific groups" : "Habilitar namái pa grupos específicos",
     "Uninstall App" : "Desinstalar aplicación",
     "Cheers!" : "¡Salú!",
-    "Administrator Documentation" : "Documentación d'alministrador",
-    "Online Documentation" : "Documentación en llinia",
     "Forum" : "Foru",
-    "Bugtracker" : "Rastrexador de fallos",
-    "Commercial Support" : "Sofitu comercial",
     "Get the apps to sync your files" : "Obtener les aplicaciones pa sincronizar ficheros",
     "Show First Run Wizard again" : "Amosar nuevamente l'Encontu d'execución inicial",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usasti <strong>%s</strong> de los <strong>%s</strong> disponibles",
@@ -162,12 +147,6 @@ OC.L10N.register(
     "Choose as profile image" : "Esbillar como imaxe de perfil",
     "Language" : "Llingua",
     "Help translate" : "Ayúdanos nes traducciones",
-    "The encryption app is no longer enabled, please decrypt all your files" : "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros",
-    "Log-in password" : "Contraseña d'accesu",
-    "Decrypt all Files" : "Descifrar ficheros",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claves de cifráu van guardase nuna llocalización segura. D'esta miente, en casu de que daqué saliere mal, vas poder recuperar les claves. Desanicia dafechu les claves de cifráu namái si tas seguru de que los ficheros descifráronse correcho.",
-    "Restore Encryption Keys" : "Restaurar claves de cifráu.",
-    "Delete Encryption Keys" : "Desaniciar claves de cifráu",
     "Username" : "Nome d'usuariu",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña d'alministración",
diff --git a/settings/l10n/ast.json b/settings/l10n/ast.json
index 8b9e04e3526..a3bb4a9ea20 100644
--- a/settings/l10n/ast.json
+++ b/settings/l10n/ast.json
@@ -8,14 +8,7 @@
     "Authentication error" : "Fallu d'autenticación",
     "Your full name has been changed." : "Camudóse'l nome completu.",
     "Unable to change full name" : "Nun pue camudase'l nome completu",
-    "Files decrypted successfully" : "Descifráronse los ficheros",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nun pudieron descifrase sus ficheros. Revisa'l owncloud.log o consulta col alministrador",
-    "Couldn't decrypt your files, check your password and try again" : "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués",
-    "Encryption keys deleted permanently" : "Desaniciaes dafechu les claves de cifráu",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nun pudieron desaniciase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
     "Couldn't remove app." : "Nun pudo desaniciase l'aplicación.",
-    "Backups restored successfully" : "Copia de seguridá restaurada",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nun pudieron restaurase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
     "Language changed" : "Camudóse la llingua",
     "Invalid request" : "Solicitú inválida",
     "Admins can't remove themself from the admin group" : "Los alministradores nun puen desaniciase a ellos mesmos del grupu d'alministrador",
@@ -29,7 +22,6 @@
     "Unable to change password" : "Nun pudo camudase la contraseña",
     "Enabled" : "Habilitar",
     "Not enabled" : "Desactiváu",
-    "Recommended" : "Recomendáu",
     "Saved" : "Guardáu",
     "test email settings" : "probar configuración de corréu",
     "Email sent" : "Corréu-e unviáu",
@@ -58,9 +50,6 @@
     "Strong password" : "Contraseña mui bona",
     "Valid until {date}" : "Válidu fasta {date}",
     "Delete" : "Desaniciar",
-    "Decrypting files... Please wait, this can take some time." : "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
-    "Delete encryption keys permanently." : "Desaniciar dafechu les claves de cifráu.",
-    "Restore encryption keys." : "Restaurar claves de cifráu.",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "Nun pue desaniciase {objName}",
     "Error creating group" : "Fallu creando grupu",
@@ -76,7 +65,6 @@
     "A valid password must be provided" : "Tien d'apurrise una contraseña válida",
     "__language_name__" : "Asturianu",
     "SSL root certificates" : "Certificaos raíz SSL",
-    "Encryption" : "Cifráu",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Too (Información, Avisos, Fallos, debug y problemes fatales)",
     "Info, warnings, errors and fatal issues" : "Información, Avisos, Fallos y problemes fatales",
     "Warnings, errors and fatal issues" : "Avisos, fallos y problemes fatales",
@@ -112,6 +100,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el serviciu cron del sistema pa llamar al ficheru cron.php cada 15 mins.",
     "This is used for sending out notifications." : "Esto úsase pa unviar notificaciones.",
     "Send mode" : "Mou d'unviu",
+    "Encryption" : "Cifráu",
     "From address" : "Dende la direición",
     "mail" : "corréu",
     "Authentication method" : "Métodu d'autenticación",
@@ -134,11 +123,7 @@
     "Enable only for specific groups" : "Habilitar namái pa grupos específicos",
     "Uninstall App" : "Desinstalar aplicación",
     "Cheers!" : "¡Salú!",
-    "Administrator Documentation" : "Documentación d'alministrador",
-    "Online Documentation" : "Documentación en llinia",
     "Forum" : "Foru",
-    "Bugtracker" : "Rastrexador de fallos",
-    "Commercial Support" : "Sofitu comercial",
     "Get the apps to sync your files" : "Obtener les aplicaciones pa sincronizar ficheros",
     "Show First Run Wizard again" : "Amosar nuevamente l'Encontu d'execución inicial",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usasti <strong>%s</strong> de los <strong>%s</strong> disponibles",
@@ -160,12 +145,6 @@
     "Choose as profile image" : "Esbillar como imaxe de perfil",
     "Language" : "Llingua",
     "Help translate" : "Ayúdanos nes traducciones",
-    "The encryption app is no longer enabled, please decrypt all your files" : "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros",
-    "Log-in password" : "Contraseña d'accesu",
-    "Decrypt all Files" : "Descifrar ficheros",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claves de cifráu van guardase nuna llocalización segura. D'esta miente, en casu de que daqué saliere mal, vas poder recuperar les claves. Desanicia dafechu les claves de cifráu namái si tas seguru de que los ficheros descifráronse correcho.",
-    "Restore Encryption Keys" : "Restaurar claves de cifráu.",
-    "Delete Encryption Keys" : "Desaniciar claves de cifráu",
     "Username" : "Nome d'usuariu",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña d'alministración",
diff --git a/settings/l10n/az.js b/settings/l10n/az.js
index 26906097e85..db1b897a848 100644
--- a/settings/l10n/az.js
+++ b/settings/l10n/az.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Təhlükəsizlik & işə salma xəbərdarlıqları",
     "Sharing" : "Paylaşılır",
     "External Storage" : "Kənar depo",
+    "Server Side Encryption" : "Server tərəf şifrələnmə",
     "Cron" : "Cron",
     "Email Server" : "Email server",
     "Log" : "Jurnal",
@@ -11,14 +12,7 @@ OC.L10N.register(
     "Authentication error" : "Təyinat metodikası",
     "Your full name has been changed." : "Sizin tam adınız dəyişdirildi.",
     "Unable to change full name" : "Tam adı dəyişmək olmur",
-    "Files decrypted successfully" : "Fayllar uğurla deşifrə edildi",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Sizin faylları deşifrə etmək olmur, xahiş olunur owncloud.log faylını yoxlaya vəya inzibatçıya müraciət edəsiniz.",
-    "Couldn't decrypt your files, check your password and try again" : "Sizin faylları deşifrə etmək olmur, xahiş olunur şifrəni yoxlaya və yenidən təkrar edəsiniz.",
-    "Encryption keys deleted permanently" : "Şifrələmə açarları həmişəlik silindi",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Sizin şifrələnmə açarlarınızı həmişəlik silmək mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
     "Couldn't remove app." : "Proqram təminatını silmək mümkün olmadı.",
-    "Backups restored successfully" : "Ehtiyyat nüsxələr uğurla geri qaytarıldı",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Sizin şifrələnmə açarlarınızı geri qaytarmaq mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
     "Language changed" : "Dil dəyişdirildi",
     "Invalid request" : "Səhv müraciət",
     "Admins can't remove themself from the admin group" : "İnzibatçılar özlərini inzibatçı qrupundan silə bilməz",
@@ -33,7 +27,6 @@ OC.L10N.register(
     "Unable to change password" : "Şifrəni dəyişmək olmur",
     "Enabled" : "İşə salınıb",
     "Not enabled" : "İşə salınıb",
-    "Recommended" : "Məsləhətlidir",
     "Group already exists." : "Qrup artılq mövcduddur.",
     "Unable to add group." : "Qrupu əlavə etmək mümkün deyil. ",
     "Unable to delete group." : "Qrupu silmək mümkün deyil.",
@@ -75,9 +68,6 @@ OC.L10N.register(
     "Strong password" : "Çətin şifrə",
     "Valid until {date}" : "Müddətədək keçərlidir {date}",
     "Delete" : "Sil",
-    "Decrypting files... Please wait, this can take some time." : "Fayllar deşifrə edilir... Xahiş olunur gözləyəsiniz, bu biraz vaxt alacaq.",
-    "Delete encryption keys permanently." : "Şifrələnmə açarlarını həmişəlik sil.",
-    "Restore encryption keys." : "Şifrələnmə açarlarını geri qaytar",
     "Groups" : "Qruplar",
     "Unable to delete {objName}" : "{objName} silmək olmur",
     "Error creating group" : "Qrup yaranmasında səhv baş verdi",
@@ -97,7 +87,6 @@ OC.L10N.register(
     "Sync clients" : "Müştəriləri sinxronizasiya et",
     "Personal info" : "Şəxsi məlumat",
     "SSL root certificates" : "SSL root sertifikatları",
-    "Encryption" : "Şifrələnmə",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Hər şey(ən pis hadisələr, səhvlər, xəbərdarlıqlar, məlmat, araşdırma səhvləri)",
     "Info, warnings, errors and fatal issues" : "Məlmat, xəbərdarlıqlar, səhvlər və ən pis hadisələr",
     "Warnings, errors and fatal issues" : "Xəbərdarlıqlar, səhvlər və ən pis hadisələr",
@@ -140,9 +129,9 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Hər səhifə yüklənməsində bir işi yerinə yetir",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php qeydə alınmış webcron servisdir hansi ki, http üzərindən hər 15 dəqiqədən bir cron.php çağırır.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Sistemin cron servisindən istifadə edin ki, cron.php faylını hər 15 dəqiqədən bir işə salasınız.",
-    "Server Side Encryption" : "Server tərəf şifrələnmə",
     "This is used for sending out notifications." : "Kənara xəbərdarlıqları ötürmək üçün bu istifadə edilir.",
     "Send mode" : "Göndərmə rejimi",
+    "Encryption" : "Şifrələnmə",
     "From address" : "Ünvandan",
     "mail" : "poçt",
     "Authentication method" : "Qeydiyyat metodikası",
@@ -182,11 +171,7 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ey ora,<br><br>ancaq deyirik ki, sizin artiq %s hesabınız var.<br><br>Sizin istifadəçi adınız: %s<br>Yetkilidir: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Şərəfə!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ey ora,\n\nancaq deyirik ki, sizin artiq %s hesabınız var.\n\nizin istifadəçi adınız: %s\nYetkilidir: %s\n\n",
-    "Administrator Documentation" : "İnzibatçı sənədləşməsi",
-    "Online Documentation" : "Onlayn sənədləşmə",
     "Forum" : "Forum",
-    "Bugtracker" : "Xətaİzləyicisi",
-    "Commercial Support" : "Ticari dəstək",
     "Get the apps to sync your files" : "Fayllarınızın sinxronizasiyası üçün proqramları götürün",
     "Desktop client" : "Desktop client",
     "Android app" : "Android proqramı",
@@ -221,12 +206,6 @@ OC.L10N.register(
     "Issued By" : "Tərəfindən yaradılıb",
     "Valid until %s" : "Keçərlidir vaxtadək %s",
     "Import root certificate" : "root sertifikatı import et",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Şifrələnmə proqramı uzun müddətdir işləmir, xahiş olunur bütün fayllarınızı deşifrə edəsiniz",
-    "Log-in password" : "Şifrəni daxil et",
-    "Decrypt all Files" : "Bütün faylları deşifrə et",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Sizin şifrələnmə açarınız rezerv ünvanına köçürülüb. Əgər nə isə düzgün getməzsə, siz açarları geri qaytara bilərsiniz. Yalnız bütün fayllarınızın deşifrə olmasından əmin olduqdan sonra, onları silin. ",
-    "Restore Encryption Keys" : "Şifrələnmə açarlarının bərpa et",
-    "Delete Encryption Keys" : "Şifrələnmə açarlarını sil",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Tərəfindən yaradılıb{communityopen}ownCloud cəmiyyəti{linkclose},   {githubopen}mənbə kodları{linkclose} altında lisenziya edilib {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Depo ünvanını göstər",
     "Show last log in" : "Son girişi göstər",
diff --git a/settings/l10n/az.json b/settings/l10n/az.json
index 67c28617812..bf741ed9f9b 100644
--- a/settings/l10n/az.json
+++ b/settings/l10n/az.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Təhlükəsizlik & işə salma xəbərdarlıqları",
     "Sharing" : "Paylaşılır",
     "External Storage" : "Kənar depo",
+    "Server Side Encryption" : "Server tərəf şifrələnmə",
     "Cron" : "Cron",
     "Email Server" : "Email server",
     "Log" : "Jurnal",
@@ -9,14 +10,7 @@
     "Authentication error" : "Təyinat metodikası",
     "Your full name has been changed." : "Sizin tam adınız dəyişdirildi.",
     "Unable to change full name" : "Tam adı dəyişmək olmur",
-    "Files decrypted successfully" : "Fayllar uğurla deşifrə edildi",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Sizin faylları deşifrə etmək olmur, xahiş olunur owncloud.log faylını yoxlaya vəya inzibatçıya müraciət edəsiniz.",
-    "Couldn't decrypt your files, check your password and try again" : "Sizin faylları deşifrə etmək olmur, xahiş olunur şifrəni yoxlaya və yenidən təkrar edəsiniz.",
-    "Encryption keys deleted permanently" : "Şifrələmə açarları həmişəlik silindi",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Sizin şifrələnmə açarlarınızı həmişəlik silmək mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
     "Couldn't remove app." : "Proqram təminatını silmək mümkün olmadı.",
-    "Backups restored successfully" : "Ehtiyyat nüsxələr uğurla geri qaytarıldı",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Sizin şifrələnmə açarlarınızı geri qaytarmaq mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
     "Language changed" : "Dil dəyişdirildi",
     "Invalid request" : "Səhv müraciət",
     "Admins can't remove themself from the admin group" : "İnzibatçılar özlərini inzibatçı qrupundan silə bilməz",
@@ -31,7 +25,6 @@
     "Unable to change password" : "Şifrəni dəyişmək olmur",
     "Enabled" : "İşə salınıb",
     "Not enabled" : "İşə salınıb",
-    "Recommended" : "Məsləhətlidir",
     "Group already exists." : "Qrup artılq mövcduddur.",
     "Unable to add group." : "Qrupu əlavə etmək mümkün deyil. ",
     "Unable to delete group." : "Qrupu silmək mümkün deyil.",
@@ -73,9 +66,6 @@
     "Strong password" : "Çətin şifrə",
     "Valid until {date}" : "Müddətədək keçərlidir {date}",
     "Delete" : "Sil",
-    "Decrypting files... Please wait, this can take some time." : "Fayllar deşifrə edilir... Xahiş olunur gözləyəsiniz, bu biraz vaxt alacaq.",
-    "Delete encryption keys permanently." : "Şifrələnmə açarlarını həmişəlik sil.",
-    "Restore encryption keys." : "Şifrələnmə açarlarını geri qaytar",
     "Groups" : "Qruplar",
     "Unable to delete {objName}" : "{objName} silmək olmur",
     "Error creating group" : "Qrup yaranmasında səhv baş verdi",
@@ -95,7 +85,6 @@
     "Sync clients" : "Müştəriləri sinxronizasiya et",
     "Personal info" : "Şəxsi məlumat",
     "SSL root certificates" : "SSL root sertifikatları",
-    "Encryption" : "Şifrələnmə",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Hər şey(ən pis hadisələr, səhvlər, xəbərdarlıqlar, məlmat, araşdırma səhvləri)",
     "Info, warnings, errors and fatal issues" : "Məlmat, xəbərdarlıqlar, səhvlər və ən pis hadisələr",
     "Warnings, errors and fatal issues" : "Xəbərdarlıqlar, səhvlər və ən pis hadisələr",
@@ -138,9 +127,9 @@
     "Execute one task with each page loaded" : "Hər səhifə yüklənməsində bir işi yerinə yetir",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php qeydə alınmış webcron servisdir hansi ki, http üzərindən hər 15 dəqiqədən bir cron.php çağırır.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Sistemin cron servisindən istifadə edin ki, cron.php faylını hər 15 dəqiqədən bir işə salasınız.",
-    "Server Side Encryption" : "Server tərəf şifrələnmə",
     "This is used for sending out notifications." : "Kənara xəbərdarlıqları ötürmək üçün bu istifadə edilir.",
     "Send mode" : "Göndərmə rejimi",
+    "Encryption" : "Şifrələnmə",
     "From address" : "Ünvandan",
     "mail" : "poçt",
     "Authentication method" : "Qeydiyyat metodikası",
@@ -180,11 +169,7 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ey ora,<br><br>ancaq deyirik ki, sizin artiq %s hesabınız var.<br><br>Sizin istifadəçi adınız: %s<br>Yetkilidir: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Şərəfə!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ey ora,\n\nancaq deyirik ki, sizin artiq %s hesabınız var.\n\nizin istifadəçi adınız: %s\nYetkilidir: %s\n\n",
-    "Administrator Documentation" : "İnzibatçı sənədləşməsi",
-    "Online Documentation" : "Onlayn sənədləşmə",
     "Forum" : "Forum",
-    "Bugtracker" : "Xətaİzləyicisi",
-    "Commercial Support" : "Ticari dəstək",
     "Get the apps to sync your files" : "Fayllarınızın sinxronizasiyası üçün proqramları götürün",
     "Desktop client" : "Desktop client",
     "Android app" : "Android proqramı",
@@ -219,12 +204,6 @@
     "Issued By" : "Tərəfindən yaradılıb",
     "Valid until %s" : "Keçərlidir vaxtadək %s",
     "Import root certificate" : "root sertifikatı import et",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Şifrələnmə proqramı uzun müddətdir işləmir, xahiş olunur bütün fayllarınızı deşifrə edəsiniz",
-    "Log-in password" : "Şifrəni daxil et",
-    "Decrypt all Files" : "Bütün faylları deşifrə et",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Sizin şifrələnmə açarınız rezerv ünvanına köçürülüb. Əgər nə isə düzgün getməzsə, siz açarları geri qaytara bilərsiniz. Yalnız bütün fayllarınızın deşifrə olmasından əmin olduqdan sonra, onları silin. ",
-    "Restore Encryption Keys" : "Şifrələnmə açarlarının bərpa et",
-    "Delete Encryption Keys" : "Şifrələnmə açarlarını sil",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Tərəfindən yaradılıb{communityopen}ownCloud cəmiyyəti{linkclose},   {githubopen}mənbə kodları{linkclose} altında lisenziya edilib {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Depo ünvanını göstər",
     "Show last log in" : "Son girişi göstər",
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
index 6ee0455602d..93cb0f7bf0e 100644
--- a/settings/l10n/bg_BG.js
+++ b/settings/l10n/bg_BG.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Предупреждения за сигурност и настройки",
     "Sharing" : "Споделяне",
     "External Storage" : "Външно Дисково Пространство",
+    "Server Side Encryption" : "Криптиране от страна на сървъра",
     "Cron" : "Крон",
     "Email Server" : "Имейл Сървър",
     "Log" : "Лог",
@@ -11,14 +12,7 @@ OC.L10N.register(
     "Authentication error" : "Възникна проблем с идентификацията",
     "Your full name has been changed." : "Вашето пълно име е променено.",
     "Unable to change full name" : "Неуспешна промяна на пълното име.",
-    "Files decrypted successfully" : "Разшифроването на файловете е успешно.",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Разшифроването на файловете Ви не е успешно. Моля, проверете вашия owncloud.log или попитайте администратора.",
-    "Couldn't decrypt your files, check your password and try again" : "Разшифроването на файловете Ви не е успешно. Моля, проверете паролата си и опитайте отново.",
-    "Encryption keys deleted permanently" : "Ключовете за криптиране са безвъзвратно изтрити",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Неуспешно безвъзвратно изтриване на криптиращите ключове. Моля проверете своя owncloud.log или се свържете с админстратора.",
     "Couldn't remove app." : "Неуспешно премахване на приложението.",
-    "Backups restored successfully" : "Резервното копие е успешно възстановено.",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Възстановяването на криптиращите Ви ключове е неуспешно. Моля, проверете вашия owncloud.log или попитайте администратора.",
     "Language changed" : "Езикът е променен",
     "Invalid request" : "Невалидна заявка",
     "Admins can't remove themself from the admin group" : "Администраторите не могат да премахват себе си от групата \"admin\".",
@@ -33,7 +27,6 @@ OC.L10N.register(
     "Unable to change password" : "Неуспешна смяна на паролата.",
     "Enabled" : "Включено",
     "Not enabled" : "Изключено",
-    "Recommended" : "Препоръчано",
     "Group already exists." : "Групата вече съществува.",
     "Unable to add group." : "Неуспешно добавяне на група.",
     "Unable to delete group." : "Неуспешно изтриване на група",
@@ -75,9 +68,6 @@ OC.L10N.register(
     "Strong password" : "Сигурна парола",
     "Valid until {date}" : "Далидна до {date}",
     "Delete" : "Изтриване",
-    "Decrypting files... Please wait, this can take some time." : "Разшифроване на файловете... Моля, изчакайте. Това може да отнеме известно време...",
-    "Delete encryption keys permanently." : "Изтриване на криптиращите ключове безвъзвратно.",
-    "Restore encryption keys." : "Възстановяване на криптиращите ключове.",
     "Groups" : "Групи",
     "Unable to delete {objName}" : "Неуспешно изтриване на {objName}.",
     "Error creating group" : "Грешка при създаване на група",
@@ -97,7 +87,6 @@ OC.L10N.register(
     "Sync clients" : "Синхронизиращи клиенти",
     "Personal info" : "Лична информация",
     "SSL root certificates" : "SSL root сертификати",
-    "Encryption" : "Криптиране",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Всичко (фатални проблеми, грешки, предупреждения, информация, дебъгване)",
     "Info, warnings, errors and fatal issues" : "информация, предупреждения, грешки и фатални проблеми",
     "Warnings, errors and fatal issues" : "Предупреждения, грешки и фатални проблеми",
@@ -138,10 +127,10 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Изпълни по едно задание с всяка заредена страница.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php е регистриран към webcron да се свързва с cron.php всеки 15 минути по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Изполвай системната cron service, за връзка с cron.php файла всеки 15 минути.",
-    "Server Side Encryption" : "Криптиране от страна на сървъра",
     "Enable Server-Side-Encryption" : "Включи криптиране от страна на сървъра",
     "This is used for sending out notifications." : "Това се използва за изпращане на уведомления.",
     "Send mode" : "Режим на изпращане",
+    "Encryption" : "Криптиране",
     "From address" : "От адрес",
     "mail" : "поща",
     "Authentication method" : "Метод за отризиране",
@@ -184,11 +173,7 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Здрасти,<br><br>Само да ти кажа, че имаш %s профил<br><br> Потребителя ти е: %s<br>Достъпи го: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Поздрави!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Здрасти,\n\nСамо да ти кажа, че имаш %s профил.\n\nПотребителя ти е: %s\nДостъпи го: %s\n",
-    "Administrator Documentation" : "Административна Документация",
-    "Online Documentation" : "Документация в Интернет",
     "Forum" : "Форум",
-    "Bugtracker" : "Докладвани грешки",
-    "Commercial Support" : "Платена Поддръжка",
     "Get the apps to sync your files" : "Изтегли програми за синхронизиране на файловете ти",
     "Desktop client" : "Клиент за настолен компютър",
     "Android app" : "Андроид приложение",
@@ -223,12 +208,6 @@ OC.L10N.register(
     "Issued By" : "Издаден От",
     "Valid until %s" : "Валиден до %s",
     "Import root certificate" : "Импортиране на основен сертификат",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Приложението за криптиране вече не е включено, моля разшифрирай всичките си файлове.",
-    "Log-in password" : "Парола за вписване",
-    "Decrypt all Files" : "Разшифровай всички Файлове",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Криптиращите ти ключове са преместени на резервно място. Ако нещо се случи ще можеш да възстановиш ключовете. Изтрий ги единствено ако си сигурен, че всички файлове са успешно разшифровани.",
-    "Restore Encryption Keys" : "Възстанови Криптиращи Ключове",
-    "Delete Encryption Keys" : "Изтрий Криптиращи Ключове",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Разработен от {communityopen}ownCloud общността {linkclose}, {githubopen}изходящия код{linkclose} е лицензиран под {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Покажи място за запис",
     "Show last log in" : "Покажи последно вписване",
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
index d7dc3131fc0..ddea8771468 100644
--- a/settings/l10n/bg_BG.json
+++ b/settings/l10n/bg_BG.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Предупреждения за сигурност и настройки",
     "Sharing" : "Споделяне",
     "External Storage" : "Външно Дисково Пространство",
+    "Server Side Encryption" : "Криптиране от страна на сървъра",
     "Cron" : "Крон",
     "Email Server" : "Имейл Сървър",
     "Log" : "Лог",
@@ -9,14 +10,7 @@
     "Authentication error" : "Възникна проблем с идентификацията",
     "Your full name has been changed." : "Вашето пълно име е променено.",
     "Unable to change full name" : "Неуспешна промяна на пълното име.",
-    "Files decrypted successfully" : "Разшифроването на файловете е успешно.",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Разшифроването на файловете Ви не е успешно. Моля, проверете вашия owncloud.log или попитайте администратора.",
-    "Couldn't decrypt your files, check your password and try again" : "Разшифроването на файловете Ви не е успешно. Моля, проверете паролата си и опитайте отново.",
-    "Encryption keys deleted permanently" : "Ключовете за криптиране са безвъзвратно изтрити",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Неуспешно безвъзвратно изтриване на криптиращите ключове. Моля проверете своя owncloud.log или се свържете с админстратора.",
     "Couldn't remove app." : "Неуспешно премахване на приложението.",
-    "Backups restored successfully" : "Резервното копие е успешно възстановено.",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Възстановяването на криптиращите Ви ключове е неуспешно. Моля, проверете вашия owncloud.log или попитайте администратора.",
     "Language changed" : "Езикът е променен",
     "Invalid request" : "Невалидна заявка",
     "Admins can't remove themself from the admin group" : "Администраторите не могат да премахват себе си от групата \"admin\".",
@@ -31,7 +25,6 @@
     "Unable to change password" : "Неуспешна смяна на паролата.",
     "Enabled" : "Включено",
     "Not enabled" : "Изключено",
-    "Recommended" : "Препоръчано",
     "Group already exists." : "Групата вече съществува.",
     "Unable to add group." : "Неуспешно добавяне на група.",
     "Unable to delete group." : "Неуспешно изтриване на група",
@@ -73,9 +66,6 @@
     "Strong password" : "Сигурна парола",
     "Valid until {date}" : "Далидна до {date}",
     "Delete" : "Изтриване",
-    "Decrypting files... Please wait, this can take some time." : "Разшифроване на файловете... Моля, изчакайте. Това може да отнеме известно време...",
-    "Delete encryption keys permanently." : "Изтриване на криптиращите ключове безвъзвратно.",
-    "Restore encryption keys." : "Възстановяване на криптиращите ключове.",
     "Groups" : "Групи",
     "Unable to delete {objName}" : "Неуспешно изтриване на {objName}.",
     "Error creating group" : "Грешка при създаване на група",
@@ -95,7 +85,6 @@
     "Sync clients" : "Синхронизиращи клиенти",
     "Personal info" : "Лична информация",
     "SSL root certificates" : "SSL root сертификати",
-    "Encryption" : "Криптиране",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Всичко (фатални проблеми, грешки, предупреждения, информация, дебъгване)",
     "Info, warnings, errors and fatal issues" : "информация, предупреждения, грешки и фатални проблеми",
     "Warnings, errors and fatal issues" : "Предупреждения, грешки и фатални проблеми",
@@ -136,10 +125,10 @@
     "Execute one task with each page loaded" : "Изпълни по едно задание с всяка заредена страница.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php е регистриран към webcron да се свързва с cron.php всеки 15 минути по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Изполвай системната cron service, за връзка с cron.php файла всеки 15 минути.",
-    "Server Side Encryption" : "Криптиране от страна на сървъра",
     "Enable Server-Side-Encryption" : "Включи криптиране от страна на сървъра",
     "This is used for sending out notifications." : "Това се използва за изпращане на уведомления.",
     "Send mode" : "Режим на изпращане",
+    "Encryption" : "Криптиране",
     "From address" : "От адрес",
     "mail" : "поща",
     "Authentication method" : "Метод за отризиране",
@@ -182,11 +171,7 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Здрасти,<br><br>Само да ти кажа, че имаш %s профил<br><br> Потребителя ти е: %s<br>Достъпи го: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Поздрави!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Здрасти,\n\nСамо да ти кажа, че имаш %s профил.\n\nПотребителя ти е: %s\nДостъпи го: %s\n",
-    "Administrator Documentation" : "Административна Документация",
-    "Online Documentation" : "Документация в Интернет",
     "Forum" : "Форум",
-    "Bugtracker" : "Докладвани грешки",
-    "Commercial Support" : "Платена Поддръжка",
     "Get the apps to sync your files" : "Изтегли програми за синхронизиране на файловете ти",
     "Desktop client" : "Клиент за настолен компютър",
     "Android app" : "Андроид приложение",
@@ -221,12 +206,6 @@
     "Issued By" : "Издаден От",
     "Valid until %s" : "Валиден до %s",
     "Import root certificate" : "Импортиране на основен сертификат",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Приложението за криптиране вече не е включено, моля разшифрирай всичките си файлове.",
-    "Log-in password" : "Парола за вписване",
-    "Decrypt all Files" : "Разшифровай всички Файлове",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Криптиращите ти ключове са преместени на резервно място. Ако нещо се случи ще можеш да възстановиш ключовете. Изтрий ги единствено ако си сигурен, че всички файлове са успешно разшифровани.",
-    "Restore Encryption Keys" : "Възстанови Криптиращи Ключове",
-    "Delete Encryption Keys" : "Изтрий Криптиращи Ключове",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Разработен от {communityopen}ownCloud общността {linkclose}, {githubopen}изходящия код{linkclose} е лицензиран под {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Покажи място за запис",
     "Show last log in" : "Покажи последно вписване",
diff --git a/settings/l10n/bn_BD.js b/settings/l10n/bn_BD.js
index 0b773bb89a4..a99381bf4f5 100644
--- a/settings/l10n/bn_BD.js
+++ b/settings/l10n/bn_BD.js
@@ -6,10 +6,7 @@ OC.L10N.register(
     "Email Server" : "ইমেইল সার্ভার",
     "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
     "Your full name has been changed." : "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
-    "Files decrypted successfully" : "সার্থকভাবে ফাইল ডিক্রিপ্ট করা হয়েছে",
     "Couldn't remove app." : "অ্যাপ অপসারণ করা গেলনা",
-    "Backups restored successfully" : "ব্যাকআপ পূণঃস্থাপন সুসম্পন্ন",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "িআপনার এনক্রিপসন কি পূনর্বাসন করা গেলনা, আপনার owncloud.log পিরীক্ষা করুন বা প্রশাসককে জিজ্ঞাসা করুন",
     "Language changed" : "ভাষা পরিবর্তন করা হয়েছে",
     "Invalid request" : "অনুরোধটি সঠিক নয়",
     "Admins can't remove themself from the admin group" : "প্রশাসকবৃন্দ তাদেরকে প্রশাসক গোষ্ঠী থেকে মুছে ফেলতে পারবেন না",
@@ -39,13 +36,13 @@ OC.L10N.register(
     "never" : "কখনোই নয়",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "SSL  রুট সনদপত্র",
-    "Encryption" : "সংকেতায়ন",
     "None" : "কোনটিই নয়",
     "Login" : "প্রবেশ",
     "Expire after " : "এরপর মেয়াদোত্তীর্ণ হও",
     "days" : "দিনগুলি",
     "Enforce expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ কার্যকর করুন",
     "Send mode" : "পাঠানো মোড",
+    "Encryption" : "সংকেতায়ন",
     "From address" : "হইতে ঠিকানা",
     "mail" : "মেইল",
     "Server address" : "সার্ভার ঠিকানা",
@@ -57,11 +54,7 @@ OC.L10N.register(
     "by" : "কর্তৃক",
     "User Documentation" : "ব্যবহারকারী সহায়িকা",
     "Cheers!" : "শুভেচ্ছা!",
-    "Administrator Documentation" : "প্রশাসক সহায়িকা",
-    "Online Documentation" : "অনলাইন সহায়িকা",
     "Forum" : "ফোরাম",
-    "Bugtracker" : "বাগট্র্যাকার",
-    "Commercial Support" : "বাণিজ্যিক সাপোর্ট",
     "Get the apps to sync your files" : "আপনার ফাইলসমূহ সিংক করতে অ্যাপস নিন",
     "Show First Run Wizard again" : "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "আপনি ব্যবহার করছেন  <strong>%s</strong>, সুলভ  <strong>%s</strong> এর মধ্যে।",
diff --git a/settings/l10n/bn_BD.json b/settings/l10n/bn_BD.json
index 94820431bad..036a7cc4826 100644
--- a/settings/l10n/bn_BD.json
+++ b/settings/l10n/bn_BD.json
@@ -4,10 +4,7 @@
     "Email Server" : "ইমেইল সার্ভার",
     "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
     "Your full name has been changed." : "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
-    "Files decrypted successfully" : "সার্থকভাবে ফাইল ডিক্রিপ্ট করা হয়েছে",
     "Couldn't remove app." : "অ্যাপ অপসারণ করা গেলনা",
-    "Backups restored successfully" : "ব্যাকআপ পূণঃস্থাপন সুসম্পন্ন",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "িআপনার এনক্রিপসন কি পূনর্বাসন করা গেলনা, আপনার owncloud.log পিরীক্ষা করুন বা প্রশাসককে জিজ্ঞাসা করুন",
     "Language changed" : "ভাষা পরিবর্তন করা হয়েছে",
     "Invalid request" : "অনুরোধটি সঠিক নয়",
     "Admins can't remove themself from the admin group" : "প্রশাসকবৃন্দ তাদেরকে প্রশাসক গোষ্ঠী থেকে মুছে ফেলতে পারবেন না",
@@ -37,13 +34,13 @@
     "never" : "কখনোই নয়",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "SSL  রুট সনদপত্র",
-    "Encryption" : "সংকেতায়ন",
     "None" : "কোনটিই নয়",
     "Login" : "প্রবেশ",
     "Expire after " : "এরপর মেয়াদোত্তীর্ণ হও",
     "days" : "দিনগুলি",
     "Enforce expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ কার্যকর করুন",
     "Send mode" : "পাঠানো মোড",
+    "Encryption" : "সংকেতায়ন",
     "From address" : "হইতে ঠিকানা",
     "mail" : "মেইল",
     "Server address" : "সার্ভার ঠিকানা",
@@ -55,11 +52,7 @@
     "by" : "কর্তৃক",
     "User Documentation" : "ব্যবহারকারী সহায়িকা",
     "Cheers!" : "শুভেচ্ছা!",
-    "Administrator Documentation" : "প্রশাসক সহায়িকা",
-    "Online Documentation" : "অনলাইন সহায়িকা",
     "Forum" : "ফোরাম",
-    "Bugtracker" : "বাগট্র্যাকার",
-    "Commercial Support" : "বাণিজ্যিক সাপোর্ট",
     "Get the apps to sync your files" : "আপনার ফাইলসমূহ সিংক করতে অ্যাপস নিন",
     "Show First Run Wizard again" : "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "আপনি ব্যবহার করছেন  <strong>%s</strong>, সুলভ  <strong>%s</strong> এর মধ্যে।",
diff --git a/settings/l10n/bs.js b/settings/l10n/bs.js
index 911d0b62fd9..56715ba1902 100644
--- a/settings/l10n/bs.js
+++ b/settings/l10n/bs.js
@@ -9,14 +9,7 @@ OC.L10N.register(
     "Authentication error" : "Grešna autentifikacije",
     "Your full name has been changed." : "Vaše puno ime je promijenjeno.",
     "Unable to change full name" : "Puno ime nije moguće promijeniti",
-    "Files decrypted successfully" : "Datoteke su uspješno dešifrirane",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Vaše datoteke nije moguće dešifrirati, molim provjerite svoj owncloud.log ili kontaktirajte svog administratora",
-    "Couldn't decrypt your files, check your password and try again" : "Vaše datoteke nije moguće dešifrirati, provjerite svoju lozinku i pokušajte ponovno",
-    "Encryption keys deleted permanently" : "Ključevi za šifriranje su trajno izbrisani",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće trajno izbrisati, molim provjerite svoj owncloud.log ili pitajte svog administratora.",
     "Couldn't remove app." : "Nije moguće ukloniti aplikaciju.",
-    "Backups restored successfully" : "Sigurnosne kopije su uspješno obnovljene",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće obnoviti, molim provjerite svoj owncloud.log ili pitajte svog administratora",
     "Language changed" : "Jezik je promijenjen",
     "Invalid request" : "Neispravan zahtjev",
     "Admins can't remove themself from the admin group" : "Administratori ne mogu sami sebe ukloniti iz admin grupe",
@@ -30,7 +23,6 @@ OC.L10N.register(
     "Unable to change password" : "Promjena lozinke nije moguća",
     "Enabled" : "Aktivirano",
     "Not enabled" : "Nije aktivirano",
-    "Recommended" : "Preporučljivo",
     "Group already exists." : "Grupa već postoji.",
     "Unable to add group." : "Nemoguće dodati grupu.",
     "Unable to delete group." : "Nemoguće izbrisati grupu.",
@@ -69,9 +61,6 @@ OC.L10N.register(
     "Strong password" : "Jaka lozinka",
     "Valid until {date}" : "Validno do {date}",
     "Delete" : "Izbriši",
-    "Decrypting files... Please wait, this can take some time." : "Dešifriranje datoteka... Molim pričekajte, ovo može potrajati neko vrijeme.",
-    "Delete encryption keys permanently." : "Trajno izbrišite ključeve za šifriranje.",
-    "Restore encryption keys." : "Obnovi ključeve za šifriranje.",
     "Groups" : "Grupe",
     "Unable to delete {objName}" : "Nije moguće izbrisati {objName}",
     "Error creating group" : "Greška pri kreiranju grupe",
@@ -88,7 +77,6 @@ OC.L10N.register(
     "A valid email must be provided" : "Nužno je navesti valjanu adresu e-pošte",
     "__language_name__" : "__naziv_jezika___",
     "SSL root certificates" : "SSL root certifikati",
-    "Encryption" : "Šifriranje",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Sve (fatalni problemi, greške, upozorenja, info, ispravljanje pogrešaka)",
     "Info, warnings, errors and fatal issues" : "Informacije, upozorenja, greške i fatalni problemi",
     "Warnings, errors and fatal issues" : "Upozorenja, greške i fatalni problemi",
@@ -127,6 +115,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Koristite cron uslugu sustava za pozivanje cron.php datoteke svakih 15 minuta.",
     "This is used for sending out notifications." : "Ovo se koristi za slanje notifikacija.",
     "Send mode" : "Način rada za slanje",
+    "Encryption" : "Šifriranje",
     "From address" : "S adrese",
     "mail" : "pošta",
     "Authentication method" : "Metoda autentifikacije",
@@ -155,11 +144,7 @@ OC.L10N.register(
     "Uninstall App" : "Deinstaliraj aplikaciju",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hej,<br><br>samo da javim da sad imate %s račum.<br><br>Vaše korisničko ime: %s<br>Pristupite mu: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Cheers!",
-    "Administrator Documentation" : "Dokumentacija Administratora",
-    "Online Documentation" : "Online Dokumentacija",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Komercijalna Podrška",
     "Get the apps to sync your files" : "Koristite aplikacije za sinhronizaciju svojih datoteka",
     "Desktop client" : "Desktop klijent",
     "Android app" : "Android aplikacija",
@@ -188,12 +173,6 @@ OC.L10N.register(
     "Valid until" : "Validno do",
     "Issued By" : "Izdano od",
     "Valid until %s" : "Validno do %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikacija šifriranja više nije omogćena, molimo dešifrirajte sve svoje datoteke",
-    "Log-in password" : "Lozinka za prijavu",
-    "Decrypt all Files" : "Dešifriraj sve datoteke",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaši ključevi za šifriranje premješteni su na mjesto sigurnosne kopije. Ako nešto krene loše, ključeve možete obnoviti. Iizbrišite ih trajno samo ako ste sigurni da su sve datoteke ispravno dešifrirane.",
-    "Restore Encryption Keys" : "Obnovite ključeve za šifriranje",
-    "Delete Encryption Keys" : "Izbrišite ključeve za šifriranje",
     "Show storage location" : "Prikaži mjesto pohrane",
     "Show last log in" : "Prikaži zadnju prijavu",
     "Show user backend" : "Prikaži korisničku pozadinu (backend)",
diff --git a/settings/l10n/bs.json b/settings/l10n/bs.json
index 0129b13d3aa..9af8f64c061 100644
--- a/settings/l10n/bs.json
+++ b/settings/l10n/bs.json
@@ -7,14 +7,7 @@
     "Authentication error" : "Grešna autentifikacije",
     "Your full name has been changed." : "Vaše puno ime je promijenjeno.",
     "Unable to change full name" : "Puno ime nije moguće promijeniti",
-    "Files decrypted successfully" : "Datoteke su uspješno dešifrirane",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Vaše datoteke nije moguće dešifrirati, molim provjerite svoj owncloud.log ili kontaktirajte svog administratora",
-    "Couldn't decrypt your files, check your password and try again" : "Vaše datoteke nije moguće dešifrirati, provjerite svoju lozinku i pokušajte ponovno",
-    "Encryption keys deleted permanently" : "Ključevi za šifriranje su trajno izbrisani",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće trajno izbrisati, molim provjerite svoj owncloud.log ili pitajte svog administratora.",
     "Couldn't remove app." : "Nije moguće ukloniti aplikaciju.",
-    "Backups restored successfully" : "Sigurnosne kopije su uspješno obnovljene",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće obnoviti, molim provjerite svoj owncloud.log ili pitajte svog administratora",
     "Language changed" : "Jezik je promijenjen",
     "Invalid request" : "Neispravan zahtjev",
     "Admins can't remove themself from the admin group" : "Administratori ne mogu sami sebe ukloniti iz admin grupe",
@@ -28,7 +21,6 @@
     "Unable to change password" : "Promjena lozinke nije moguća",
     "Enabled" : "Aktivirano",
     "Not enabled" : "Nije aktivirano",
-    "Recommended" : "Preporučljivo",
     "Group already exists." : "Grupa već postoji.",
     "Unable to add group." : "Nemoguće dodati grupu.",
     "Unable to delete group." : "Nemoguće izbrisati grupu.",
@@ -67,9 +59,6 @@
     "Strong password" : "Jaka lozinka",
     "Valid until {date}" : "Validno do {date}",
     "Delete" : "Izbriši",
-    "Decrypting files... Please wait, this can take some time." : "Dešifriranje datoteka... Molim pričekajte, ovo može potrajati neko vrijeme.",
-    "Delete encryption keys permanently." : "Trajno izbrišite ključeve za šifriranje.",
-    "Restore encryption keys." : "Obnovi ključeve za šifriranje.",
     "Groups" : "Grupe",
     "Unable to delete {objName}" : "Nije moguće izbrisati {objName}",
     "Error creating group" : "Greška pri kreiranju grupe",
@@ -86,7 +75,6 @@
     "A valid email must be provided" : "Nužno je navesti valjanu adresu e-pošte",
     "__language_name__" : "__naziv_jezika___",
     "SSL root certificates" : "SSL root certifikati",
-    "Encryption" : "Šifriranje",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Sve (fatalni problemi, greške, upozorenja, info, ispravljanje pogrešaka)",
     "Info, warnings, errors and fatal issues" : "Informacije, upozorenja, greške i fatalni problemi",
     "Warnings, errors and fatal issues" : "Upozorenja, greške i fatalni problemi",
@@ -125,6 +113,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Koristite cron uslugu sustava za pozivanje cron.php datoteke svakih 15 minuta.",
     "This is used for sending out notifications." : "Ovo se koristi za slanje notifikacija.",
     "Send mode" : "Način rada za slanje",
+    "Encryption" : "Šifriranje",
     "From address" : "S adrese",
     "mail" : "pošta",
     "Authentication method" : "Metoda autentifikacije",
@@ -153,11 +142,7 @@
     "Uninstall App" : "Deinstaliraj aplikaciju",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hej,<br><br>samo da javim da sad imate %s račum.<br><br>Vaše korisničko ime: %s<br>Pristupite mu: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Cheers!",
-    "Administrator Documentation" : "Dokumentacija Administratora",
-    "Online Documentation" : "Online Dokumentacija",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Komercijalna Podrška",
     "Get the apps to sync your files" : "Koristite aplikacije za sinhronizaciju svojih datoteka",
     "Desktop client" : "Desktop klijent",
     "Android app" : "Android aplikacija",
@@ -186,12 +171,6 @@
     "Valid until" : "Validno do",
     "Issued By" : "Izdano od",
     "Valid until %s" : "Validno do %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikacija šifriranja više nije omogćena, molimo dešifrirajte sve svoje datoteke",
-    "Log-in password" : "Lozinka za prijavu",
-    "Decrypt all Files" : "Dešifriraj sve datoteke",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaši ključevi za šifriranje premješteni su na mjesto sigurnosne kopije. Ako nešto krene loše, ključeve možete obnoviti. Iizbrišite ih trajno samo ako ste sigurni da su sve datoteke ispravno dešifrirane.",
-    "Restore Encryption Keys" : "Obnovite ključeve za šifriranje",
-    "Delete Encryption Keys" : "Izbrišite ključeve za šifriranje",
     "Show storage location" : "Prikaži mjesto pohrane",
     "Show last log in" : "Prikaži zadnju prijavu",
     "Show user backend" : "Prikaži korisničku pozadinu (backend)",
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
index f1f6866f361..81f5a26297e 100644
--- a/settings/l10n/ca.js
+++ b/settings/l10n/ca.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Seguretat i configuració de alertes",
     "Sharing" : "Compartir",
     "External Storage" : "Emmagatzemament extern",
+    "Server Side Encryption" : "Xifrat en el servidor",
     "Cron" : "Cron",
     "Email Server" : "Servidor de correu",
     "Log" : "Registre",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Error d'autenticació",
     "Your full name has been changed." : "El vostre nom complet ha canviat.",
     "Unable to change full name" : "No s'ha pogut canviar el nom complet",
-    "Files decrypted successfully" : "Els fitxers s'han desencriptat amb èxit",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "No es poden desencriptar els fitxers. Comproveu owncloud.log o demaneu-ho a l'administrador.",
-    "Couldn't decrypt your files, check your password and try again" : "No s'han pogut desencriptar els fitxers, comproveu la contrasenya i proveu-ho de nou",
-    "Encryption keys deleted permanently" : "Les claus d'encriptació s'han esborrat permanentment",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "No es poden esborrar les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
     "Couldn't remove app." : "No s'ha pogut eliminar l'aplicació",
-    "Backups restored successfully" : "Les còpies de seguretat s'han restablert correctament",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "No es poden restablir les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
     "Language changed" : "S'ha canviat l'idioma",
     "Invalid request" : "Sol·licitud no vàlida",
     "Admins can't remove themself from the admin group" : "Els administradors no es poden eliminar del grup admin",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "No es pot canviar la contrasenya",
     "Enabled" : "Activat",
     "Not enabled" : "Desactivat",
-    "Recommended" : "Recomanat",
     "Group already exists." : "El grup ja existeix.",
     "Unable to add group." : "No es pot agregar el grup.",
     "Unable to delete group." : "No es pot esborrar el grup.",
@@ -76,9 +69,6 @@ OC.L10N.register(
     "Strong password" : "Contrasenya forta",
     "Valid until {date}" : "Vàlid fins {date}",
     "Delete" : "Esborra",
-    "Decrypting files... Please wait, this can take some time." : "Desencriptant fitxers... Espereu, això pot trigar una estona.",
-    "Delete encryption keys permanently." : "Esborra les claus d'encriptació permanentment.",
-    "Restore encryption keys." : "Esborra les claus d'encripació.",
     "Groups" : "Grups",
     "Unable to delete {objName}" : "No es pot eliminar {objName}",
     "Error creating group" : "Error en crear el grup",
@@ -98,7 +88,6 @@ OC.L10N.register(
     "Sync clients" : "Sincronitzar clients",
     "Personal info" : "Informació personal",
     "SSL root certificates" : "Certificats SSL root",
-    "Encryption" : "Xifrat",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tot (problemes fatals, errors, avisos, informació, depuració)",
     "Info, warnings, errors and fatal issues" : "Informació, avisos, errors i problemes fatals",
     "Warnings, errors and fatal issues" : "Avisos, errors i problemes fatals",
@@ -142,10 +131,10 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Executa una tasca per cada paquet carregat",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Fer servir el cron del sistema per cridar el cron.php cada 15 minuts.",
-    "Server Side Encryption" : "Xifrat en el servidor",
     "Enable Server-Side-Encryption" : "Habilitar xifrat en el servidor",
     "This is used for sending out notifications." : "S'usa per enviar notificacions.",
     "Send mode" : "Mode d'enviament",
+    "Encryption" : "Xifrat",
     "From address" : "Des de l'adreça",
     "mail" : "correu electrònic",
     "Authentication method" : "Mètode d'autenticació",
@@ -171,6 +160,7 @@ OC.L10N.register(
     "Performance tuning" : "Ajust del rendiment",
     "Improving the config.php" : "Mejorar el config.php",
     "Theming" : "Tematització",
+    "Hardening and security guidance" : "Guia de protecció i seguretat",
     "Version" : "Versió",
     "More apps" : "Més aplicacions",
     "Developer documentation" : "Documentació para desenvolupadors",
@@ -189,11 +179,7 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Què tal?,<br><br>aquest missatge és per fer-li saber que ara té uncompte %s.<br><br>El seu nom d'usuari: %s<br>Accedeixi en: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Salut!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hola, què tal?,\n\nAquest missatge és per fer-li saber que ara té un compte %s.\n\n El seu nom d'usuari: %s\nAccedeixi en: %s\n\n",
-    "Administrator Documentation" : "Documentació d'administrador",
-    "Online Documentation" : "Documentació en línia",
     "Forum" : "Fòrum",
-    "Bugtracker" : "Seguiment d'errors",
-    "Commercial Support" : "Suport comercial",
     "Get the apps to sync your files" : "Obtingueu les aplicacions per sincronitzar els vostres fitxers",
     "Desktop client" : "Client d'escriptori",
     "Android app" : "aplicació para Android",
@@ -228,12 +214,6 @@ OC.L10N.register(
     "Issued By" : "Emès Per",
     "Valid until %s" : "Vàlid fins %s",
     "Import root certificate" : "Importa certificat root",
-    "The encryption app is no longer enabled, please decrypt all your files" : "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers",
-    "Log-in password" : "Contrasenya d'accés",
-    "Decrypt all Files" : "Desencripta tots els fitxers",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claus d'encriptació s'han mogut a una còpia de seguretat. Si alguna cosa va malament les podreu restablir. Esborreu-les permanentment només si esteu segur que tots els fitxers es desencripten correctament.",
-    "Restore Encryption Keys" : "Restableix les claus d'encriptació",
-    "Delete Encryption Keys" : "Esborra les claus d'encriptació",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolupat per la {communityopen} comunitat ownCloud comunitat{linkclose} , el {githubopen} codi font {linkclose} està llicenciat sota la {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostra la ubicació del magatzem",
     "Show last log in" : "Mostrar l'últim accés",
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
index 841e28710d4..3be9e2fc010 100644
--- a/settings/l10n/ca.json
+++ b/settings/l10n/ca.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Seguretat i configuració de alertes",
     "Sharing" : "Compartir",
     "External Storage" : "Emmagatzemament extern",
+    "Server Side Encryption" : "Xifrat en el servidor",
     "Cron" : "Cron",
     "Email Server" : "Servidor de correu",
     "Log" : "Registre",
@@ -10,14 +11,7 @@
     "Authentication error" : "Error d'autenticació",
     "Your full name has been changed." : "El vostre nom complet ha canviat.",
     "Unable to change full name" : "No s'ha pogut canviar el nom complet",
-    "Files decrypted successfully" : "Els fitxers s'han desencriptat amb èxit",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "No es poden desencriptar els fitxers. Comproveu owncloud.log o demaneu-ho a l'administrador.",
-    "Couldn't decrypt your files, check your password and try again" : "No s'han pogut desencriptar els fitxers, comproveu la contrasenya i proveu-ho de nou",
-    "Encryption keys deleted permanently" : "Les claus d'encriptació s'han esborrat permanentment",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "No es poden esborrar les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
     "Couldn't remove app." : "No s'ha pogut eliminar l'aplicació",
-    "Backups restored successfully" : "Les còpies de seguretat s'han restablert correctament",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "No es poden restablir les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
     "Language changed" : "S'ha canviat l'idioma",
     "Invalid request" : "Sol·licitud no vàlida",
     "Admins can't remove themself from the admin group" : "Els administradors no es poden eliminar del grup admin",
@@ -32,7 +26,6 @@
     "Unable to change password" : "No es pot canviar la contrasenya",
     "Enabled" : "Activat",
     "Not enabled" : "Desactivat",
-    "Recommended" : "Recomanat",
     "Group already exists." : "El grup ja existeix.",
     "Unable to add group." : "No es pot agregar el grup.",
     "Unable to delete group." : "No es pot esborrar el grup.",
@@ -74,9 +67,6 @@
     "Strong password" : "Contrasenya forta",
     "Valid until {date}" : "Vàlid fins {date}",
     "Delete" : "Esborra",
-    "Decrypting files... Please wait, this can take some time." : "Desencriptant fitxers... Espereu, això pot trigar una estona.",
-    "Delete encryption keys permanently." : "Esborra les claus d'encriptació permanentment.",
-    "Restore encryption keys." : "Esborra les claus d'encripació.",
     "Groups" : "Grups",
     "Unable to delete {objName}" : "No es pot eliminar {objName}",
     "Error creating group" : "Error en crear el grup",
@@ -96,7 +86,6 @@
     "Sync clients" : "Sincronitzar clients",
     "Personal info" : "Informació personal",
     "SSL root certificates" : "Certificats SSL root",
-    "Encryption" : "Xifrat",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tot (problemes fatals, errors, avisos, informació, depuració)",
     "Info, warnings, errors and fatal issues" : "Informació, avisos, errors i problemes fatals",
     "Warnings, errors and fatal issues" : "Avisos, errors i problemes fatals",
@@ -140,10 +129,10 @@
     "Execute one task with each page loaded" : "Executa una tasca per cada paquet carregat",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Fer servir el cron del sistema per cridar el cron.php cada 15 minuts.",
-    "Server Side Encryption" : "Xifrat en el servidor",
     "Enable Server-Side-Encryption" : "Habilitar xifrat en el servidor",
     "This is used for sending out notifications." : "S'usa per enviar notificacions.",
     "Send mode" : "Mode d'enviament",
+    "Encryption" : "Xifrat",
     "From address" : "Des de l'adreça",
     "mail" : "correu electrònic",
     "Authentication method" : "Mètode d'autenticació",
@@ -169,6 +158,7 @@
     "Performance tuning" : "Ajust del rendiment",
     "Improving the config.php" : "Mejorar el config.php",
     "Theming" : "Tematització",
+    "Hardening and security guidance" : "Guia de protecció i seguretat",
     "Version" : "Versió",
     "More apps" : "Més aplicacions",
     "Developer documentation" : "Documentació para desenvolupadors",
@@ -187,11 +177,7 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Què tal?,<br><br>aquest missatge és per fer-li saber que ara té uncompte %s.<br><br>El seu nom d'usuari: %s<br>Accedeixi en: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Salut!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hola, què tal?,\n\nAquest missatge és per fer-li saber que ara té un compte %s.\n\n El seu nom d'usuari: %s\nAccedeixi en: %s\n\n",
-    "Administrator Documentation" : "Documentació d'administrador",
-    "Online Documentation" : "Documentació en línia",
     "Forum" : "Fòrum",
-    "Bugtracker" : "Seguiment d'errors",
-    "Commercial Support" : "Suport comercial",
     "Get the apps to sync your files" : "Obtingueu les aplicacions per sincronitzar els vostres fitxers",
     "Desktop client" : "Client d'escriptori",
     "Android app" : "aplicació para Android",
@@ -226,12 +212,6 @@
     "Issued By" : "Emès Per",
     "Valid until %s" : "Vàlid fins %s",
     "Import root certificate" : "Importa certificat root",
-    "The encryption app is no longer enabled, please decrypt all your files" : "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers",
-    "Log-in password" : "Contrasenya d'accés",
-    "Decrypt all Files" : "Desencripta tots els fitxers",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claus d'encriptació s'han mogut a una còpia de seguretat. Si alguna cosa va malament les podreu restablir. Esborreu-les permanentment només si esteu segur que tots els fitxers es desencripten correctament.",
-    "Restore Encryption Keys" : "Restableix les claus d'encriptació",
-    "Delete Encryption Keys" : "Esborra les claus d'encriptació",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolupat per la {communityopen} comunitat ownCloud comunitat{linkclose} , el {githubopen} codi font {linkclose} està llicenciat sota la {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostra la ubicació del magatzem",
     "Show last log in" : "Mostrar l'últim accés",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 826562c3e7a..400f7df6248 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Upozornění zabezpečení a nastavení",
     "Sharing" : "Sdílení",
     "External Storage" : "Externí úložiště",
+    "Server Side Encryption" : "Šifrování na serveru",
     "Cron" : "Cron",
     "Email Server" : "Emailový server",
     "Log" : "Záznam",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Chyba přihlášení",
     "Your full name has been changed." : "Vaše celé jméno bylo změněno.",
     "Unable to change full name" : "Nelze změnit celé jméno",
-    "Files decrypted successfully" : "Soubory úspěšně dešifrovány",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nebylo možno dešifrovat soubory, zkontroluje prosím owncloud.log nebo kontaktujte svého správce systému",
-    "Couldn't decrypt your files, check your password and try again" : "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znovu",
-    "Encryption keys deleted permanently" : "Šifrovací klíče trvale smazány",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno trvale smazat vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého správce systému",
     "Couldn't remove app." : "Nepodařilo se odebrat aplikaci.",
-    "Backups restored successfully" : "Zálohy úspěšně obnoveny",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno obnovit vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého správce systému",
     "Language changed" : "Jazyk byl změněn",
     "Invalid request" : "Neplatný požadavek",
     "Admins can't remove themself from the admin group" : "Správci se nemohou odebrat sami ze skupiny správců",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Změna hesla se nezdařila",
     "Enabled" : "Povoleno",
     "Not enabled" : "Vypnuto",
-    "Recommended" : "Doporučeno",
     "Group already exists." : "Skupina již existuje.",
     "Unable to add group." : "Nelze přidat skupinu.",
     "Unable to delete group." : "Nelze smazat skupinu.",
@@ -57,6 +50,7 @@ OC.L10N.register(
     "Add trusted domain" : "Přidat důvěryhodnou doménu",
     "Sending..." : "Odesílání...",
     "All" : "Vše",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "U této aplikace nebyla provedena kontrola bezpečnostních problémů. Aplikace je nová nebo nestabilní. Instalujete na vlastní nebezpečí.",
     "Please wait...." : "Čekejte prosím...",
     "Error while disabling app" : "Chyba při zakazování aplikace",
     "Disable" : "Zakázat",
@@ -76,9 +70,6 @@ OC.L10N.register(
     "Strong password" : "Silné heslo",
     "Valid until {date}" : "Platný do {date}",
     "Delete" : "Smazat",
-    "Decrypting files... Please wait, this can take some time." : "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu.",
-    "Delete encryption keys permanently." : "Trvale smazat šifrovací klíče.",
-    "Restore encryption keys." : "Obnovit šifrovací klíče.",
     "Groups" : "Skupiny",
     "Unable to delete {objName}" : "Nelze smazat {objName}",
     "Error creating group" : "Chyba při vytváření skupiny",
@@ -98,7 +89,6 @@ OC.L10N.register(
     "Sync clients" : "Synchronizační klienti",
     "Personal info" : "Osobní informace",
     "SSL root certificates" : "Kořenové certifikáty SSL",
-    "Encryption" : "Šifrování",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Vše (fatální problémy, chyby, varování, informační, ladící)",
     "Info, warnings, errors and fatal issues" : "Informace, varování, chyby a fatální problémy",
     "Warnings, errors and fatal issues" : "Varování, chyby a fatální problémy",
@@ -139,13 +129,14 @@ OC.L10N.register(
     "Last cron job execution: %s." : "Poslední cron proběhl: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Poslední cron proběhl: %s. Vypadá to, že něco není v pořádku.",
     "Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
+    "Open documentation" : "Otevřít dokumentaci",
     "Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
-    "Server Side Encryption" : "Šifrování na serveru",
     "Enable Server-Side-Encryption" : "Povolit šifrování na straně serveru",
     "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
     "Send mode" : "Mód odesílání",
+    "Encryption" : "Šifrování",
     "From address" : "Adresa odesílatele",
     "mail" : "email",
     "Authentication method" : "Metoda ověření",
@@ -186,15 +177,16 @@ OC.L10N.register(
     "Update to %s" : "Aktualizovat na %s",
     "Enable only for specific groups" : "Povolit pouze pro vybrané skupiny",
     "Uninstall App" : "Odinstalovat aplikaci",
+    "Enable experimental apps" : "Povolit experimentální aplikace",
     "No apps found for your version" : "Nebyly nalezeny aplikace pro vaši verzi",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ahoj,<br><br>toto je oznámení o nově vytvořeném %s účtu.<br><br>Uživatelské jméno: %s<br>Přihlásit se dá zde: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Ať slouží!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ahoj,\n\ntoto je oznámení o nově vytvořeném %s účtu.\n\nUživatelské jméno: %s\nPřihlásit se dá zde: %s\n",
-    "Administrator Documentation" : "Dokumentace správce",
-    "Online Documentation" : "Online dokumentace",
+    "User documentation" : "Dokumentace uživatele",
+    "Administrator documentation" : "Dokumentace administrátora",
+    "Online documentation" : "Online dokumentace",
     "Forum" : "Fórum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Placená podpora",
+    "Commercial support" : "Placená podpora",
     "Get the apps to sync your files" : "Získat aplikace pro synchronizaci vašich souborů",
     "Desktop client" : "Aplikace pro počítač",
     "Android app" : "Aplikace pro Android",
@@ -229,12 +221,6 @@ OC.L10N.register(
     "Issued By" : "Vydal",
     "Valid until %s" : "Platný do %s",
     "Import root certificate" : "Import kořenového certifikátu",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Šifrovací aplikace již není spuštěna, dešifrujte prosím všechny své soubory",
-    "Log-in password" : "Přihlašovací heslo",
-    "Decrypt all Files" : "Odšifrovat všechny soubory",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaše šifrovací klíče byly zálohovány. Pokud se něco pokazí, můžete je obnovit. Smažte je trvale pouze pokud jste jisti, že jsou všechny vaše soubory bezchybně dešifrovány.",
-    "Restore Encryption Keys" : "Obnovit šifrovací klíče",
-    "Delete Encryption Keys" : "Smazat šifrovací klíče",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Vyvíjeno {communityopen}komunitou ownCloud{linkclose}, {githubopen}zdrojový kód{linkclose} je licencován pod {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Cesta k datům",
     "Show last log in" : "Poslední přihlášení",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index fc02fcce313..e253f080157 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Upozornění zabezpečení a nastavení",
     "Sharing" : "Sdílení",
     "External Storage" : "Externí úložiště",
+    "Server Side Encryption" : "Šifrování na serveru",
     "Cron" : "Cron",
     "Email Server" : "Emailový server",
     "Log" : "Záznam",
@@ -10,14 +11,7 @@
     "Authentication error" : "Chyba přihlášení",
     "Your full name has been changed." : "Vaše celé jméno bylo změněno.",
     "Unable to change full name" : "Nelze změnit celé jméno",
-    "Files decrypted successfully" : "Soubory úspěšně dešifrovány",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nebylo možno dešifrovat soubory, zkontroluje prosím owncloud.log nebo kontaktujte svého správce systému",
-    "Couldn't decrypt your files, check your password and try again" : "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znovu",
-    "Encryption keys deleted permanently" : "Šifrovací klíče trvale smazány",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno trvale smazat vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého správce systému",
     "Couldn't remove app." : "Nepodařilo se odebrat aplikaci.",
-    "Backups restored successfully" : "Zálohy úspěšně obnoveny",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno obnovit vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého správce systému",
     "Language changed" : "Jazyk byl změněn",
     "Invalid request" : "Neplatný požadavek",
     "Admins can't remove themself from the admin group" : "Správci se nemohou odebrat sami ze skupiny správců",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Změna hesla se nezdařila",
     "Enabled" : "Povoleno",
     "Not enabled" : "Vypnuto",
-    "Recommended" : "Doporučeno",
     "Group already exists." : "Skupina již existuje.",
     "Unable to add group." : "Nelze přidat skupinu.",
     "Unable to delete group." : "Nelze smazat skupinu.",
@@ -55,6 +48,7 @@
     "Add trusted domain" : "Přidat důvěryhodnou doménu",
     "Sending..." : "Odesílání...",
     "All" : "Vše",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "U této aplikace nebyla provedena kontrola bezpečnostních problémů. Aplikace je nová nebo nestabilní. Instalujete na vlastní nebezpečí.",
     "Please wait...." : "Čekejte prosím...",
     "Error while disabling app" : "Chyba při zakazování aplikace",
     "Disable" : "Zakázat",
@@ -74,9 +68,6 @@
     "Strong password" : "Silné heslo",
     "Valid until {date}" : "Platný do {date}",
     "Delete" : "Smazat",
-    "Decrypting files... Please wait, this can take some time." : "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu.",
-    "Delete encryption keys permanently." : "Trvale smazat šifrovací klíče.",
-    "Restore encryption keys." : "Obnovit šifrovací klíče.",
     "Groups" : "Skupiny",
     "Unable to delete {objName}" : "Nelze smazat {objName}",
     "Error creating group" : "Chyba při vytváření skupiny",
@@ -96,7 +87,6 @@
     "Sync clients" : "Synchronizační klienti",
     "Personal info" : "Osobní informace",
     "SSL root certificates" : "Kořenové certifikáty SSL",
-    "Encryption" : "Šifrování",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Vše (fatální problémy, chyby, varování, informační, ladící)",
     "Info, warnings, errors and fatal issues" : "Informace, varování, chyby a fatální problémy",
     "Warnings, errors and fatal issues" : "Varování, chyby a fatální problémy",
@@ -137,13 +127,14 @@
     "Last cron job execution: %s." : "Poslední cron proběhl: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Poslední cron proběhl: %s. Vypadá to, že něco není v pořádku.",
     "Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
+    "Open documentation" : "Otevřít dokumentaci",
     "Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
-    "Server Side Encryption" : "Šifrování na serveru",
     "Enable Server-Side-Encryption" : "Povolit šifrování na straně serveru",
     "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
     "Send mode" : "Mód odesílání",
+    "Encryption" : "Šifrování",
     "From address" : "Adresa odesílatele",
     "mail" : "email",
     "Authentication method" : "Metoda ověření",
@@ -184,15 +175,16 @@
     "Update to %s" : "Aktualizovat na %s",
     "Enable only for specific groups" : "Povolit pouze pro vybrané skupiny",
     "Uninstall App" : "Odinstalovat aplikaci",
+    "Enable experimental apps" : "Povolit experimentální aplikace",
     "No apps found for your version" : "Nebyly nalezeny aplikace pro vaši verzi",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ahoj,<br><br>toto je oznámení o nově vytvořeném %s účtu.<br><br>Uživatelské jméno: %s<br>Přihlásit se dá zde: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Ať slouží!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ahoj,\n\ntoto je oznámení o nově vytvořeném %s účtu.\n\nUživatelské jméno: %s\nPřihlásit se dá zde: %s\n",
-    "Administrator Documentation" : "Dokumentace správce",
-    "Online Documentation" : "Online dokumentace",
+    "User documentation" : "Dokumentace uživatele",
+    "Administrator documentation" : "Dokumentace administrátora",
+    "Online documentation" : "Online dokumentace",
     "Forum" : "Fórum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Placená podpora",
+    "Commercial support" : "Placená podpora",
     "Get the apps to sync your files" : "Získat aplikace pro synchronizaci vašich souborů",
     "Desktop client" : "Aplikace pro počítač",
     "Android app" : "Aplikace pro Android",
@@ -227,12 +219,6 @@
     "Issued By" : "Vydal",
     "Valid until %s" : "Platný do %s",
     "Import root certificate" : "Import kořenového certifikátu",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Šifrovací aplikace již není spuštěna, dešifrujte prosím všechny své soubory",
-    "Log-in password" : "Přihlašovací heslo",
-    "Decrypt all Files" : "Odšifrovat všechny soubory",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaše šifrovací klíče byly zálohovány. Pokud se něco pokazí, můžete je obnovit. Smažte je trvale pouze pokud jste jisti, že jsou všechny vaše soubory bezchybně dešifrovány.",
-    "Restore Encryption Keys" : "Obnovit šifrovací klíče",
-    "Delete Encryption Keys" : "Smazat šifrovací klíče",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Vyvíjeno {communityopen}komunitou ownCloud{linkclose}, {githubopen}zdrojový kód{linkclose} je licencován pod {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Cesta k datům",
     "Show last log in" : "Poslední přihlášení",
diff --git a/settings/l10n/cy_GB.js b/settings/l10n/cy_GB.js
index 18ce114ec2a..590745e735d 100644
--- a/settings/l10n/cy_GB.js
+++ b/settings/l10n/cy_GB.js
@@ -8,9 +8,9 @@ OC.L10N.register(
     "Groups" : "Grwpiau",
     "undo" : "dadwneud",
     "never" : "byth",
-    "Encryption" : "Amgryptiad",
     "None" : "Dim",
     "Login" : "Mewngofnodi",
+    "Encryption" : "Amgryptiad",
     "by" : "gan",
     "Password" : "Cyfrinair",
     "New password" : "Cyfrinair newydd",
diff --git a/settings/l10n/cy_GB.json b/settings/l10n/cy_GB.json
index 2e3c74f2a6b..41535c5c9cf 100644
--- a/settings/l10n/cy_GB.json
+++ b/settings/l10n/cy_GB.json
@@ -6,9 +6,9 @@
     "Groups" : "Grwpiau",
     "undo" : "dadwneud",
     "never" : "byth",
-    "Encryption" : "Amgryptiad",
     "None" : "Dim",
     "Login" : "Mewngofnodi",
+    "Encryption" : "Amgryptiad",
     "by" : "gan",
     "Password" : "Cyfrinair",
     "New password" : "Cyfrinair newydd",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 1b45d60967b..e83069de909 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Advarsler om sikkerhed og opsætning",
     "Sharing" : "Deling",
     "External Storage" : "Ekstern opbevaring",
+    "Server Side Encryption" : "Kryptering på serverdelen",
     "Cron" : "Cron",
     "Email Server" : "E-mailserver",
     "Log" : "Log",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Adgangsfejl",
     "Your full name has been changed." : "Dit fulde navn er blevet ændret.",
     "Unable to change full name" : "Ikke i stand til at ændre dit fulde navn",
-    "Files decrypted successfully" : "Filer dekrypteret med succes",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dine filer kunne ikke dekrypteres. Gennemse din owncloud log eller spørg din administrator",
-    "Couldn't decrypt your files, check your password and try again" : "Dine filer kunne ikke dekrypteres. Check din adgangskode og forsøg igen",
-    "Encryption keys deleted permanently" : "Krypteringsnøgle slettet permanent",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke slette dine nøgler til kryptering permanent, tjek venligst din owncloud.log eller spørg din administrator",
     "Couldn't remove app." : "Kunne ikke fjerne app'en.",
-    "Backups restored successfully" : "Genskabelsen af sikkerhedskopierne blev gennemført",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke genskabe din krypyterings nøgle, se logfilen owncloud.log eller spørg en administrator",
     "Language changed" : "Sprog ændret",
     "Invalid request" : "Ugyldig forespørgsel",
     "Admins can't remove themself from the admin group" : "Administratorer kan ikke fjerne dem selv fra admin gruppen",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Kunne ikke ændre kodeord",
     "Enabled" : "Aktiveret",
     "Not enabled" : "Slået fra",
-    "Recommended" : "Anbefalet",
     "Group already exists." : "Gruppen findes allerede.",
     "Unable to add group." : "Kan ikke tilføje gruppen.",
     "Unable to delete group." : "Kan ikke slette gruppen.",
@@ -57,6 +50,9 @@ OC.L10N.register(
     "Add trusted domain" : "Tilføj et domæne som du har tillid til",
     "Sending..." : "Sender...",
     "All" : "Alle",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officielt program er udviklet af ownCloud fællesskabet. Funktionerne spiller en central rolle i ownCloud og kan bruges i produktionsmiljøer.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkendte programmer er udviklet af betroet udviklere som har bestået en let sikkerheds gennemgang. De er aktivt vedligeholdt i et åben kode lager og udviklerne vurdere programmet til at være stabilt for normalt brug.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Dette program er ikke undersøgt for sikkerhedsrisici, det er et nyt program som kan være ustabilt. Installer programmet på eget ansvar.",
     "Please wait...." : "Vent venligst...",
     "Error while disabling app" : "Kunne ikke deaktivere app",
     "Disable" : "Deaktiver",
@@ -76,9 +72,6 @@ OC.L10N.register(
     "Strong password" : "Stærkt kodeord",
     "Valid until {date}" : "Gyldig indtil {date}",
     "Delete" : "Slet",
-    "Decrypting files... Please wait, this can take some time." : "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
-    "Delete encryption keys permanently." : "Slet krypteringsnøgler permanent.",
-    "Restore encryption keys." : "Genopret krypteringsnøgler.",
     "Groups" : "Grupper",
     "Unable to delete {objName}" : "Kunne ikke slette {objName}",
     "Error creating group" : "Fejl ved oprettelse af gruppe",
@@ -98,7 +91,6 @@ OC.L10N.register(
     "Sync clients" : "Synkroniserings klienter",
     "Personal info" : "Personlige oplysninger",
     "SSL root certificates" : "SSL-rodcertifikater",
-    "Encryption" : "Kryptering",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (alvorlige fejl, fejl, advarsler, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, advarsler, fejl og alvorlige fejl",
     "Warnings, errors and fatal issues" : "Advarsler, fejl og alvorlige fejl",
@@ -139,13 +131,14 @@ OC.L10N.register(
     "Last cron job execution: %s." : "Seneste udførsel af cronjob: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Seneste udførsel af cronjob: %s. Der er vist noget galt.",
     "Cron was not executed yet!" : "Cron har ikke kørt endnu!",
+    "Open documentation" : "Åben dokumentation",
     "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæsning",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
-    "Server Side Encryption" : "Kryptering på serverdelen",
     "Enable Server-Side-Encryption" : "Aktiver kryptering på serverdelen",
     "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.",
     "Send mode" : "Tilstand for afsendelse",
+    "Encryption" : "Kryptering",
     "From address" : "Fra adresse",
     "mail" : "mail",
     "Authentication method" : "Godkendelsesmetode",
@@ -175,6 +168,8 @@ OC.L10N.register(
     "Version" : "Version",
     "More apps" : "Flere programmer",
     "Developer documentation" : "Dokumentation for udviklere",
+    "Experimental applications ahead" : "Kommende eksperimentale programmer",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Eksperimentale programmer er ikke undersøgt for sikkerheds problemer. Kendt for at være ustabil og stadig under intensiv udvikling. Installering af disse programmer kan medføre datatab og/eller udgøre en sikkerhedsrisiko.",
     "by" : "af",
     "licensed" : "licenseret",
     "Documentation:" : "Dokumentation:",
@@ -186,15 +181,17 @@ OC.L10N.register(
     "Update to %s" : "Opdatér til %s",
     "Enable only for specific groups" : "Aktivér kun for udvalgte grupper",
     "Uninstall App" : "Afinstallér app",
+    "Enable experimental apps" : "Aktiver eksperimentale programmer",
     "No apps found for your version" : "Ingen apps fundet til din verion",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hejsa,<br><br>dette er blot en besked om, at du nu har en %s-konto.<br><br>Dit brugernavn: %s<br>Tilgå den: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Hej!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hejsa,\n\ndette er blot en besked om, at du nu har en %s-konto.\n\nDit brugernavn: %s\nTilgå den: %s\n\n",
-    "Administrator Documentation" : "Administrator Dokumentation",
-    "Online Documentation" : "Online dokumentation",
+    "User documentation" : "Brugerdokumentation",
+    "Administrator documentation" : "Administratordokumentation",
+    "Online documentation" : "Online dokumentation",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Kommerciel support",
+    "Issue tracker" : "Problem følger",
+    "Commercial support" : "Kommerciel support",
     "Get the apps to sync your files" : "Hent applikationerne for at synkronisere dine filer",
     "Desktop client" : "Skrivebordsklient",
     "Android app" : "Android-app",
@@ -229,12 +226,6 @@ OC.L10N.register(
     "Issued By" : "Udstedt af",
     "Valid until %s" : "Gyldig indtil %s",
     "Import root certificate" : "Importer rodcertifikat",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer",
-    "Log-in password" : "Log-in kodeord",
-    "Decrypt all Files" : "Dekrypter alle Filer ",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Din krypteringsmøgler er flyttet til et sted med sikkerhedskopier. Hvis noget gik galt kan du genskabe nøglerne. Slet kun nøgler permanent, hvis du er sikker på at alle filer er blevet dekrypteret korrekt.",
-    "Restore Encryption Keys" : "Genopret Krypteringsnøgler",
-    "Delete Encryption Keys" : "Slet Krypteringsnøgler",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Udviklet af {communityopen}ownCloud-fællesskabet{linkclose}, {githubopen}kildekoden{linkclose} er udgivet under licensen {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Vis placering af lageret",
     "Show last log in" : "Vis seneste login",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 018468e8041..62642160765 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Advarsler om sikkerhed og opsætning",
     "Sharing" : "Deling",
     "External Storage" : "Ekstern opbevaring",
+    "Server Side Encryption" : "Kryptering på serverdelen",
     "Cron" : "Cron",
     "Email Server" : "E-mailserver",
     "Log" : "Log",
@@ -10,14 +11,7 @@
     "Authentication error" : "Adgangsfejl",
     "Your full name has been changed." : "Dit fulde navn er blevet ændret.",
     "Unable to change full name" : "Ikke i stand til at ændre dit fulde navn",
-    "Files decrypted successfully" : "Filer dekrypteret med succes",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dine filer kunne ikke dekrypteres. Gennemse din owncloud log eller spørg din administrator",
-    "Couldn't decrypt your files, check your password and try again" : "Dine filer kunne ikke dekrypteres. Check din adgangskode og forsøg igen",
-    "Encryption keys deleted permanently" : "Krypteringsnøgle slettet permanent",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke slette dine nøgler til kryptering permanent, tjek venligst din owncloud.log eller spørg din administrator",
     "Couldn't remove app." : "Kunne ikke fjerne app'en.",
-    "Backups restored successfully" : "Genskabelsen af sikkerhedskopierne blev gennemført",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke genskabe din krypyterings nøgle, se logfilen owncloud.log eller spørg en administrator",
     "Language changed" : "Sprog ændret",
     "Invalid request" : "Ugyldig forespørgsel",
     "Admins can't remove themself from the admin group" : "Administratorer kan ikke fjerne dem selv fra admin gruppen",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Kunne ikke ændre kodeord",
     "Enabled" : "Aktiveret",
     "Not enabled" : "Slået fra",
-    "Recommended" : "Anbefalet",
     "Group already exists." : "Gruppen findes allerede.",
     "Unable to add group." : "Kan ikke tilføje gruppen.",
     "Unable to delete group." : "Kan ikke slette gruppen.",
@@ -55,6 +48,9 @@
     "Add trusted domain" : "Tilføj et domæne som du har tillid til",
     "Sending..." : "Sender...",
     "All" : "Alle",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officielt program er udviklet af ownCloud fællesskabet. Funktionerne spiller en central rolle i ownCloud og kan bruges i produktionsmiljøer.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkendte programmer er udviklet af betroet udviklere som har bestået en let sikkerheds gennemgang. De er aktivt vedligeholdt i et åben kode lager og udviklerne vurdere programmet til at være stabilt for normalt brug.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Dette program er ikke undersøgt for sikkerhedsrisici, det er et nyt program som kan være ustabilt. Installer programmet på eget ansvar.",
     "Please wait...." : "Vent venligst...",
     "Error while disabling app" : "Kunne ikke deaktivere app",
     "Disable" : "Deaktiver",
@@ -74,9 +70,6 @@
     "Strong password" : "Stærkt kodeord",
     "Valid until {date}" : "Gyldig indtil {date}",
     "Delete" : "Slet",
-    "Decrypting files... Please wait, this can take some time." : "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
-    "Delete encryption keys permanently." : "Slet krypteringsnøgler permanent.",
-    "Restore encryption keys." : "Genopret krypteringsnøgler.",
     "Groups" : "Grupper",
     "Unable to delete {objName}" : "Kunne ikke slette {objName}",
     "Error creating group" : "Fejl ved oprettelse af gruppe",
@@ -96,7 +89,6 @@
     "Sync clients" : "Synkroniserings klienter",
     "Personal info" : "Personlige oplysninger",
     "SSL root certificates" : "SSL-rodcertifikater",
-    "Encryption" : "Kryptering",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (alvorlige fejl, fejl, advarsler, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, advarsler, fejl og alvorlige fejl",
     "Warnings, errors and fatal issues" : "Advarsler, fejl og alvorlige fejl",
@@ -137,13 +129,14 @@
     "Last cron job execution: %s." : "Seneste udførsel af cronjob: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Seneste udførsel af cronjob: %s. Der er vist noget galt.",
     "Cron was not executed yet!" : "Cron har ikke kørt endnu!",
+    "Open documentation" : "Åben dokumentation",
     "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæsning",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
-    "Server Side Encryption" : "Kryptering på serverdelen",
     "Enable Server-Side-Encryption" : "Aktiver kryptering på serverdelen",
     "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.",
     "Send mode" : "Tilstand for afsendelse",
+    "Encryption" : "Kryptering",
     "From address" : "Fra adresse",
     "mail" : "mail",
     "Authentication method" : "Godkendelsesmetode",
@@ -173,6 +166,8 @@
     "Version" : "Version",
     "More apps" : "Flere programmer",
     "Developer documentation" : "Dokumentation for udviklere",
+    "Experimental applications ahead" : "Kommende eksperimentale programmer",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Eksperimentale programmer er ikke undersøgt for sikkerheds problemer. Kendt for at være ustabil og stadig under intensiv udvikling. Installering af disse programmer kan medføre datatab og/eller udgøre en sikkerhedsrisiko.",
     "by" : "af",
     "licensed" : "licenseret",
     "Documentation:" : "Dokumentation:",
@@ -184,15 +179,17 @@
     "Update to %s" : "Opdatér til %s",
     "Enable only for specific groups" : "Aktivér kun for udvalgte grupper",
     "Uninstall App" : "Afinstallér app",
+    "Enable experimental apps" : "Aktiver eksperimentale programmer",
     "No apps found for your version" : "Ingen apps fundet til din verion",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hejsa,<br><br>dette er blot en besked om, at du nu har en %s-konto.<br><br>Dit brugernavn: %s<br>Tilgå den: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Hej!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hejsa,\n\ndette er blot en besked om, at du nu har en %s-konto.\n\nDit brugernavn: %s\nTilgå den: %s\n\n",
-    "Administrator Documentation" : "Administrator Dokumentation",
-    "Online Documentation" : "Online dokumentation",
+    "User documentation" : "Brugerdokumentation",
+    "Administrator documentation" : "Administratordokumentation",
+    "Online documentation" : "Online dokumentation",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Kommerciel support",
+    "Issue tracker" : "Problem følger",
+    "Commercial support" : "Kommerciel support",
     "Get the apps to sync your files" : "Hent applikationerne for at synkronisere dine filer",
     "Desktop client" : "Skrivebordsklient",
     "Android app" : "Android-app",
@@ -227,12 +224,6 @@
     "Issued By" : "Udstedt af",
     "Valid until %s" : "Gyldig indtil %s",
     "Import root certificate" : "Importer rodcertifikat",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer",
-    "Log-in password" : "Log-in kodeord",
-    "Decrypt all Files" : "Dekrypter alle Filer ",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Din krypteringsmøgler er flyttet til et sted med sikkerhedskopier. Hvis noget gik galt kan du genskabe nøglerne. Slet kun nøgler permanent, hvis du er sikker på at alle filer er blevet dekrypteret korrekt.",
-    "Restore Encryption Keys" : "Genopret Krypteringsnøgler",
-    "Delete Encryption Keys" : "Slet Krypteringsnøgler",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Udviklet af {communityopen}ownCloud-fællesskabet{linkclose}, {githubopen}kildekoden{linkclose} er udgivet under licensen {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Vis placering af lageret",
     "Show last log in" : "Vis seneste login",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 2cce10d4792..5d2c4b83787 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
     "Sharing" : "Teilen",
     "External Storage" : "Externer Speicher",
+    "Server Side Encryption" : "Serverseitige Verschlüsselung",
     "Cron" : "Cron",
     "Email Server" : "E-Mail-Server",
     "Log" : "Log",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Authentifizierungsfehler",
     "Your full name has been changed." : "Dein vollständiger Name ist geändert worden.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
-    "Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
-    "Couldn't decrypt your files, check your password and try again" : "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut.",
-    "Encryption keys deleted permanently" : "Verschlüsselungsschlüssel dauerhaft gelöscht",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
     "Couldn't remove app." : "Die App konnte nicht entfernt werden.",
-    "Backups restored successfully" : "Backups erfolgreich wiederhergestellt",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
     "Language changed" : "Sprache geändert",
     "Invalid request" : "Fehlerhafte Anfrage",
     "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der Admin-Gruppe löschen.",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Passwort konnte nicht geändert werden",
     "Enabled" : "Aktiviert",
     "Not enabled" : "Nicht aktiviert",
-    "Recommended" : "Empfohlen",
     "Group already exists." : "Gruppe existiert bereits.",
     "Unable to add group." : "Gruppe konnte nicht angelegt werden.",
     "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.",
@@ -57,6 +50,9 @@ OC.L10N.register(
     "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
     "Sending..." : "Senden…",
     "All" : "Alle",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.",
     "Please wait...." : "Bitte warten…",
     "Error while disabling app" : "Beim Deaktivieren der App ist ein Fehler aufgetreten",
     "Disable" : "Deaktivieren",
@@ -76,9 +72,6 @@ OC.L10N.register(
     "Strong password" : "Starkes Passwort",
     "Valid until {date}" : "Gültig bis {date}",
     "Delete" : "Löschen",
-    "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien… Bitte warten, dieser Vorgang kann einige Zeit beanspruchen.",
-    "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
-    "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
     "Groups" : "Gruppen",
     "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
     "Error creating group" : "Fehler beim Erstellen der Gruppe",
@@ -98,7 +91,6 @@ OC.L10N.register(
     "Sync clients" : "Sync-Clients",
     "Personal info" : "Persönliche Informationen",
     "SSL root certificates" : "SSL-Root-Zertifikate",
-    "Encryption" : "Verschlüsselung",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)",
     "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
     "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
@@ -139,13 +131,14 @@ OC.L10N.register(
     "Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
     "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "Open documentation" : "Offene Dokumentation",
     "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Server Side Encryption" : "Serverseitige Verschlüsselung",
     "Enable Server-Side-Encryption" : "Serverseitige Verschlüsselung aktivieren",
     "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
+    "Encryption" : "Verschlüsselung",
     "From address" : "Absenderadresse",
     "mail" : "Mail",
     "Authentication method" : "Authentifizierungsmethode",
@@ -175,6 +168,8 @@ OC.L10N.register(
     "Version" : "Version",
     "More apps" : "Weitere Apps",
     "Developer documentation" : "Dokumentation für Entwickler",
+    "Experimental applications ahead" : "Kommende experimentelle Apps",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.",
     "by" : "von",
     "licensed" : "Lizenziert",
     "Documentation:" : "Dokumentation:",
@@ -186,15 +181,17 @@ OC.L10N.register(
     "Update to %s" : "Aktualisierung auf %s",
     "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren",
     "Uninstall App" : "App deinstallieren",
+    "Enable experimental apps" : "Experimentelle Apps aktivieren",
     "No apps found for your version" : "Es wurden keine Apps für Deine Version gefunden",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.<br><br>Dein Benutzername: %s<br>Greife darauf zu: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Hallo!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.\n\nDein Benutzername: %s\nGreife darauf zu: %s\n\n",
-    "Administrator Documentation" : "Dokumentation für Administratoren",
-    "Online Documentation" : "Online-Dokumentation",
+    "User documentation" : "Dokumentation für Benutzer",
+    "Administrator documentation" : "Dokumentation für Administratoren",
+    "Online documentation" : "Online-Dokumentation",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Kommerzieller Support",
+    "Issue tracker" : "Issue Tracker",
+    "Commercial support" : "Kommerzieller Support",
     "Get the apps to sync your files" : "Lade die Apps zur Synchronisierung Deiner Daten herunter",
     "Desktop client" : "Desktop-Client",
     "Android app" : "Android-App",
@@ -229,12 +226,6 @@ OC.L10N.register(
     "Issued By" : "Ausgestellt von:",
     "Valid until %s" : "Gültig bis %s",
     "Import root certificate" : "Root-Zertifikat importieren",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Die Verschlüsselungsapp ist nicht mehr aktiviert, bitte entschlüssele alle Deine Daten.",
-    "Log-in password" : "Login-Passwort",
-    "Decrypt all Files" : "Alle Dateien entschlüsseln",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Deine Verschlüsselungsschlüssel sind in einen Backup-Speicherort verschoben worden. Sollte ein Fehler aufgetreten sein, kannst Du die Schlüssel wiederherstellen. Lösche sie nur dann endgültig, wenn Du sicher bist, dass alle Dateien ordnungsgemäß entschlüsselt sind.",
-    "Restore Encryption Keys" : "Verschlüsselungsschlüssel wiederherstellen",
-    "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}ownCloud-Community{linkclose}, der {githubopen}Quellcode{linkclose} ist unter den Bedingungen der {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} lizenziert.",
     "Show storage location" : "Speicherort anzeigen",
     "Show last log in" : "Letzte Anmeldung anzeigen",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index d23b89e2ff3..2f338f5ab48 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
     "Sharing" : "Teilen",
     "External Storage" : "Externer Speicher",
+    "Server Side Encryption" : "Serverseitige Verschlüsselung",
     "Cron" : "Cron",
     "Email Server" : "E-Mail-Server",
     "Log" : "Log",
@@ -10,14 +11,7 @@
     "Authentication error" : "Authentifizierungsfehler",
     "Your full name has been changed." : "Dein vollständiger Name ist geändert worden.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
-    "Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
-    "Couldn't decrypt your files, check your password and try again" : "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut.",
-    "Encryption keys deleted permanently" : "Verschlüsselungsschlüssel dauerhaft gelöscht",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
     "Couldn't remove app." : "Die App konnte nicht entfernt werden.",
-    "Backups restored successfully" : "Backups erfolgreich wiederhergestellt",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
     "Language changed" : "Sprache geändert",
     "Invalid request" : "Fehlerhafte Anfrage",
     "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der Admin-Gruppe löschen.",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Passwort konnte nicht geändert werden",
     "Enabled" : "Aktiviert",
     "Not enabled" : "Nicht aktiviert",
-    "Recommended" : "Empfohlen",
     "Group already exists." : "Gruppe existiert bereits.",
     "Unable to add group." : "Gruppe konnte nicht angelegt werden.",
     "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.",
@@ -55,6 +48,9 @@
     "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
     "Sending..." : "Senden…",
     "All" : "Alle",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.",
     "Please wait...." : "Bitte warten…",
     "Error while disabling app" : "Beim Deaktivieren der App ist ein Fehler aufgetreten",
     "Disable" : "Deaktivieren",
@@ -74,9 +70,6 @@
     "Strong password" : "Starkes Passwort",
     "Valid until {date}" : "Gültig bis {date}",
     "Delete" : "Löschen",
-    "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien… Bitte warten, dieser Vorgang kann einige Zeit beanspruchen.",
-    "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
-    "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
     "Groups" : "Gruppen",
     "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
     "Error creating group" : "Fehler beim Erstellen der Gruppe",
@@ -96,7 +89,6 @@
     "Sync clients" : "Sync-Clients",
     "Personal info" : "Persönliche Informationen",
     "SSL root certificates" : "SSL-Root-Zertifikate",
-    "Encryption" : "Verschlüsselung",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)",
     "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
     "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
@@ -137,13 +129,14 @@
     "Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
     "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "Open documentation" : "Offene Dokumentation",
     "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Server Side Encryption" : "Serverseitige Verschlüsselung",
     "Enable Server-Side-Encryption" : "Serverseitige Verschlüsselung aktivieren",
     "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
+    "Encryption" : "Verschlüsselung",
     "From address" : "Absenderadresse",
     "mail" : "Mail",
     "Authentication method" : "Authentifizierungsmethode",
@@ -173,6 +166,8 @@
     "Version" : "Version",
     "More apps" : "Weitere Apps",
     "Developer documentation" : "Dokumentation für Entwickler",
+    "Experimental applications ahead" : "Kommende experimentelle Apps",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.",
     "by" : "von",
     "licensed" : "Lizenziert",
     "Documentation:" : "Dokumentation:",
@@ -184,15 +179,17 @@
     "Update to %s" : "Aktualisierung auf %s",
     "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren",
     "Uninstall App" : "App deinstallieren",
+    "Enable experimental apps" : "Experimentelle Apps aktivieren",
     "No apps found for your version" : "Es wurden keine Apps für Deine Version gefunden",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.<br><br>Dein Benutzername: %s<br>Greife darauf zu: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Hallo!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.\n\nDein Benutzername: %s\nGreife darauf zu: %s\n\n",
-    "Administrator Documentation" : "Dokumentation für Administratoren",
-    "Online Documentation" : "Online-Dokumentation",
+    "User documentation" : "Dokumentation für Benutzer",
+    "Administrator documentation" : "Dokumentation für Administratoren",
+    "Online documentation" : "Online-Dokumentation",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Kommerzieller Support",
+    "Issue tracker" : "Issue Tracker",
+    "Commercial support" : "Kommerzieller Support",
     "Get the apps to sync your files" : "Lade die Apps zur Synchronisierung Deiner Daten herunter",
     "Desktop client" : "Desktop-Client",
     "Android app" : "Android-App",
@@ -227,12 +224,6 @@
     "Issued By" : "Ausgestellt von:",
     "Valid until %s" : "Gültig bis %s",
     "Import root certificate" : "Root-Zertifikat importieren",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Die Verschlüsselungsapp ist nicht mehr aktiviert, bitte entschlüssele alle Deine Daten.",
-    "Log-in password" : "Login-Passwort",
-    "Decrypt all Files" : "Alle Dateien entschlüsseln",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Deine Verschlüsselungsschlüssel sind in einen Backup-Speicherort verschoben worden. Sollte ein Fehler aufgetreten sein, kannst Du die Schlüssel wiederherstellen. Lösche sie nur dann endgültig, wenn Du sicher bist, dass alle Dateien ordnungsgemäß entschlüsselt sind.",
-    "Restore Encryption Keys" : "Verschlüsselungsschlüssel wiederherstellen",
-    "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}ownCloud-Community{linkclose}, der {githubopen}Quellcode{linkclose} ist unter den Bedingungen der {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} lizenziert.",
     "Show storage location" : "Speicherort anzeigen",
     "Show last log in" : "Letzte Anmeldung anzeigen",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index cc2d698916a..afe28c9dae5 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
     "Sharing" : "Teilen",
     "External Storage" : "Externer Speicher",
+    "Server Side Encryption" : "Serverseitige Verschlüsselung",
     "Cron" : "Cron",
     "Email Server" : "E-Mail-Server",
     "Log" : "Log",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Authentifizierungsfehler",
     "Your full name has been changed." : "Ihr vollständiger Name ist geändert worden.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
-    "Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
-    "Couldn't decrypt your files, check your password and try again" : "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut.",
-    "Encryption keys deleted permanently" : "Verschlüsselungsschlüssel dauerhaft gelöscht",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfen Sie bitte Ihre owncloud.log oder frage Deinen Administrator",
     "Couldn't remove app." : "Die App konnte nicht entfernt werden.",
-    "Backups restored successfully" : "Sicherungen erfolgreich wiederhergestellt",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
     "Language changed" : "Sprache geändert",
     "Invalid request" : "Ungültige Anforderung",
     "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Passwort konnte nicht geändert werden",
     "Enabled" : "Aktiviert",
     "Not enabled" : "Nicht aktiviert",
-    "Recommended" : "Empfohlen",
     "Group already exists." : "Gruppe existiert bereits.",
     "Unable to add group." : "Gruppe konnte nicht angelegt werden.",
     "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.",
@@ -57,6 +50,9 @@ OC.L10N.register(
     "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
     "Sending..." : "Wird gesendet…",
     "All" : "Alle",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.",
     "Please wait...." : "Bitte warten…",
     "Error while disabling app" : "Beim Deaktivieren der App ist ein Fehler aufgetreten",
     "Disable" : "Deaktivieren",
@@ -76,9 +72,6 @@ OC.L10N.register(
     "Strong password" : "Starkes Passwort",
     "Valid until {date}" : "Gültig bis {date}",
     "Delete" : "Löschen",
-    "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien… Bitte warten Sie, dieser Vorgang kann einige Zeit beanspruchen.",
-    "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
-    "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
     "Groups" : "Gruppen",
     "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
     "Error creating group" : "Fehler beim Erstellen der Gruppe",
@@ -98,7 +91,6 @@ OC.L10N.register(
     "Sync clients" : "Sync-Clients",
     "Personal info" : "Persönliche Informationen",
     "SSL root certificates" : "SSL-Root-Zertifikate",
-    "Encryption" : "Verschlüsselung",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)",
     "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
     "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
@@ -139,13 +131,14 @@ OC.L10N.register(
     "Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
     "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "Open documentation" : "Offene Dokumentation",
     "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Server Side Encryption" : "Serverseitige Verschlüsselung",
     "Enable Server-Side-Encryption" : "Serverseitige Verschlüsselung aktivieren",
     "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
+    "Encryption" : "Verschlüsselung",
     "From address" : "Absenderadresse",
     "mail" : "Mail",
     "Authentication method" : "Authentifizierungsmethode",
@@ -175,6 +168,8 @@ OC.L10N.register(
     "Version" : "Version",
     "More apps" : "Weitere Apps",
     "Developer documentation" : "Dokumentation für Entwickler",
+    "Experimental applications ahead" : "Kommende experimentelle Apps",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.",
     "by" : "von",
     "licensed" : "Lizenziert",
     "Documentation:" : "Dokumentation:",
@@ -186,15 +181,17 @@ OC.L10N.register(
     "Update to %s" : "Aktualisierung auf %s",
     "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren",
     "Uninstall App" : "App deinstallieren",
+    "Enable experimental apps" : "Experimentelle Apps aktivieren",
     "No apps found for your version" : "Es wurden keine Apps für Ihre Version gefunden",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass Sie jetzt ein %s-Konto haben.<br><br>Ihr Benutzername: %s<br>Greifen Sie darauf zu: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Noch einen schönen Tag!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass Sie jetzt ein %s-Konto haben.\n\nIhr Benutzername: %s\nGreifen Sie darauf zu: %s\n\n",
-    "Administrator Documentation" : "Dokumentation für Administratoren",
-    "Online Documentation" : "Online-Dokumentation",
+    "User documentation" : "Dokumentation für Benutzer",
+    "Administrator documentation" : "Dokumentation für Administratoren",
+    "Online documentation" : "Online-Dokumentation",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Kommerzieller Support",
+    "Issue tracker" : "Issue Tracker",
+    "Commercial support" : "Kommerzieller Support",
     "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
     "Desktop client" : "Desktop-Client",
     "Android app" : "Android-App",
@@ -229,12 +226,6 @@ OC.L10N.register(
     "Issued By" : "Ausgestellt von:",
     "Valid until %s" : "Gültig bis %s",
     "Import root certificate" : "Root-Zertifikat importieren",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Die Verschlüsselungsapp ist nicht mehr aktiviert, bitte entschlüsseln Sie alle Ihre Daten",
-    "Log-in password" : "Login-Passwort",
-    "Decrypt all Files" : "Alle Dateien entschlüsseln",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ihre Verschlüsselungsschlüssel sind in einen Backup-Speicherort verschoben worden. Sollte ein Fehler aufgetreten sein, können Sie die Schlüssel wiederherstellen. Löschen Sie sie nur dann endgültig, wenn Sie sich sicher sind, dass alle Dateien ordnungsgemäß entschlüsselt sind.",
-    "Restore Encryption Keys" : "Verschlüsselungsschlüssel wiederherstellen",
-    "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}ownCloud-Community{linkclose}, der {githubopen}Quellcode{linkclose} ist unter den Bedingungen der {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} lizenziert.",
     "Show storage location" : "Speicherort anzeigen",
     "Show last log in" : "Letzte Anmeldung anzeigen",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index e6c70c60b40..cd411726fb4 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Sicherheits- & Einrichtungswarnungen",
     "Sharing" : "Teilen",
     "External Storage" : "Externer Speicher",
+    "Server Side Encryption" : "Serverseitige Verschlüsselung",
     "Cron" : "Cron",
     "Email Server" : "E-Mail-Server",
     "Log" : "Log",
@@ -10,14 +11,7 @@
     "Authentication error" : "Authentifizierungsfehler",
     "Your full name has been changed." : "Ihr vollständiger Name ist geändert worden.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
-    "Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
-    "Couldn't decrypt your files, check your password and try again" : "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut.",
-    "Encryption keys deleted permanently" : "Verschlüsselungsschlüssel dauerhaft gelöscht",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfen Sie bitte Ihre owncloud.log oder frage Deinen Administrator",
     "Couldn't remove app." : "Die App konnte nicht entfernt werden.",
-    "Backups restored successfully" : "Sicherungen erfolgreich wiederhergestellt",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
     "Language changed" : "Sprache geändert",
     "Invalid request" : "Ungültige Anforderung",
     "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Passwort konnte nicht geändert werden",
     "Enabled" : "Aktiviert",
     "Not enabled" : "Nicht aktiviert",
-    "Recommended" : "Empfohlen",
     "Group already exists." : "Gruppe existiert bereits.",
     "Unable to add group." : "Gruppe konnte nicht angelegt werden.",
     "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.",
@@ -55,6 +48,9 @@
     "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
     "Sending..." : "Wird gesendet…",
     "All" : "Alle",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.",
     "Please wait...." : "Bitte warten…",
     "Error while disabling app" : "Beim Deaktivieren der App ist ein Fehler aufgetreten",
     "Disable" : "Deaktivieren",
@@ -74,9 +70,6 @@
     "Strong password" : "Starkes Passwort",
     "Valid until {date}" : "Gültig bis {date}",
     "Delete" : "Löschen",
-    "Decrypting files... Please wait, this can take some time." : "Entschlüssele Dateien… Bitte warten Sie, dieser Vorgang kann einige Zeit beanspruchen.",
-    "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
-    "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
     "Groups" : "Gruppen",
     "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
     "Error creating group" : "Fehler beim Erstellen der Gruppe",
@@ -96,7 +89,6 @@
     "Sync clients" : "Sync-Clients",
     "Personal info" : "Persönliche Informationen",
     "SSL root certificates" : "SSL-Root-Zertifikate",
-    "Encryption" : "Verschlüsselung",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)",
     "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
     "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
@@ -137,13 +129,14 @@
     "Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
     "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "Open documentation" : "Offene Dokumentation",
     "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Server Side Encryption" : "Serverseitige Verschlüsselung",
     "Enable Server-Side-Encryption" : "Serverseitige Verschlüsselung aktivieren",
     "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
+    "Encryption" : "Verschlüsselung",
     "From address" : "Absenderadresse",
     "mail" : "Mail",
     "Authentication method" : "Authentifizierungsmethode",
@@ -173,6 +166,8 @@
     "Version" : "Version",
     "More apps" : "Weitere Apps",
     "Developer documentation" : "Dokumentation für Entwickler",
+    "Experimental applications ahead" : "Kommende experimentelle Apps",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.",
     "by" : "von",
     "licensed" : "Lizenziert",
     "Documentation:" : "Dokumentation:",
@@ -184,15 +179,17 @@
     "Update to %s" : "Aktualisierung auf %s",
     "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren",
     "Uninstall App" : "App deinstallieren",
+    "Enable experimental apps" : "Experimentelle Apps aktivieren",
     "No apps found for your version" : "Es wurden keine Apps für Ihre Version gefunden",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass Sie jetzt ein %s-Konto haben.<br><br>Ihr Benutzername: %s<br>Greifen Sie darauf zu: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Noch einen schönen Tag!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass Sie jetzt ein %s-Konto haben.\n\nIhr Benutzername: %s\nGreifen Sie darauf zu: %s\n\n",
-    "Administrator Documentation" : "Dokumentation für Administratoren",
-    "Online Documentation" : "Online-Dokumentation",
+    "User documentation" : "Dokumentation für Benutzer",
+    "Administrator documentation" : "Dokumentation für Administratoren",
+    "Online documentation" : "Online-Dokumentation",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Kommerzieller Support",
+    "Issue tracker" : "Issue Tracker",
+    "Commercial support" : "Kommerzieller Support",
     "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
     "Desktop client" : "Desktop-Client",
     "Android app" : "Android-App",
@@ -227,12 +224,6 @@
     "Issued By" : "Ausgestellt von:",
     "Valid until %s" : "Gültig bis %s",
     "Import root certificate" : "Root-Zertifikat importieren",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Die Verschlüsselungsapp ist nicht mehr aktiviert, bitte entschlüsseln Sie alle Ihre Daten",
-    "Log-in password" : "Login-Passwort",
-    "Decrypt all Files" : "Alle Dateien entschlüsseln",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ihre Verschlüsselungsschlüssel sind in einen Backup-Speicherort verschoben worden. Sollte ein Fehler aufgetreten sein, können Sie die Schlüssel wiederherstellen. Löschen Sie sie nur dann endgültig, wenn Sie sich sicher sind, dass alle Dateien ordnungsgemäß entschlüsselt sind.",
-    "Restore Encryption Keys" : "Verschlüsselungsschlüssel wiederherstellen",
-    "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}ownCloud-Community{linkclose}, der {githubopen}Quellcode{linkclose} ist unter den Bedingungen der {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} lizenziert.",
     "Show storage location" : "Speicherort anzeigen",
     "Show last log in" : "Letzte Anmeldung anzeigen",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 895cb07bbf2..3e17e634e3b 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Προειδοποιήσεις ασφάλειας & ρυθμίσεων",
     "Sharing" : "Διαμοιρασμός",
     "External Storage" : "Εξωτερικό Αποθηκευτικό Μέσο",
+    "Server Side Encryption" : "Κρυπτογράφηση από τον Διακομιστή",
     "Cron" : "Cron",
     "Email Server" : "Διακομιστής Email",
     "Log" : "Καταγραφές",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Σφάλμα πιστοποίησης",
     "Your full name has been changed." : "Το πλήρες όνομά σας άλλαξε.",
     "Unable to change full name" : "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας",
-    "Files decrypted successfully" : "Τα αρχεία αποκρυπτογραφήθηκαν με επιτυχία",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων, παρακαλώ ελέγξτε το owncloud.log ή ενημερωθείτε από τον διαχειριστή συστημάτων σας",
-    "Couldn't decrypt your files, check your password and try again" : "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων σας, ελέγξτε τον κωδικό πρόσβασής σας και δοκιμάστε πάλι",
-    "Encryption keys deleted permanently" : "Τα κλειδιά κρυπτογράφησης αφαιρέθηκαν οριστικά",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η οριστική διαγραφή των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
     "Couldn't remove app." : "Αδυναμία αφαίρεσης εφαρμογής.",
-    "Backups restored successfully" : "Η επαναφορά αντιγράφων ασφαλείας έγινε με επιτυχία",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η επαναφορά των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
     "Language changed" : "Η γλώσσα άλλαξε",
     "Invalid request" : "Μη έγκυρο αίτημα",
     "Admins can't remove themself from the admin group" : "Οι διαχειριστές δεν μπορούν να αφαιρέσουν τους εαυτούς τους από την ομάδα των διαχειριστών",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Αδυναμία αλλαγής συνθηματικού",
     "Enabled" : "Ενεργοποιημένο",
     "Not enabled" : "Μη ενεργοποιημένο",
-    "Recommended" : "Προτείνεται",
     "Group already exists." : "Η ομάδα υπάρχει ήδη.",
     "Unable to add group." : "Αδυναμία προσθήκης ομάδας.",
     "Unable to delete group." : "Αδυναμία διαγραφής ομάδας.",
@@ -57,6 +50,9 @@ OC.L10N.register(
     "Add trusted domain" : "Προσθέστε αξιόπιστη περιοχή",
     "Sending..." : "Αποστέλεται...",
     "All" : "Όλες",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Οι επίσημες εφαρμογές αναπτύσσονται από την κοινότητα ownCloud. Προσφέρουν λειτουργικότητα κοντά στο ownCloud και είναι έτοιμες για χρήση.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Οι εγκεκριμένες εφαρμογές αναπτύχθηκαν από αξιόπιστους προγραμματιστές και έχουν περάσει έναν συνοπτικό έλεγχο ασφαλείας. Διατηρούνται ενεργά σε ένα αποθετήριο ανοιχτού κώδικα και οι συντηρητές θεωρούν οτι είναι σταθερές για κανονική χρήση.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Η εφαρμογή αυτή δεν ελέγχεται για θέματα ασφάλειας και είναι νέα ή είναι γνωστό ότι είναι ασταθής. Η εγκατάσταση γίνεται με δική σας ευθύνη.",
     "Please wait...." : "Παρακαλώ περιμένετε...",
     "Error while disabling app" : "Σφάλμα κατά την απενεργοποίηση εισόδου",
     "Disable" : "Απενεργοποίηση",
@@ -76,9 +72,6 @@ OC.L10N.register(
     "Strong password" : "Δυνατό συνθηματικό",
     "Valid until {date}" : "Έγκυρο έως {date}",
     "Delete" : "Διαγραφή",
-    "Decrypting files... Please wait, this can take some time." : "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο.",
-    "Delete encryption keys permanently." : "Οριστική διαγραφή των κλειδιων κρυπτογράφησης.",
-    "Restore encryption keys." : "Επαναφορά των κλειδιών κρυπτογράφησης.",
     "Groups" : "Ομάδες",
     "Unable to delete {objName}" : "Αδυναμία διαγραφής του {objName}",
     "Error creating group" : "Σφάλμα δημιουργίας ομάδας",
@@ -98,7 +91,6 @@ OC.L10N.register(
     "Sync clients" : "Συγχρονισμός πελατών",
     "Personal info" : "Προσωπικές Πληροφορίες",
     "SSL root certificates" : "Πιστοποιητικά SSL root",
-    "Encryption" : "Κρυπτογράφηση",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Όλα (καίρια ζητήματα, σφάλματα, προειδοποιήσεις, πληροφορίες, αποσφαλμάτωση)",
     "Info, warnings, errors and fatal issues" : "Πληροφορίες, προειδοποιήσεις, σφάλματα και καίρια ζητήματα",
     "Warnings, errors and fatal issues" : "Προειδοποιήσεις, σφάλματα και καίρια ζητήματα",
@@ -139,13 +131,14 @@ OC.L10N.register(
     "Last cron job execution: %s." : "Τελευταία εκτέλεση cron job: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Τελευταία εκτέλεση cron job: %s. Κάτι πήγε στραβά.",
     "Cron was not executed yet!" : "Η διεργασία cron δεν έχει εκτελεστεί ακόμα!",
+    "Open documentation" : "Ανοιχτή τεκμηρίωση.",
     "Execute one task with each page loaded" : "Εκτελεί μια διεργασία κάθε φορά που φορτώνεται μια σελίδα",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Το cron.php είναι καταχωρημένο σε μια υπηρεσία webcron ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
-    "Server Side Encryption" : "Κρυπτογράφηση από τον Διακομιστή",
     "Enable Server-Side-Encryption" : "Ενεργοποίηση Κρυπτογράφησης από το Διακομηστή",
     "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
     "Send mode" : "Κατάσταση αποστολής",
+    "Encryption" : "Κρυπτογράφηση",
     "From address" : "Από τη διεύθυνση",
     "mail" : "ταχυδρομείο",
     "Authentication method" : "Μέθοδος πιστοποίησης",
@@ -171,9 +164,12 @@ OC.L10N.register(
     "Performance tuning" : "Ρύθμιση βελτίωσης της απόδοσης",
     "Improving the config.php" : "Βελτίωση του  config.php",
     "Theming" : "Θέματα",
+    "Hardening and security guidance" : "Οδηγίες ασφάλειας και θωράκισης",
     "Version" : "Έκδοση",
     "More apps" : "Περισσότερες εφαρμογές",
     "Developer documentation" : "Τεκμηρίωση προγραμματιστή",
+    "Experimental applications ahead" : "Πειραματικές εφαρμογές",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Οι πειραματικές εφαρμογές δεν ελέγχονται για θέματα ασφάλειας, είναι ασταθείς και υπό συνεχή εξέλιξη.  Η εγκατάσταση τους μπορεί να προκαλέσει απώλεια δεδομένων ή παραβιάσεις της ασφάλειας.",
     "by" : "από",
     "licensed" : "Άδεια",
     "Documentation:" : "Τεκμηρίωση:",
@@ -185,15 +181,17 @@ OC.L10N.register(
     "Update to %s" : "Ενημέρωση σε %s",
     "Enable only for specific groups" : "Ενεργοποίηση μόνο για καθορισμένες ομάδες",
     "Uninstall App" : "Απεγκατάσταση Εφαρμογής",
+    "Enable experimental apps" : "Ενεργοποίηση πειραματικών εφαρμογών",
     "No apps found for your version" : "Δεν βρέθηκαν εφαρμογές για αυτή την έκδοση",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Χαίρεται,<br><br>απλά σας κάνουμε γνωστό ότι διαθέτετε έναν %s λογαριασμό.<br><br>Το όνομά σας είναι: %s<br>Έχετε πρόσβαση: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Χαιρετισμούς!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Χαίρεται, \nαπλά σας κάνουμε γνωστό ότι διαθέτετε έναν %s λογαριασμό.\nΤο όνομά σας είναι: %s\nΈχετε πρόσβαση: %s\n",
-    "Administrator Documentation" : "Τεκμηρίωση Διαχειριστή",
-    "Online Documentation" : "Τεκμηρίωση στο Διαδίκτυο",
+    "User documentation" : "Τεκμηρίωση Χρήστη",
+    "Administrator documentation" : "Τεκμηρίωση Διαχειριστή",
+    "Online documentation" : "Τεκμηρίωση στο Διαδίκτυο",
     "Forum" : "Φόρουμ",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Εμπορική Υποστήριξη",
+    "Issue tracker" : "Ιχνηλάτης ζητημάτων",
+    "Commercial support" : "Εμπορική Υποστήριξη",
     "Get the apps to sync your files" : "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας",
     "Desktop client" : "Πελάτης σταθερού υπολογιστή",
     "Android app" : "Εφαρμογή Android",
@@ -228,12 +226,6 @@ OC.L10N.register(
     "Issued By" : "Έκδόθηκε από",
     "Valid until %s" : "Έγκυρο έως %s",
     "Import root certificate" : "Εισαγωγή Πιστοποιητικού Root",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας",
-    "Log-in password" : "Συνθηματικό εισόδου",
-    "Decrypt all Files" : "Αποκρυπτογράφηση όλων των Αρχείων",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Τα κλειδιά κρυπτογράφησής σας μεταφέρονται σε θέση αντιγράφου ασφαλείας. Αν κάτι πάει στραβά, μπορείτε να τα επαναφέρετε. Διαγράψτε τα οριστικά μόνο αν είστε βέβαιοι ότι όλα τα αρχεία αποκρυπτογραφήθηκαν σωστά.",
-    "Restore Encryption Keys" : "Επαναφορά κλειδιών κρυπτογράφησης",
-    "Delete Encryption Keys" : "Διαγραφή κλειδιών κρυπτογράφησης",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Αναπτύχθηκε από την {communityopen}  κοινότητα του  ownCloud {linkclose}, ο {githubopen}  πηγαίος κώδικας {linkclose} έχει την άδεια της {licenseopen} <abbr title = \"Affero General Public License\"> AGPL </ abbr> {linkclose}.",
     "Show storage location" : "Εμφάνιση τοποθεσίας αποθήκευσης",
     "Show last log in" : "Εμφάνιση τελευταίας εισόδου",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 4e85a3bbd4f..988d9277e75 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Προειδοποιήσεις ασφάλειας & ρυθμίσεων",
     "Sharing" : "Διαμοιρασμός",
     "External Storage" : "Εξωτερικό Αποθηκευτικό Μέσο",
+    "Server Side Encryption" : "Κρυπτογράφηση από τον Διακομιστή",
     "Cron" : "Cron",
     "Email Server" : "Διακομιστής Email",
     "Log" : "Καταγραφές",
@@ -10,14 +11,7 @@
     "Authentication error" : "Σφάλμα πιστοποίησης",
     "Your full name has been changed." : "Το πλήρες όνομά σας άλλαξε.",
     "Unable to change full name" : "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας",
-    "Files decrypted successfully" : "Τα αρχεία αποκρυπτογραφήθηκαν με επιτυχία",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων, παρακαλώ ελέγξτε το owncloud.log ή ενημερωθείτε από τον διαχειριστή συστημάτων σας",
-    "Couldn't decrypt your files, check your password and try again" : "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων σας, ελέγξτε τον κωδικό πρόσβασής σας και δοκιμάστε πάλι",
-    "Encryption keys deleted permanently" : "Τα κλειδιά κρυπτογράφησης αφαιρέθηκαν οριστικά",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η οριστική διαγραφή των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
     "Couldn't remove app." : "Αδυναμία αφαίρεσης εφαρμογής.",
-    "Backups restored successfully" : "Η επαναφορά αντιγράφων ασφαλείας έγινε με επιτυχία",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η επαναφορά των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
     "Language changed" : "Η γλώσσα άλλαξε",
     "Invalid request" : "Μη έγκυρο αίτημα",
     "Admins can't remove themself from the admin group" : "Οι διαχειριστές δεν μπορούν να αφαιρέσουν τους εαυτούς τους από την ομάδα των διαχειριστών",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Αδυναμία αλλαγής συνθηματικού",
     "Enabled" : "Ενεργοποιημένο",
     "Not enabled" : "Μη ενεργοποιημένο",
-    "Recommended" : "Προτείνεται",
     "Group already exists." : "Η ομάδα υπάρχει ήδη.",
     "Unable to add group." : "Αδυναμία προσθήκης ομάδας.",
     "Unable to delete group." : "Αδυναμία διαγραφής ομάδας.",
@@ -55,6 +48,9 @@
     "Add trusted domain" : "Προσθέστε αξιόπιστη περιοχή",
     "Sending..." : "Αποστέλεται...",
     "All" : "Όλες",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Οι επίσημες εφαρμογές αναπτύσσονται από την κοινότητα ownCloud. Προσφέρουν λειτουργικότητα κοντά στο ownCloud και είναι έτοιμες για χρήση.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Οι εγκεκριμένες εφαρμογές αναπτύχθηκαν από αξιόπιστους προγραμματιστές και έχουν περάσει έναν συνοπτικό έλεγχο ασφαλείας. Διατηρούνται ενεργά σε ένα αποθετήριο ανοιχτού κώδικα και οι συντηρητές θεωρούν οτι είναι σταθερές για κανονική χρήση.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Η εφαρμογή αυτή δεν ελέγχεται για θέματα ασφάλειας και είναι νέα ή είναι γνωστό ότι είναι ασταθής. Η εγκατάσταση γίνεται με δική σας ευθύνη.",
     "Please wait...." : "Παρακαλώ περιμένετε...",
     "Error while disabling app" : "Σφάλμα κατά την απενεργοποίηση εισόδου",
     "Disable" : "Απενεργοποίηση",
@@ -74,9 +70,6 @@
     "Strong password" : "Δυνατό συνθηματικό",
     "Valid until {date}" : "Έγκυρο έως {date}",
     "Delete" : "Διαγραφή",
-    "Decrypting files... Please wait, this can take some time." : "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο.",
-    "Delete encryption keys permanently." : "Οριστική διαγραφή των κλειδιων κρυπτογράφησης.",
-    "Restore encryption keys." : "Επαναφορά των κλειδιών κρυπτογράφησης.",
     "Groups" : "Ομάδες",
     "Unable to delete {objName}" : "Αδυναμία διαγραφής του {objName}",
     "Error creating group" : "Σφάλμα δημιουργίας ομάδας",
@@ -96,7 +89,6 @@
     "Sync clients" : "Συγχρονισμός πελατών",
     "Personal info" : "Προσωπικές Πληροφορίες",
     "SSL root certificates" : "Πιστοποιητικά SSL root",
-    "Encryption" : "Κρυπτογράφηση",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Όλα (καίρια ζητήματα, σφάλματα, προειδοποιήσεις, πληροφορίες, αποσφαλμάτωση)",
     "Info, warnings, errors and fatal issues" : "Πληροφορίες, προειδοποιήσεις, σφάλματα και καίρια ζητήματα",
     "Warnings, errors and fatal issues" : "Προειδοποιήσεις, σφάλματα και καίρια ζητήματα",
@@ -137,13 +129,14 @@
     "Last cron job execution: %s." : "Τελευταία εκτέλεση cron job: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Τελευταία εκτέλεση cron job: %s. Κάτι πήγε στραβά.",
     "Cron was not executed yet!" : "Η διεργασία cron δεν έχει εκτελεστεί ακόμα!",
+    "Open documentation" : "Ανοιχτή τεκμηρίωση.",
     "Execute one task with each page loaded" : "Εκτελεί μια διεργασία κάθε φορά που φορτώνεται μια σελίδα",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Το cron.php είναι καταχωρημένο σε μια υπηρεσία webcron ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
-    "Server Side Encryption" : "Κρυπτογράφηση από τον Διακομιστή",
     "Enable Server-Side-Encryption" : "Ενεργοποίηση Κρυπτογράφησης από το Διακομηστή",
     "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
     "Send mode" : "Κατάσταση αποστολής",
+    "Encryption" : "Κρυπτογράφηση",
     "From address" : "Από τη διεύθυνση",
     "mail" : "ταχυδρομείο",
     "Authentication method" : "Μέθοδος πιστοποίησης",
@@ -169,9 +162,12 @@
     "Performance tuning" : "Ρύθμιση βελτίωσης της απόδοσης",
     "Improving the config.php" : "Βελτίωση του  config.php",
     "Theming" : "Θέματα",
+    "Hardening and security guidance" : "Οδηγίες ασφάλειας και θωράκισης",
     "Version" : "Έκδοση",
     "More apps" : "Περισσότερες εφαρμογές",
     "Developer documentation" : "Τεκμηρίωση προγραμματιστή",
+    "Experimental applications ahead" : "Πειραματικές εφαρμογές",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Οι πειραματικές εφαρμογές δεν ελέγχονται για θέματα ασφάλειας, είναι ασταθείς και υπό συνεχή εξέλιξη.  Η εγκατάσταση τους μπορεί να προκαλέσει απώλεια δεδομένων ή παραβιάσεις της ασφάλειας.",
     "by" : "από",
     "licensed" : "Άδεια",
     "Documentation:" : "Τεκμηρίωση:",
@@ -183,15 +179,17 @@
     "Update to %s" : "Ενημέρωση σε %s",
     "Enable only for specific groups" : "Ενεργοποίηση μόνο για καθορισμένες ομάδες",
     "Uninstall App" : "Απεγκατάσταση Εφαρμογής",
+    "Enable experimental apps" : "Ενεργοποίηση πειραματικών εφαρμογών",
     "No apps found for your version" : "Δεν βρέθηκαν εφαρμογές για αυτή την έκδοση",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Χαίρεται,<br><br>απλά σας κάνουμε γνωστό ότι διαθέτετε έναν %s λογαριασμό.<br><br>Το όνομά σας είναι: %s<br>Έχετε πρόσβαση: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Χαιρετισμούς!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Χαίρεται, \nαπλά σας κάνουμε γνωστό ότι διαθέτετε έναν %s λογαριασμό.\nΤο όνομά σας είναι: %s\nΈχετε πρόσβαση: %s\n",
-    "Administrator Documentation" : "Τεκμηρίωση Διαχειριστή",
-    "Online Documentation" : "Τεκμηρίωση στο Διαδίκτυο",
+    "User documentation" : "Τεκμηρίωση Χρήστη",
+    "Administrator documentation" : "Τεκμηρίωση Διαχειριστή",
+    "Online documentation" : "Τεκμηρίωση στο Διαδίκτυο",
     "Forum" : "Φόρουμ",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Εμπορική Υποστήριξη",
+    "Issue tracker" : "Ιχνηλάτης ζητημάτων",
+    "Commercial support" : "Εμπορική Υποστήριξη",
     "Get the apps to sync your files" : "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας",
     "Desktop client" : "Πελάτης σταθερού υπολογιστή",
     "Android app" : "Εφαρμογή Android",
@@ -226,12 +224,6 @@
     "Issued By" : "Έκδόθηκε από",
     "Valid until %s" : "Έγκυρο έως %s",
     "Import root certificate" : "Εισαγωγή Πιστοποιητικού Root",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας",
-    "Log-in password" : "Συνθηματικό εισόδου",
-    "Decrypt all Files" : "Αποκρυπτογράφηση όλων των Αρχείων",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Τα κλειδιά κρυπτογράφησής σας μεταφέρονται σε θέση αντιγράφου ασφαλείας. Αν κάτι πάει στραβά, μπορείτε να τα επαναφέρετε. Διαγράψτε τα οριστικά μόνο αν είστε βέβαιοι ότι όλα τα αρχεία αποκρυπτογραφήθηκαν σωστά.",
-    "Restore Encryption Keys" : "Επαναφορά κλειδιών κρυπτογράφησης",
-    "Delete Encryption Keys" : "Διαγραφή κλειδιών κρυπτογράφησης",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Αναπτύχθηκε από την {communityopen}  κοινότητα του  ownCloud {linkclose}, ο {githubopen}  πηγαίος κώδικας {linkclose} έχει την άδεια της {licenseopen} <abbr title = \"Affero General Public License\"> AGPL </ abbr> {linkclose}.",
     "Show storage location" : "Εμφάνιση τοποθεσίας αποθήκευσης",
     "Show last log in" : "Εμφάνιση τελευταίας εισόδου",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index c7fbba2198c..275e545fbd7 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -10,14 +10,7 @@ OC.L10N.register(
     "Authentication error" : "Authentication error",
     "Your full name has been changed." : "Your full name has been changed.",
     "Unable to change full name" : "Unable to change full name",
-    "Files decrypted successfully" : "Files decrypted successfully",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Couldn't decrypt your files, please check your owncloud.log or ask your administrator",
-    "Couldn't decrypt your files, check your password and try again" : "Couldn't decrypt your files, check your password and try again",
-    "Encryption keys deleted permanently" : "Encryption keys deleted permanently",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator",
     "Couldn't remove app." : "Couldn't remove app.",
-    "Backups restored successfully" : "Backups restored successfully",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator",
     "Language changed" : "Language changed",
     "Invalid request" : "Invalid request",
     "Admins can't remove themself from the admin group" : "Admins can't remove themselves from the admin group",
@@ -32,7 +25,6 @@ OC.L10N.register(
     "Unable to change password" : "Unable to change password",
     "Enabled" : "Enabled",
     "Not enabled" : "Not enabled",
-    "Recommended" : "Recommended",
     "Group already exists." : "Group already exists.",
     "Unable to add group." : "Unable to add group.",
     "Unable to delete group." : "Unable to delete group.",
@@ -74,9 +66,6 @@ OC.L10N.register(
     "Strong password" : "Strong password",
     "Valid until {date}" : "Valid until {date}",
     "Delete" : "Delete",
-    "Decrypting files... Please wait, this can take some time." : "Decrypting files... Please wait, this can take some time.",
-    "Delete encryption keys permanently." : "Delete encryption keys permanently.",
-    "Restore encryption keys." : "Restore encryption keys.",
     "Groups" : "Groups",
     "Unable to delete {objName}" : "Unable to delete {objName}",
     "Error creating group" : "Error creating group",
@@ -96,7 +85,6 @@ OC.L10N.register(
     "Sync clients" : "Sync clients",
     "Personal info" : "Personal info",
     "SSL root certificates" : "SSL root certificates",
-    "Encryption" : "Encryption",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Everything (fatal issues, errors, warnings, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, warnings, errors and fatal issues",
     "Warnings, errors and fatal issues" : "Warnings, errors and fatal issues",
@@ -141,6 +129,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
     "This is used for sending out notifications." : "This is used for sending out notifications.",
     "Send mode" : "Send mode",
+    "Encryption" : "Encryption",
     "From address" : "From address",
     "mail" : "mail",
     "Authentication method" : "Authentication method",
@@ -177,11 +166,7 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Cheers!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n",
-    "Administrator Documentation" : "Administrator Documentation",
-    "Online Documentation" : "Online Documentation",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Commercial Support",
     "Get the apps to sync your files" : "Get the apps to sync your files",
     "Desktop client" : "Desktop client",
     "Android app" : "Android app",
@@ -216,12 +201,6 @@ OC.L10N.register(
     "Issued By" : "Issued By",
     "Valid until %s" : "Valid until %s",
     "Import root certificate" : "Import root certificate",
-    "The encryption app is no longer enabled, please decrypt all your files" : "The encryption app is no longer enabled, please decrypt all your files",
-    "Log-in password" : "Log-in password",
-    "Decrypt all Files" : "Decrypt all Files",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly.",
-    "Restore Encryption Keys" : "Restore Encryption Keys",
-    "Delete Encryption Keys" : "Delete Encryption Keys",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public Licence\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Show storage location",
     "Show last log in" : "Show last log in",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index 13a6e87945c..f14203d6aff 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -8,14 +8,7 @@
     "Authentication error" : "Authentication error",
     "Your full name has been changed." : "Your full name has been changed.",
     "Unable to change full name" : "Unable to change full name",
-    "Files decrypted successfully" : "Files decrypted successfully",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Couldn't decrypt your files, please check your owncloud.log or ask your administrator",
-    "Couldn't decrypt your files, check your password and try again" : "Couldn't decrypt your files, check your password and try again",
-    "Encryption keys deleted permanently" : "Encryption keys deleted permanently",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator",
     "Couldn't remove app." : "Couldn't remove app.",
-    "Backups restored successfully" : "Backups restored successfully",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator",
     "Language changed" : "Language changed",
     "Invalid request" : "Invalid request",
     "Admins can't remove themself from the admin group" : "Admins can't remove themselves from the admin group",
@@ -30,7 +23,6 @@
     "Unable to change password" : "Unable to change password",
     "Enabled" : "Enabled",
     "Not enabled" : "Not enabled",
-    "Recommended" : "Recommended",
     "Group already exists." : "Group already exists.",
     "Unable to add group." : "Unable to add group.",
     "Unable to delete group." : "Unable to delete group.",
@@ -72,9 +64,6 @@
     "Strong password" : "Strong password",
     "Valid until {date}" : "Valid until {date}",
     "Delete" : "Delete",
-    "Decrypting files... Please wait, this can take some time." : "Decrypting files... Please wait, this can take some time.",
-    "Delete encryption keys permanently." : "Delete encryption keys permanently.",
-    "Restore encryption keys." : "Restore encryption keys.",
     "Groups" : "Groups",
     "Unable to delete {objName}" : "Unable to delete {objName}",
     "Error creating group" : "Error creating group",
@@ -94,7 +83,6 @@
     "Sync clients" : "Sync clients",
     "Personal info" : "Personal info",
     "SSL root certificates" : "SSL root certificates",
-    "Encryption" : "Encryption",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Everything (fatal issues, errors, warnings, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, warnings, errors and fatal issues",
     "Warnings, errors and fatal issues" : "Warnings, errors and fatal issues",
@@ -139,6 +127,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
     "This is used for sending out notifications." : "This is used for sending out notifications.",
     "Send mode" : "Send mode",
+    "Encryption" : "Encryption",
     "From address" : "From address",
     "mail" : "mail",
     "Authentication method" : "Authentication method",
@@ -175,11 +164,7 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Cheers!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n",
-    "Administrator Documentation" : "Administrator Documentation",
-    "Online Documentation" : "Online Documentation",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Commercial Support",
     "Get the apps to sync your files" : "Get the apps to sync your files",
     "Desktop client" : "Desktop client",
     "Android app" : "Android app",
@@ -214,12 +199,6 @@
     "Issued By" : "Issued By",
     "Valid until %s" : "Valid until %s",
     "Import root certificate" : "Import root certificate",
-    "The encryption app is no longer enabled, please decrypt all your files" : "The encryption app is no longer enabled, please decrypt all your files",
-    "Log-in password" : "Log-in password",
-    "Decrypt all Files" : "Decrypt all Files",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly.",
-    "Restore Encryption Keys" : "Restore Encryption Keys",
-    "Delete Encryption Keys" : "Delete Encryption Keys",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public Licence\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Show storage location",
     "Show last log in" : "Show last log in",
diff --git a/settings/l10n/eo.js b/settings/l10n/eo.js
index ae9b23a72fb..040615e9d9c 100644
--- a/settings/l10n/eo.js
+++ b/settings/l10n/eo.js
@@ -10,9 +10,6 @@ OC.L10N.register(
     "Authentication error" : "Aŭtentiga eraro",
     "Your full name has been changed." : "Via plena nomo ŝanĝitas.",
     "Unable to change full name" : "Ne eblis ŝanĝi la plenan nomon",
-    "Files decrypted successfully" : "La dosieroj malĉifriĝis sukcese",
-    "Encryption keys deleted permanently" : "La ĉifroklavojn foriĝis por ĉiam.",
-    "Backups restored successfully" : "La savokopioj restaŭriĝis sukcese",
     "Language changed" : "La lingvo estas ŝanĝita",
     "Invalid request" : "Nevalida peto",
     "Admins can't remove themself from the admin group" : "Administrantoj ne povas forigi sin mem el la administra grupo.",
@@ -45,8 +42,6 @@ OC.L10N.register(
     "Good password" : "Bona pasvorto",
     "Strong password" : "Forta pasvorto",
     "Delete" : "Forigi",
-    "Delete encryption keys permanently." : "Forigi ĉifroklavojn por ĉiam.",
-    "Restore encryption keys." : "Restaŭri ĉifroklavojn.",
     "Groups" : "Grupoj",
     "deleted {groupName}" : "{groupName} foriĝis",
     "undo" : "malfari",
@@ -58,7 +53,6 @@ OC.L10N.register(
     "A valid password must be provided" : "Valida pasvorto devas proviziĝi",
     "__language_name__" : "Esperanto",
     "SSL root certificates" : "Radikaj SSL-atestoj",
-    "Encryption" : "Ĉifrado",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Ĉio (fatalaĵoj, eraroj, avertoj, informoj, sencimigaj mesaĝoj)",
     "Info, warnings, errors and fatal issues" : "Informoj, avertoj, eraroj kaj fatalaĵoj",
     "Warnings, errors and fatal issues" : "Avertoj, eraroj kaj fatalaĵoj",
@@ -74,6 +68,7 @@ OC.L10N.register(
     "days" : "tagoj",
     "Allow resharing" : "Kapabligi rekunhavigon",
     "Send mode" : "Sendi pli",
+    "Encryption" : "Ĉifrado",
     "From address" : "El adreso",
     "mail" : "retpoŝto",
     "Authentication method" : "Aŭtentiga metodo",
@@ -94,11 +89,7 @@ OC.L10N.register(
     "Admin Documentation" : "Administra dokumentaro",
     "Enable only for specific groups" : "Kapabligi nur por specifajn grupojn",
     "Uninstall App" : "Malinstali aplikaĵon",
-    "Administrator Documentation" : "Dokumentaro por administrantoj",
-    "Online Documentation" : "Reta dokumentaro",
     "Forum" : "Forumo",
-    "Bugtracker" : "Cimoraportejo",
-    "Commercial Support" : "Komerca subteno",
     "Get the apps to sync your files" : "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vi uzas <strong>%s</strong> el la disponeblaj <strong>%s</strong>",
     "Password" : "Pasvorto",
@@ -117,11 +108,6 @@ OC.L10N.register(
     "Choose as profile image" : "Elekti kiel profilan bildon",
     "Language" : "Lingvo",
     "Help translate" : "Helpu traduki",
-    "Log-in password" : "Ensaluta pasvorto",
-    "Decrypt all Files" : "Malĉifri ĉiujn dosierojn",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Viaj ĉifroklavoj moviĝis al savokopia loko. Se io malsukcesas, vi povas restaŭri la klavojn. Nur forigu ilin porĉiame se vi certas, ke ĉiuj dosieroj malĉifriĝis korekte.",
-    "Restore Encryption Keys" : "Restaŭri ĉifroklavojn",
-    "Delete Encryption Keys" : "Forigi ĉifroklavojn",
     "Username" : "Uzantonomo",
     "Create" : "Krei",
     "Add Group" : "Aldoni grupon",
diff --git a/settings/l10n/eo.json b/settings/l10n/eo.json
index 54c46fe9def..d77c0a38894 100644
--- a/settings/l10n/eo.json
+++ b/settings/l10n/eo.json
@@ -8,9 +8,6 @@
     "Authentication error" : "Aŭtentiga eraro",
     "Your full name has been changed." : "Via plena nomo ŝanĝitas.",
     "Unable to change full name" : "Ne eblis ŝanĝi la plenan nomon",
-    "Files decrypted successfully" : "La dosieroj malĉifriĝis sukcese",
-    "Encryption keys deleted permanently" : "La ĉifroklavojn foriĝis por ĉiam.",
-    "Backups restored successfully" : "La savokopioj restaŭriĝis sukcese",
     "Language changed" : "La lingvo estas ŝanĝita",
     "Invalid request" : "Nevalida peto",
     "Admins can't remove themself from the admin group" : "Administrantoj ne povas forigi sin mem el la administra grupo.",
@@ -43,8 +40,6 @@
     "Good password" : "Bona pasvorto",
     "Strong password" : "Forta pasvorto",
     "Delete" : "Forigi",
-    "Delete encryption keys permanently." : "Forigi ĉifroklavojn por ĉiam.",
-    "Restore encryption keys." : "Restaŭri ĉifroklavojn.",
     "Groups" : "Grupoj",
     "deleted {groupName}" : "{groupName} foriĝis",
     "undo" : "malfari",
@@ -56,7 +51,6 @@
     "A valid password must be provided" : "Valida pasvorto devas proviziĝi",
     "__language_name__" : "Esperanto",
     "SSL root certificates" : "Radikaj SSL-atestoj",
-    "Encryption" : "Ĉifrado",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Ĉio (fatalaĵoj, eraroj, avertoj, informoj, sencimigaj mesaĝoj)",
     "Info, warnings, errors and fatal issues" : "Informoj, avertoj, eraroj kaj fatalaĵoj",
     "Warnings, errors and fatal issues" : "Avertoj, eraroj kaj fatalaĵoj",
@@ -72,6 +66,7 @@
     "days" : "tagoj",
     "Allow resharing" : "Kapabligi rekunhavigon",
     "Send mode" : "Sendi pli",
+    "Encryption" : "Ĉifrado",
     "From address" : "El adreso",
     "mail" : "retpoŝto",
     "Authentication method" : "Aŭtentiga metodo",
@@ -92,11 +87,7 @@
     "Admin Documentation" : "Administra dokumentaro",
     "Enable only for specific groups" : "Kapabligi nur por specifajn grupojn",
     "Uninstall App" : "Malinstali aplikaĵon",
-    "Administrator Documentation" : "Dokumentaro por administrantoj",
-    "Online Documentation" : "Reta dokumentaro",
     "Forum" : "Forumo",
-    "Bugtracker" : "Cimoraportejo",
-    "Commercial Support" : "Komerca subteno",
     "Get the apps to sync your files" : "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vi uzas <strong>%s</strong> el la disponeblaj <strong>%s</strong>",
     "Password" : "Pasvorto",
@@ -115,11 +106,6 @@
     "Choose as profile image" : "Elekti kiel profilan bildon",
     "Language" : "Lingvo",
     "Help translate" : "Helpu traduki",
-    "Log-in password" : "Ensaluta pasvorto",
-    "Decrypt all Files" : "Malĉifri ĉiujn dosierojn",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Viaj ĉifroklavoj moviĝis al savokopia loko. Se io malsukcesas, vi povas restaŭri la klavojn. Nur forigu ilin porĉiame se vi certas, ke ĉiuj dosieroj malĉifriĝis korekte.",
-    "Restore Encryption Keys" : "Restaŭri ĉifroklavojn",
-    "Delete Encryption Keys" : "Forigi ĉifroklavojn",
     "Username" : "Uzantonomo",
     "Create" : "Krei",
     "Add Group" : "Aldoni grupon",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 972f528f759..5400666b2b1 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Avisos de seguidad y configuración",
     "Sharing" : "Compartiendo",
     "External Storage" : "Almacenamiento externo",
+    "Server Side Encryption" : "Cifrado en el servidor",
     "Cron" : "Cron",
     "Email Server" : "Servidor de correo electrónico",
     "Log" : "Registro",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Error de autenticación",
     "Your full name has been changed." : "Se ha cambiado su nombre completo.",
     "Unable to change full name" : "No se puede cambiar el nombre completo",
-    "Files decrypted successfully" : "Los archivos fueron descifrados",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con su administrador",
-    "Couldn't decrypt your files, check your password and try again" : "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo",
-    "Encryption keys deleted permanently" : "Claves de cifrado eliminadas permanentemente",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "No se pudieron eliminar permanentemente sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
     "Couldn't remove app." : "No se pudo eliminar la aplicación.",
-    "Backups restored successfully" : "Copia de seguridad restaurada",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "No se pudieron restarurar sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
     "Language changed" : "Idioma cambiado",
     "Invalid request" : "Petición no válida",
     "Admins can't remove themself from the admin group" : "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "No se ha podido cambiar la contraseña",
     "Enabled" : "Habilitado",
     "Not enabled" : "No habilitado",
-    "Recommended" : "Recomendado",
     "Group already exists." : "El grupo ya existe.",
     "Unable to add group." : "No se pudo agregar el grupo.",
     "Unable to delete group." : "No se pudo eliminar el grupo.",
@@ -76,9 +69,6 @@ OC.L10N.register(
     "Strong password" : "Contraseña muy buena",
     "Valid until {date}" : "Válido hasta {date}",
     "Delete" : "Eliminar",
-    "Decrypting files... Please wait, this can take some time." : "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
-    "Delete encryption keys permanently." : "Eliminar claves de cifrado permanentemente.",
-    "Restore encryption keys." : "Restaurar claves de cifrado.",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "No es posible eliminar {objName}",
     "Error creating group" : "Error al crear un grupo",
@@ -98,7 +88,6 @@ OC.L10N.register(
     "Sync clients" : "Sincronizar clientes",
     "Personal info" : "Información personal",
     "SSL root certificates" : "Certificados raíz SSL",
-    "Encryption" : "Cifrado",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
     "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
     "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales",
@@ -142,10 +131,10 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
-    "Server Side Encryption" : "Cifrado en el servidor",
     "Enable Server-Side-Encryption" : "Habilitar cifrado en el servidor",
     "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.",
     "Send mode" : "Modo de envío",
+    "Encryption" : "Cifrado",
     "From address" : "Desde la dirección",
     "mail" : "correo electrónico",
     "Authentication method" : "Método de autenticación",
@@ -190,11 +179,7 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "¿Qué tal?,<br><br>este mensaje es para hacerle saber que ahora tiene una %s cuenta.<br><br>Su nombre de usuario: %s<br>Acceda en: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "¡Saludos!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hola, ¿qué tal?,\n\nEste mensaje es para hacerle saber que ahora tiene una cuenta %s.\n\nSu nombre de usuario: %s\nAcceda en: %s\n\n",
-    "Administrator Documentation" : "Documentación de administrador",
-    "Online Documentation" : "Documentación en línea",
     "Forum" : "Foro",
-    "Bugtracker" : "Rastreador de fallos",
-    "Commercial Support" : "Soporte comercial",
     "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
     "Desktop client" : "Cliente de escritorio",
     "Android app" : "Aplicación de Android",
@@ -229,12 +214,6 @@ OC.L10N.register(
     "Issued By" : "Emitido por",
     "Valid until %s" : "Válido hasta %s",
     "Import root certificate" : "Importar certificado raíz",
-    "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
-    "Log-in password" : "Contraseña de acceso",
-    "Decrypt all Files" : "Descifrar archivos",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Sus claves de cifrado se archivarán en una localización segura. Así en caso de que algo fuese mal podrá recuperan sus claves. Borre sus claves de cifrado permanentemente solamente si esta seguro de que sus archivos han sido descifrados correctamente.",
-    "Restore Encryption Keys" : "Restaurar claves de cifrado",
-    "Delete Encryption Keys" : "Eliminar claves de cifrado",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desarrollado por la {communityopen}comunidad Owncloud{linkclose}, el {githubopen}código fuente{linkclose} está licenciado bajo {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostrar la ubicación del almacenamiento",
     "Show last log in" : "Mostrar el último inicio de sesión",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 6ef77db4346..7a787fa7937 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Avisos de seguidad y configuración",
     "Sharing" : "Compartiendo",
     "External Storage" : "Almacenamiento externo",
+    "Server Side Encryption" : "Cifrado en el servidor",
     "Cron" : "Cron",
     "Email Server" : "Servidor de correo electrónico",
     "Log" : "Registro",
@@ -10,14 +11,7 @@
     "Authentication error" : "Error de autenticación",
     "Your full name has been changed." : "Se ha cambiado su nombre completo.",
     "Unable to change full name" : "No se puede cambiar el nombre completo",
-    "Files decrypted successfully" : "Los archivos fueron descifrados",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con su administrador",
-    "Couldn't decrypt your files, check your password and try again" : "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo",
-    "Encryption keys deleted permanently" : "Claves de cifrado eliminadas permanentemente",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "No se pudieron eliminar permanentemente sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
     "Couldn't remove app." : "No se pudo eliminar la aplicación.",
-    "Backups restored successfully" : "Copia de seguridad restaurada",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "No se pudieron restarurar sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
     "Language changed" : "Idioma cambiado",
     "Invalid request" : "Petición no válida",
     "Admins can't remove themself from the admin group" : "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
@@ -32,7 +26,6 @@
     "Unable to change password" : "No se ha podido cambiar la contraseña",
     "Enabled" : "Habilitado",
     "Not enabled" : "No habilitado",
-    "Recommended" : "Recomendado",
     "Group already exists." : "El grupo ya existe.",
     "Unable to add group." : "No se pudo agregar el grupo.",
     "Unable to delete group." : "No se pudo eliminar el grupo.",
@@ -74,9 +67,6 @@
     "Strong password" : "Contraseña muy buena",
     "Valid until {date}" : "Válido hasta {date}",
     "Delete" : "Eliminar",
-    "Decrypting files... Please wait, this can take some time." : "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
-    "Delete encryption keys permanently." : "Eliminar claves de cifrado permanentemente.",
-    "Restore encryption keys." : "Restaurar claves de cifrado.",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "No es posible eliminar {objName}",
     "Error creating group" : "Error al crear un grupo",
@@ -96,7 +86,6 @@
     "Sync clients" : "Sincronizar clientes",
     "Personal info" : "Información personal",
     "SSL root certificates" : "Certificados raíz SSL",
-    "Encryption" : "Cifrado",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
     "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
     "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales",
@@ -140,10 +129,10 @@
     "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
-    "Server Side Encryption" : "Cifrado en el servidor",
     "Enable Server-Side-Encryption" : "Habilitar cifrado en el servidor",
     "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.",
     "Send mode" : "Modo de envío",
+    "Encryption" : "Cifrado",
     "From address" : "Desde la dirección",
     "mail" : "correo electrónico",
     "Authentication method" : "Método de autenticación",
@@ -188,11 +177,7 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "¿Qué tal?,<br><br>este mensaje es para hacerle saber que ahora tiene una %s cuenta.<br><br>Su nombre de usuario: %s<br>Acceda en: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "¡Saludos!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hola, ¿qué tal?,\n\nEste mensaje es para hacerle saber que ahora tiene una cuenta %s.\n\nSu nombre de usuario: %s\nAcceda en: %s\n\n",
-    "Administrator Documentation" : "Documentación de administrador",
-    "Online Documentation" : "Documentación en línea",
     "Forum" : "Foro",
-    "Bugtracker" : "Rastreador de fallos",
-    "Commercial Support" : "Soporte comercial",
     "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
     "Desktop client" : "Cliente de escritorio",
     "Android app" : "Aplicación de Android",
@@ -227,12 +212,6 @@
     "Issued By" : "Emitido por",
     "Valid until %s" : "Válido hasta %s",
     "Import root certificate" : "Importar certificado raíz",
-    "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
-    "Log-in password" : "Contraseña de acceso",
-    "Decrypt all Files" : "Descifrar archivos",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Sus claves de cifrado se archivarán en una localización segura. Así en caso de que algo fuese mal podrá recuperan sus claves. Borre sus claves de cifrado permanentemente solamente si esta seguro de que sus archivos han sido descifrados correctamente.",
-    "Restore Encryption Keys" : "Restaurar claves de cifrado",
-    "Delete Encryption Keys" : "Eliminar claves de cifrado",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desarrollado por la {communityopen}comunidad Owncloud{linkclose}, el {githubopen}código fuente{linkclose} está licenciado bajo {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostrar la ubicación del almacenamiento",
     "Show last log in" : "Mostrar el último inicio de sesión",
diff --git a/settings/l10n/es_AR.js b/settings/l10n/es_AR.js
index 6dad931a95e..fed0f97de08 100644
--- a/settings/l10n/es_AR.js
+++ b/settings/l10n/es_AR.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Authentication error" : "Error al autenticar",
     "Your full name has been changed." : "Su nombre completo ha sido cambiado.",
     "Unable to change full name" : "Imposible cambiar el nombre completo",
-    "Files decrypted successfully" : "Archivos des-encriptados correctamente",
     "Language changed" : "Idioma cambiado",
     "Invalid request" : "Pedido inválido",
     "Admins can't remove themself from the admin group" : "Los administradores no se pueden quitar a si mismos del grupo administrador. ",
@@ -45,7 +44,6 @@ OC.L10N.register(
     "Good password" : "Buena contraseña. ",
     "Strong password" : "Contraseña fuerte.",
     "Delete" : "Borrar",
-    "Decrypting files... Please wait, this can take some time." : "Desencriptando archivos... Por favor espere, esto puede tardar.",
     "Groups" : "Grupos",
     "undo" : "deshacer",
     "never" : "nunca",
@@ -55,7 +53,6 @@ OC.L10N.register(
     "A valid password must be provided" : "Debe ingresar una contraseña válida",
     "__language_name__" : "Castellano (Argentina)",
     "SSL root certificates" : "certificados SSL raíz",
-    "Encryption" : "Encriptación",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (notificaciones fatales, errores, advertencias, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, advertencias, errores y notificaciones fatales",
     "Warnings, errors and fatal issues" : "Advertencias, errores y notificaciones fatales",
@@ -78,6 +75,7 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado en el servicio webcron para llamarlo cada 15 minutos usando http.",
     "This is used for sending out notifications." : "Esto es usado para enviar notificaciones.",
     "Send mode" : "Modo de envio",
+    "Encryption" : "Encriptación",
     "From address" : "Dirección remitente",
     "Authentication method" : "Método de autenticación",
     "Authentication required" : "Autentificación requerida",
@@ -97,11 +95,7 @@ OC.L10N.register(
     "User Documentation" : "Documentación de Usuario",
     "Admin Documentation" : "Documentación de Administrador.",
     "Cheers!" : "¡Saludos!",
-    "Administrator Documentation" : "Documentación de Administrador",
-    "Online Documentation" : "Documentación en línea",
     "Forum" : "Foro",
-    "Bugtracker" : "Informar errores",
-    "Commercial Support" : "Soporte comercial",
     "Get the apps to sync your files" : "Obtené Apps para sincronizar tus archivos",
     "Show First Run Wizard again" : "Mostrar de nuevo el asistente de primera ejecución",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usás <strong>%s</strong>  de los <strong>%s</strong> disponibles",
@@ -123,9 +117,6 @@ OC.L10N.register(
     "Choose as profile image" : "Elegir como imagen de perfil",
     "Language" : "Idioma",
     "Help translate" : "Ayudanos a traducir",
-    "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos.",
-    "Log-in password" : "Clave de acceso",
-    "Decrypt all Files" : "Desencriptar todos los archivos",
     "Username" : "Nombre de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de contraseña de administrador",
diff --git a/settings/l10n/es_AR.json b/settings/l10n/es_AR.json
index 27b4b773431..24ae430aa1c 100644
--- a/settings/l10n/es_AR.json
+++ b/settings/l10n/es_AR.json
@@ -8,7 +8,6 @@
     "Authentication error" : "Error al autenticar",
     "Your full name has been changed." : "Su nombre completo ha sido cambiado.",
     "Unable to change full name" : "Imposible cambiar el nombre completo",
-    "Files decrypted successfully" : "Archivos des-encriptados correctamente",
     "Language changed" : "Idioma cambiado",
     "Invalid request" : "Pedido inválido",
     "Admins can't remove themself from the admin group" : "Los administradores no se pueden quitar a si mismos del grupo administrador. ",
@@ -43,7 +42,6 @@
     "Good password" : "Buena contraseña. ",
     "Strong password" : "Contraseña fuerte.",
     "Delete" : "Borrar",
-    "Decrypting files... Please wait, this can take some time." : "Desencriptando archivos... Por favor espere, esto puede tardar.",
     "Groups" : "Grupos",
     "undo" : "deshacer",
     "never" : "nunca",
@@ -53,7 +51,6 @@
     "A valid password must be provided" : "Debe ingresar una contraseña válida",
     "__language_name__" : "Castellano (Argentina)",
     "SSL root certificates" : "certificados SSL raíz",
-    "Encryption" : "Encriptación",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (notificaciones fatales, errores, advertencias, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, advertencias, errores y notificaciones fatales",
     "Warnings, errors and fatal issues" : "Advertencias, errores y notificaciones fatales",
@@ -76,6 +73,7 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado en el servicio webcron para llamarlo cada 15 minutos usando http.",
     "This is used for sending out notifications." : "Esto es usado para enviar notificaciones.",
     "Send mode" : "Modo de envio",
+    "Encryption" : "Encriptación",
     "From address" : "Dirección remitente",
     "Authentication method" : "Método de autenticación",
     "Authentication required" : "Autentificación requerida",
@@ -95,11 +93,7 @@
     "User Documentation" : "Documentación de Usuario",
     "Admin Documentation" : "Documentación de Administrador.",
     "Cheers!" : "¡Saludos!",
-    "Administrator Documentation" : "Documentación de Administrador",
-    "Online Documentation" : "Documentación en línea",
     "Forum" : "Foro",
-    "Bugtracker" : "Informar errores",
-    "Commercial Support" : "Soporte comercial",
     "Get the apps to sync your files" : "Obtené Apps para sincronizar tus archivos",
     "Show First Run Wizard again" : "Mostrar de nuevo el asistente de primera ejecución",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usás <strong>%s</strong>  de los <strong>%s</strong> disponibles",
@@ -121,9 +115,6 @@
     "Choose as profile image" : "Elegir como imagen de perfil",
     "Language" : "Idioma",
     "Help translate" : "Ayudanos a traducir",
-    "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos.",
-    "Log-in password" : "Clave de acceso",
-    "Decrypt all Files" : "Desencriptar todos los archivos",
     "Username" : "Nombre de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de contraseña de administrador",
diff --git a/settings/l10n/es_MX.js b/settings/l10n/es_MX.js
index bfbd94c26a6..0ee36101c81 100644
--- a/settings/l10n/es_MX.js
+++ b/settings/l10n/es_MX.js
@@ -33,7 +33,6 @@ OC.L10N.register(
     "Updated" : "Actualizado",
     "Select a profile picture" : "Seleccionar una imagen de perfil",
     "Delete" : "Eliminar",
-    "Decrypting files... Please wait, this can take some time." : "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
     "Groups" : "Grupos",
     "undo" : "deshacer",
     "never" : "nunca",
@@ -43,7 +42,6 @@ OC.L10N.register(
     "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
     "__language_name__" : "Español (México)",
     "SSL root certificates" : "Certificados raíz SSL",
-    "Encryption" : "Cifrado",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
     "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
     "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales",
@@ -58,6 +56,7 @@ OC.L10N.register(
     "Allow resharing" : "Permitir re-compartición",
     "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
+    "Encryption" : "Cifrado",
     "Server address" : "Dirección del servidor",
     "Port" : "Puerto",
     "Log level" : "Nivel de registro",
@@ -67,11 +66,7 @@ OC.L10N.register(
     "by" : "por",
     "User Documentation" : "Documentación de usuario",
     "Cheers!" : "¡Saludos!",
-    "Administrator Documentation" : "Documentación de administrador",
-    "Online Documentation" : "Documentación en línea",
     "Forum" : "Foro",
-    "Bugtracker" : "Rastreador de fallos",
-    "Commercial Support" : "Soporte comercial",
     "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
     "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
@@ -92,9 +87,6 @@ OC.L10N.register(
     "Choose as profile image" : "Seleccionar como imagen de perfil",
     "Language" : "Idioma",
     "Help translate" : "Ayúdanos a traducir",
-    "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
-    "Log-in password" : "Contraseña de acceso",
-    "Decrypt all Files" : "Descifrar archivos",
     "Username" : "Nombre de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
diff --git a/settings/l10n/es_MX.json b/settings/l10n/es_MX.json
index 810d1ea693a..fa8884d2502 100644
--- a/settings/l10n/es_MX.json
+++ b/settings/l10n/es_MX.json
@@ -31,7 +31,6 @@
     "Updated" : "Actualizado",
     "Select a profile picture" : "Seleccionar una imagen de perfil",
     "Delete" : "Eliminar",
-    "Decrypting files... Please wait, this can take some time." : "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
     "Groups" : "Grupos",
     "undo" : "deshacer",
     "never" : "nunca",
@@ -41,7 +40,6 @@
     "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
     "__language_name__" : "Español (México)",
     "SSL root certificates" : "Certificados raíz SSL",
-    "Encryption" : "Cifrado",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
     "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
     "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales",
@@ -56,6 +54,7 @@
     "Allow resharing" : "Permitir re-compartición",
     "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
+    "Encryption" : "Cifrado",
     "Server address" : "Dirección del servidor",
     "Port" : "Puerto",
     "Log level" : "Nivel de registro",
@@ -65,11 +64,7 @@
     "by" : "por",
     "User Documentation" : "Documentación de usuario",
     "Cheers!" : "¡Saludos!",
-    "Administrator Documentation" : "Documentación de administrador",
-    "Online Documentation" : "Documentación en línea",
     "Forum" : "Foro",
-    "Bugtracker" : "Rastreador de fallos",
-    "Commercial Support" : "Soporte comercial",
     "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
     "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
@@ -90,9 +85,6 @@
     "Choose as profile image" : "Seleccionar como imagen de perfil",
     "Language" : "Idioma",
     "Help translate" : "Ayúdanos a traducir",
-    "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
-    "Log-in password" : "Contraseña de acceso",
-    "Decrypt all Files" : "Descifrar archivos",
     "Username" : "Nombre de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index 0a470aab5c7..3d9e2a942bb 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -10,14 +10,7 @@ OC.L10N.register(
     "Authentication error" : "Autentimise viga",
     "Your full name has been changed." : "Sinu täispikk nimi on muudetud.",
     "Unable to change full name" : "Täispika nime muutmine ebaõnnestus",
-    "Files decrypted successfully" : "Failide krüpteerimine õnnestus",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ei suutnud faile dekrüpteerida, palun kontrolli oma owncloud.log-i või küsi nõu administraatorilt",
-    "Couldn't decrypt your files, check your password and try again" : "Ei suutnud failde dekrüpteerida, kontrolli parooli ja proovi uuesti",
-    "Encryption keys deleted permanently" : "Krüpteerimisvõtmed kustutatud lõplikult",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ei suutnud lõplikult kustutada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või pöördu oma süsteemihalduri poole.",
     "Couldn't remove app." : "Ei suutnud rakendit eemaldada.",
-    "Backups restored successfully" : "Varukoopiad taastatud edukalt.",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ei suutnud taastada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või  pöördu oma süsteemihalduri poole.",
     "Language changed" : "Keel on muudetud",
     "Invalid request" : "Vigane päring",
     "Admins can't remove themself from the admin group" : "Administraatorid ei saa ise end admin grupist eemaldada",
@@ -31,7 +24,6 @@ OC.L10N.register(
     "Unable to change password" : "Ei suuda parooli muuta",
     "Enabled" : "Sisse lülitatud",
     "Not enabled" : "Pole sisse lülitatud",
-    "Recommended" : "Soovitatud",
     "Saved" : "Salvestatud",
     "test email settings" : "testi e-posti seadeid",
     "Email sent" : "E-kiri on saadetud",
@@ -60,9 +52,6 @@ OC.L10N.register(
     "Strong password" : "Väga hea parool",
     "Valid until {date}" : "Kehtib kuni {date}",
     "Delete" : "Kustuta",
-    "Decrypting files... Please wait, this can take some time." : "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
-    "Delete encryption keys permanently." : "Kustuta krüpteerimisvõtmed lõplikult",
-    "Restore encryption keys." : "Taasta krüpteerimisvõtmed.",
     "Groups" : "Grupid",
     "Unable to delete {objName}" : "Ei suuda kustutada {objName}",
     "Error creating group" : "Viga grupi loomisel",
@@ -78,7 +67,6 @@ OC.L10N.register(
     "A valid password must be provided" : "Sisesta nõuetele vastav parool",
     "__language_name__" : "Eesti",
     "SSL root certificates" : "SSL root sertifikaadid",
-    "Encryption" : "Krüpteerimine",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Kõik (tõsised probleemid, veateated, hoiatused, info, veatuvastus)",
     "Info, warnings, errors and fatal issues" : "Info, hoiatused, veateted ja tõsised probleemid",
     "Warnings, errors and fatal issues" : "Hoiatused, veateated ja tõsised probleemid",
@@ -114,6 +102,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti järel.",
     "This is used for sending out notifications." : "Seda kasutatakse teadete välja saatmiseks.",
     "Send mode" : "Saatmise viis",
+    "Encryption" : "Krüpteerimine",
     "From address" : "Saatja aadress",
     "mail" : "e-mail",
     "Authentication method" : "Autentimise meetod",
@@ -140,11 +129,7 @@ OC.L10N.register(
     "Enable only for specific groups" : "Luba ainult kindlad grupid",
     "Uninstall App" : "Eemada rakend",
     "Cheers!" : "Terekest!",
-    "Administrator Documentation" : "Administraatori dokumentatsioon",
-    "Online Documentation" : "Online dokumentatsioon",
     "Forum" : "Foorum",
-    "Bugtracker" : "Vigade nimekiri",
-    "Commercial Support" : "Tasuline kasutajatugi",
     "Get the apps to sync your files" : "Hangi rakendusi failide sünkroniseerimiseks",
     "Show First Run Wizard again" : "Näita veelkord Esmase Käivituse Juhendajat",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>",
@@ -170,12 +155,6 @@ OC.L10N.register(
     "Valid until" : "Kehtib kuni",
     "Issued By" : "isas",
     "Valid until %s" : "Kehtib kuni %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid",
-    "Log-in password" : "Sisselogimise parool",
-    "Decrypt all Files" : "Dekrüpteeri kõik failid",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Sinu krüpteerimisvõtmed on tõstetud varukoopiasse. Kui midagi läheb valesti, siis saad võtmed taastada. Kustuta lõplikult ainult juhul kui oled kindel, et failid on dekrüteeritud korrektselt.",
-    "Restore Encryption Keys" : "Taasta krüpteerimisvõtmed",
-    "Delete Encryption Keys" : "Kustuta krüpteerimisvõtmed",
     "Show storage location" : "Näita salvestusruumi asukohta",
     "Show last log in" : "Viimane sisselogimine",
     "Username" : "Kasutajanimi",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index 1168fca0822..9e3051441e8 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -8,14 +8,7 @@
     "Authentication error" : "Autentimise viga",
     "Your full name has been changed." : "Sinu täispikk nimi on muudetud.",
     "Unable to change full name" : "Täispika nime muutmine ebaõnnestus",
-    "Files decrypted successfully" : "Failide krüpteerimine õnnestus",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ei suutnud faile dekrüpteerida, palun kontrolli oma owncloud.log-i või küsi nõu administraatorilt",
-    "Couldn't decrypt your files, check your password and try again" : "Ei suutnud failde dekrüpteerida, kontrolli parooli ja proovi uuesti",
-    "Encryption keys deleted permanently" : "Krüpteerimisvõtmed kustutatud lõplikult",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ei suutnud lõplikult kustutada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või pöördu oma süsteemihalduri poole.",
     "Couldn't remove app." : "Ei suutnud rakendit eemaldada.",
-    "Backups restored successfully" : "Varukoopiad taastatud edukalt.",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ei suutnud taastada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või  pöördu oma süsteemihalduri poole.",
     "Language changed" : "Keel on muudetud",
     "Invalid request" : "Vigane päring",
     "Admins can't remove themself from the admin group" : "Administraatorid ei saa ise end admin grupist eemaldada",
@@ -29,7 +22,6 @@
     "Unable to change password" : "Ei suuda parooli muuta",
     "Enabled" : "Sisse lülitatud",
     "Not enabled" : "Pole sisse lülitatud",
-    "Recommended" : "Soovitatud",
     "Saved" : "Salvestatud",
     "test email settings" : "testi e-posti seadeid",
     "Email sent" : "E-kiri on saadetud",
@@ -58,9 +50,6 @@
     "Strong password" : "Väga hea parool",
     "Valid until {date}" : "Kehtib kuni {date}",
     "Delete" : "Kustuta",
-    "Decrypting files... Please wait, this can take some time." : "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
-    "Delete encryption keys permanently." : "Kustuta krüpteerimisvõtmed lõplikult",
-    "Restore encryption keys." : "Taasta krüpteerimisvõtmed.",
     "Groups" : "Grupid",
     "Unable to delete {objName}" : "Ei suuda kustutada {objName}",
     "Error creating group" : "Viga grupi loomisel",
@@ -76,7 +65,6 @@
     "A valid password must be provided" : "Sisesta nõuetele vastav parool",
     "__language_name__" : "Eesti",
     "SSL root certificates" : "SSL root sertifikaadid",
-    "Encryption" : "Krüpteerimine",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Kõik (tõsised probleemid, veateated, hoiatused, info, veatuvastus)",
     "Info, warnings, errors and fatal issues" : "Info, hoiatused, veateted ja tõsised probleemid",
     "Warnings, errors and fatal issues" : "Hoiatused, veateated ja tõsised probleemid",
@@ -112,6 +100,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti järel.",
     "This is used for sending out notifications." : "Seda kasutatakse teadete välja saatmiseks.",
     "Send mode" : "Saatmise viis",
+    "Encryption" : "Krüpteerimine",
     "From address" : "Saatja aadress",
     "mail" : "e-mail",
     "Authentication method" : "Autentimise meetod",
@@ -138,11 +127,7 @@
     "Enable only for specific groups" : "Luba ainult kindlad grupid",
     "Uninstall App" : "Eemada rakend",
     "Cheers!" : "Terekest!",
-    "Administrator Documentation" : "Administraatori dokumentatsioon",
-    "Online Documentation" : "Online dokumentatsioon",
     "Forum" : "Foorum",
-    "Bugtracker" : "Vigade nimekiri",
-    "Commercial Support" : "Tasuline kasutajatugi",
     "Get the apps to sync your files" : "Hangi rakendusi failide sünkroniseerimiseks",
     "Show First Run Wizard again" : "Näita veelkord Esmase Käivituse Juhendajat",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>",
@@ -168,12 +153,6 @@
     "Valid until" : "Kehtib kuni",
     "Issued By" : "isas",
     "Valid until %s" : "Kehtib kuni %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid",
-    "Log-in password" : "Sisselogimise parool",
-    "Decrypt all Files" : "Dekrüpteeri kõik failid",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Sinu krüpteerimisvõtmed on tõstetud varukoopiasse. Kui midagi läheb valesti, siis saad võtmed taastada. Kustuta lõplikult ainult juhul kui oled kindel, et failid on dekrüteeritud korrektselt.",
-    "Restore Encryption Keys" : "Taasta krüpteerimisvõtmed",
-    "Delete Encryption Keys" : "Kustuta krüpteerimisvõtmed",
     "Show storage location" : "Näita salvestusruumi asukohta",
     "Show last log in" : "Viimane sisselogimine",
     "Username" : "Kasutajanimi",
diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js
index 1b47a013546..cb59604bf98 100644
--- a/settings/l10n/eu.js
+++ b/settings/l10n/eu.js
@@ -10,14 +10,7 @@ OC.L10N.register(
     "Authentication error" : "Autentifikazio errorea",
     "Your full name has been changed." : "Zure izena aldatu egin da.",
     "Unable to change full name" : "Ezin izan da izena aldatu",
-    "Files decrypted successfully" : "Fitxategiak ongi deskodetu dira.",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure fitxategiak deskodetu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
-    "Couldn't decrypt your files, check your password and try again" : "Ezin izan dira deskodetu zure fitxategiak, egiaztatu zure pasahitza eta saiatu berriz",
-    "Encryption keys deleted permanently" : "Enkriptatze gakoak behin betiko ezabatuak",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure enkriptatze gakoak behin betiko ezabatu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
     "Couldn't remove app." : "Ezin izan da aplikazioa ezabatu..",
-    "Backups restored successfully" : "Babeskopiak ongi leheneratu dira",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure enkriptatze gakoak leheneratu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
     "Language changed" : "Hizkuntza aldatuta",
     "Invalid request" : "Baliogabeko eskaera",
     "Admins can't remove themself from the admin group" : "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik",
@@ -31,7 +24,6 @@ OC.L10N.register(
     "Unable to change password" : "Ezin izan da pasahitza aldatu",
     "Enabled" : "Gaitua",
     "Not enabled" : "Gaitu gabe",
-    "Recommended" : "Aholkatuta",
     "Group already exists." : "Taldea dagoeneko existitzen da",
     "Unable to add group." : "Ezin izan da taldea gehitu.",
     "Unable to delete group." : "Ezin izan da taldea ezabatu.",
@@ -71,9 +63,6 @@ OC.L10N.register(
     "Strong password" : "Pasahitz sendoa",
     "Valid until {date}" : "{date} arte baliogarria",
     "Delete" : "Ezabatu",
-    "Decrypting files... Please wait, this can take some time." : "Fitxategiak deskodetzen... Itxaron, bere denbora eskatzen du.",
-    "Delete encryption keys permanently." : "Ezabatu enkriptatze gakoak behin betiko",
-    "Restore encryption keys." : "Leheneratu enkriptatze gakoak",
     "Groups" : "Taldeak",
     "Unable to delete {objName}" : "Ezin izan da {objName} ezabatu",
     "Error creating group" : "Errore bat izan da taldea sortzean",
@@ -91,7 +80,6 @@ OC.L10N.register(
     "A valid email must be provided" : "Baliozko posta elektronikoa eman behar da",
     "__language_name__" : "Euskara",
     "SSL root certificates" : "SSL erro ziurtagiriak",
-    "Encryption" : "Enkriptazioa",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Dena (arazo larriak, erroreak, abisuak, informazioa, arazketa)",
     "Info, warnings, errors and fatal issues" : "Informazioa, abisuak, erroreak eta arazo larriak.",
     "Warnings, errors and fatal issues" : "Abisuak, erroreak eta arazo larriak",
@@ -132,6 +120,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Erabili sistemaren cron zerbitzua deitzeko cron.php fitxategia 15 minutuan behin.",
     "This is used for sending out notifications." : "Hau jakinarazpenak bidaltzeko erabiltzen da.",
     "Send mode" : "Bidaltzeko modua",
+    "Encryption" : "Enkriptazioa",
     "From address" : "Helbidetik",
     "mail" : "posta",
     "Authentication method" : "Autentifikazio metodoa",
@@ -162,11 +151,7 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Kaixo,<br><br>orain %s kontu bat duzula esateko besterik ez.<br><br>Zure erabiltzailea: %s<br>Sar zaitez: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Ongi izan!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Kaixo,\n\norain %s kontu bat duzula esateko besterik ez.\n\nZure erabiltzailea: %s\nSar zaitez: %s\n\n",
-    "Administrator Documentation" : "Administratzaile dokumentazioa",
-    "Online Documentation" : "Online dokumentazioa",
     "Forum" : "Foroa",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Babes komertziala",
     "Get the apps to sync your files" : "Lortu aplikazioak zure fitxategiak sinkronizatzeko",
     "Desktop client" : "Mahaigaineko bezeroa",
     "Android app" : "Android aplikazioa",
@@ -197,12 +182,6 @@ OC.L10N.register(
     "Valid until" : "Data hau arte baliogarria",
     "Issued By" : "Honek bidalita",
     "Valid until %s" : "%s arte baliogarria",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
-    "Log-in password" : "Saioa hasteko pasahitza",
-    "Decrypt all Files" : "Desenkripattu fitxategi guztiak",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Zure enkriptatze gakoak babeskopiara eraman dira. Zerbait gaizki ateratzen bada berreskura ditzakezu giltzak. Behin betirako ezabatu bakarrik ziur bazaude fitxategi guztiak ongi deskodetu badira.",
-    "Restore Encryption Keys" : "Lehenera itzazu enkriptatze gakoak.",
-    "Delete Encryption Keys" : "Ezabatu enkriptatze gakoak",
     "Show storage location" : "Erakutsi biltegiaren kokapena",
     "Show last log in" : "Erakutsi azkeneko saio hasiera",
     "Show user backend" : "Bistaratu erabiltzaile motorra",
diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json
index c3e403c629f..f9b724e36f5 100644
--- a/settings/l10n/eu.json
+++ b/settings/l10n/eu.json
@@ -8,14 +8,7 @@
     "Authentication error" : "Autentifikazio errorea",
     "Your full name has been changed." : "Zure izena aldatu egin da.",
     "Unable to change full name" : "Ezin izan da izena aldatu",
-    "Files decrypted successfully" : "Fitxategiak ongi deskodetu dira.",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure fitxategiak deskodetu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
-    "Couldn't decrypt your files, check your password and try again" : "Ezin izan dira deskodetu zure fitxategiak, egiaztatu zure pasahitza eta saiatu berriz",
-    "Encryption keys deleted permanently" : "Enkriptatze gakoak behin betiko ezabatuak",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure enkriptatze gakoak behin betiko ezabatu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
     "Couldn't remove app." : "Ezin izan da aplikazioa ezabatu..",
-    "Backups restored successfully" : "Babeskopiak ongi leheneratu dira",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure enkriptatze gakoak leheneratu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
     "Language changed" : "Hizkuntza aldatuta",
     "Invalid request" : "Baliogabeko eskaera",
     "Admins can't remove themself from the admin group" : "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik",
@@ -29,7 +22,6 @@
     "Unable to change password" : "Ezin izan da pasahitza aldatu",
     "Enabled" : "Gaitua",
     "Not enabled" : "Gaitu gabe",
-    "Recommended" : "Aholkatuta",
     "Group already exists." : "Taldea dagoeneko existitzen da",
     "Unable to add group." : "Ezin izan da taldea gehitu.",
     "Unable to delete group." : "Ezin izan da taldea ezabatu.",
@@ -69,9 +61,6 @@
     "Strong password" : "Pasahitz sendoa",
     "Valid until {date}" : "{date} arte baliogarria",
     "Delete" : "Ezabatu",
-    "Decrypting files... Please wait, this can take some time." : "Fitxategiak deskodetzen... Itxaron, bere denbora eskatzen du.",
-    "Delete encryption keys permanently." : "Ezabatu enkriptatze gakoak behin betiko",
-    "Restore encryption keys." : "Leheneratu enkriptatze gakoak",
     "Groups" : "Taldeak",
     "Unable to delete {objName}" : "Ezin izan da {objName} ezabatu",
     "Error creating group" : "Errore bat izan da taldea sortzean",
@@ -89,7 +78,6 @@
     "A valid email must be provided" : "Baliozko posta elektronikoa eman behar da",
     "__language_name__" : "Euskara",
     "SSL root certificates" : "SSL erro ziurtagiriak",
-    "Encryption" : "Enkriptazioa",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Dena (arazo larriak, erroreak, abisuak, informazioa, arazketa)",
     "Info, warnings, errors and fatal issues" : "Informazioa, abisuak, erroreak eta arazo larriak.",
     "Warnings, errors and fatal issues" : "Abisuak, erroreak eta arazo larriak",
@@ -130,6 +118,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Erabili sistemaren cron zerbitzua deitzeko cron.php fitxategia 15 minutuan behin.",
     "This is used for sending out notifications." : "Hau jakinarazpenak bidaltzeko erabiltzen da.",
     "Send mode" : "Bidaltzeko modua",
+    "Encryption" : "Enkriptazioa",
     "From address" : "Helbidetik",
     "mail" : "posta",
     "Authentication method" : "Autentifikazio metodoa",
@@ -160,11 +149,7 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Kaixo,<br><br>orain %s kontu bat duzula esateko besterik ez.<br><br>Zure erabiltzailea: %s<br>Sar zaitez: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Ongi izan!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Kaixo,\n\norain %s kontu bat duzula esateko besterik ez.\n\nZure erabiltzailea: %s\nSar zaitez: %s\n\n",
-    "Administrator Documentation" : "Administratzaile dokumentazioa",
-    "Online Documentation" : "Online dokumentazioa",
     "Forum" : "Foroa",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Babes komertziala",
     "Get the apps to sync your files" : "Lortu aplikazioak zure fitxategiak sinkronizatzeko",
     "Desktop client" : "Mahaigaineko bezeroa",
     "Android app" : "Android aplikazioa",
@@ -195,12 +180,6 @@
     "Valid until" : "Data hau arte baliogarria",
     "Issued By" : "Honek bidalita",
     "Valid until %s" : "%s arte baliogarria",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
-    "Log-in password" : "Saioa hasteko pasahitza",
-    "Decrypt all Files" : "Desenkripattu fitxategi guztiak",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Zure enkriptatze gakoak babeskopiara eraman dira. Zerbait gaizki ateratzen bada berreskura ditzakezu giltzak. Behin betirako ezabatu bakarrik ziur bazaude fitxategi guztiak ongi deskodetu badira.",
-    "Restore Encryption Keys" : "Lehenera itzazu enkriptatze gakoak.",
-    "Delete Encryption Keys" : "Ezabatu enkriptatze gakoak",
     "Show storage location" : "Erakutsi biltegiaren kokapena",
     "Show last log in" : "Erakutsi azkeneko saio hasiera",
     "Show user backend" : "Bistaratu erabiltzaile motorra",
diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js
index ee6571d8f52..4201415d938 100644
--- a/settings/l10n/fa.js
+++ b/settings/l10n/fa.js
@@ -10,10 +10,7 @@ OC.L10N.register(
     "Authentication error" : "خطا در اعتبار سنجی",
     "Your full name has been changed." : "نام کامل شما تغییر یافت",
     "Unable to change full name" : "امکان تغییر نام کامل وجود ندارد",
-    "Files decrypted successfully" : "فایل ها با موفقیت رمزگشایی شدند.",
-    "Encryption keys deleted permanently" : "کلیدهای رمزگذاری به طور کامل حذف شدند",
     "Couldn't remove app." : "امکان حذف برنامه وجود ندارد.",
-    "Backups restored successfully" : "پشتیبان ها با موفقیت بازیابی شدند",
     "Language changed" : "زبان تغییر کرد",
     "Invalid request" : "درخواست نامعتبر",
     "Admins can't remove themself from the admin group" : "مدیران نمی توانند خود را از گروه مدیریت حذف کنند",
@@ -50,9 +47,6 @@ OC.L10N.register(
     "Good password" : "رمز عبور خوب",
     "Strong password" : "رمز عبور قوی",
     "Delete" : "حذف",
-    "Decrypting files... Please wait, this can take some time." : "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد.",
-    "Delete encryption keys permanently." : "کلید های رمزگذاری به طوز کامل حذف شوند.",
-    "Restore encryption keys." : "بازیابی کلیدهای  رمزگذاری.",
     "Groups" : "گروه ها",
     "Unable to delete {objName}" : "امکان حذف {objName} وجود ندارد",
     "Error creating group" : "خطا در هنگام ایجاد کروه",
@@ -67,7 +61,6 @@ OC.L10N.register(
     "A valid password must be provided" : "رمز عبور صحیح باید وارد شود",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "گواهی های اصلی SSL ",
-    "Encryption" : "رمزگذاری",
     "Everything (fatal issues, errors, warnings, info, debug)" : "همه موارد (مشکلات مهلک، خطاها، اخطارها، اطلاعات، خطایابی)",
     "Info, warnings, errors and fatal issues" : "اطلاعات، اخطارها، خطاها، مشکلات اساسی",
     "Warnings, errors and fatal issues" : "اخطارها، خطاها، مشکلات مهلک",
@@ -95,6 +88,7 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php در یک سرویس webcron ثبت شده است که هر 15 دقیقه یک بار بر روی بستر http فراخوانی شود.",
     "This is used for sending out notifications." : "این برای ارسال هشدار ها استفاده می شود",
     "Send mode" : "حالت ارسال",
+    "Encryption" : "رمزگذاری",
     "From address" : "آدرس فرستنده",
     "mail" : "ایمیل",
     "Authentication method" : "روش احراز هویت",
@@ -117,11 +111,7 @@ OC.L10N.register(
     "Enable only for specific groups" : "فعال سازی تنها برای گروه های خاص",
     "Uninstall App" : "حذف برنامه",
     "Cheers!" : "سلامتی!",
-    "Administrator Documentation" : "مستندات مدیر",
-    "Online Documentation" : "مستندات آنلاین",
     "Forum" : "انجمن",
-    "Bugtracker" : "ردیاب باگ ",
-    "Commercial Support" : "پشتیبانی تجاری",
     "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
     "Show First Run Wizard again" : "راهبری کمکی اجرای اول را دوباره نمایش بده",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>",
@@ -141,10 +131,6 @@ OC.L10N.register(
     "Choose as profile image" : "یک تصویر پروفایل انتخاب کنید",
     "Language" : "زبان",
     "Help translate" : "به ترجمه آن کمک کنید",
-    "Log-in password" : "رمز ورود",
-    "Decrypt all Files" : "تمام فایلها رمزگشایی شود",
-    "Restore Encryption Keys" : "بازیابی کلید های رمزگذاری",
-    "Delete Encryption Keys" : "حذف کلید های رمزگذاری",
     "Username" : "نام کاربری",
     "Create" : "ایجاد کردن",
     "Admin Recovery Password" : "مدیریت بازیابی رمز عبور",
diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json
index d81b373c7d5..2deb4af7f16 100644
--- a/settings/l10n/fa.json
+++ b/settings/l10n/fa.json
@@ -8,10 +8,7 @@
     "Authentication error" : "خطا در اعتبار سنجی",
     "Your full name has been changed." : "نام کامل شما تغییر یافت",
     "Unable to change full name" : "امکان تغییر نام کامل وجود ندارد",
-    "Files decrypted successfully" : "فایل ها با موفقیت رمزگشایی شدند.",
-    "Encryption keys deleted permanently" : "کلیدهای رمزگذاری به طور کامل حذف شدند",
     "Couldn't remove app." : "امکان حذف برنامه وجود ندارد.",
-    "Backups restored successfully" : "پشتیبان ها با موفقیت بازیابی شدند",
     "Language changed" : "زبان تغییر کرد",
     "Invalid request" : "درخواست نامعتبر",
     "Admins can't remove themself from the admin group" : "مدیران نمی توانند خود را از گروه مدیریت حذف کنند",
@@ -48,9 +45,6 @@
     "Good password" : "رمز عبور خوب",
     "Strong password" : "رمز عبور قوی",
     "Delete" : "حذف",
-    "Decrypting files... Please wait, this can take some time." : "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد.",
-    "Delete encryption keys permanently." : "کلید های رمزگذاری به طوز کامل حذف شوند.",
-    "Restore encryption keys." : "بازیابی کلیدهای  رمزگذاری.",
     "Groups" : "گروه ها",
     "Unable to delete {objName}" : "امکان حذف {objName} وجود ندارد",
     "Error creating group" : "خطا در هنگام ایجاد کروه",
@@ -65,7 +59,6 @@
     "A valid password must be provided" : "رمز عبور صحیح باید وارد شود",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "گواهی های اصلی SSL ",
-    "Encryption" : "رمزگذاری",
     "Everything (fatal issues, errors, warnings, info, debug)" : "همه موارد (مشکلات مهلک، خطاها، اخطارها، اطلاعات، خطایابی)",
     "Info, warnings, errors and fatal issues" : "اطلاعات، اخطارها، خطاها، مشکلات اساسی",
     "Warnings, errors and fatal issues" : "اخطارها، خطاها، مشکلات مهلک",
@@ -93,6 +86,7 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php در یک سرویس webcron ثبت شده است که هر 15 دقیقه یک بار بر روی بستر http فراخوانی شود.",
     "This is used for sending out notifications." : "این برای ارسال هشدار ها استفاده می شود",
     "Send mode" : "حالت ارسال",
+    "Encryption" : "رمزگذاری",
     "From address" : "آدرس فرستنده",
     "mail" : "ایمیل",
     "Authentication method" : "روش احراز هویت",
@@ -115,11 +109,7 @@
     "Enable only for specific groups" : "فعال سازی تنها برای گروه های خاص",
     "Uninstall App" : "حذف برنامه",
     "Cheers!" : "سلامتی!",
-    "Administrator Documentation" : "مستندات مدیر",
-    "Online Documentation" : "مستندات آنلاین",
     "Forum" : "انجمن",
-    "Bugtracker" : "ردیاب باگ ",
-    "Commercial Support" : "پشتیبانی تجاری",
     "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
     "Show First Run Wizard again" : "راهبری کمکی اجرای اول را دوباره نمایش بده",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>",
@@ -139,10 +129,6 @@
     "Choose as profile image" : "یک تصویر پروفایل انتخاب کنید",
     "Language" : "زبان",
     "Help translate" : "به ترجمه آن کمک کنید",
-    "Log-in password" : "رمز ورود",
-    "Decrypt all Files" : "تمام فایلها رمزگشایی شود",
-    "Restore Encryption Keys" : "بازیابی کلید های رمزگذاری",
-    "Delete Encryption Keys" : "حذف کلید های رمزگذاری",
     "Username" : "نام کاربری",
     "Create" : "ایجاد کردن",
     "Admin Recovery Password" : "مدیریت بازیابی رمز عبور",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index 7d381417b80..add1f61c317 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Turvallisuus- ja asetusvaroitukset",
     "Sharing" : "Jakaminen",
     "External Storage" : "Erillinen tallennusväline",
+    "Server Side Encryption" : "Palvelinpään salaus",
     "Cron" : "Cron",
     "Email Server" : "Sähköpostipalvelin",
     "Log" : "Loki",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Tunnistautumisvirhe",
     "Your full name has been changed." : "Koko nimesi on muutettu.",
     "Unable to change full name" : "Koko nimen muuttaminen epäonnistui",
-    "Files decrypted successfully" : "Tiedostojen salaus purettiin onnistuneesti",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tiedosto tai ota yhteys ylläpitäjään",
-    "Couldn't decrypt your files, check your password and try again" : "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen",
-    "Encryption keys deleted permanently" : "Salausavaimet poistettiin pysyvästi",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Salausavaintesi poistaminen pysyvästi ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
     "Couldn't remove app." : "Sovelluksen poistaminen epäonnistui.",
-    "Backups restored successfully" : "Varmuuskopiot palautettiin onnistuneesti",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Salausavaintesi palauttaminen ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
     "Language changed" : "Kieli on vaihdettu",
     "Invalid request" : "Virheellinen pyyntö",
     "Admins can't remove themself from the admin group" : "Ylläpitäjät eivät poistaa omia tunnuksiaan ylläpitäjien ryhmästä",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Salasanan vaihto ei onnistunut",
     "Enabled" : "Käytössä",
     "Not enabled" : "Ei käytössä",
-    "Recommended" : "Suositeltu",
     "Group already exists." : "Ryhmä on jo olemassa.",
     "Unable to add group." : "Ryhmän lisääminen ei onnistunut.",
     "Unable to delete group." : "Ryhmän poistaminen ei onnistunut.",
@@ -57,6 +50,9 @@ OC.L10N.register(
     "Add trusted domain" : "Lisää luotettu toimialue",
     "Sending..." : "Lähetetään...",
     "All" : "Kaikki",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Viralliset sovellukset kehitetään ownCloud-yhteisön toimesta. Sovellukset tarjoavat lisäominaisuuksia ownCloudin keskeisiin toimintoihin liittyen ja ovat valmiita tuotantokäyttöön.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Hyväksytyt sovellukset on kehitetty luotettujen kehittäjien toimesta. Hyväksytyille sovelluksille on suoritettu pintapuolinen turvallisuustarkastus. Sovelluksia ylläpidetään avoimen koodin tietovarastoissa. Sovellusten kehittäjät mieltävät sovellukset vakaiksi ja valmiiksi tavalliseen käyttöön.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Tätä sovellusta ei ole tarkistettu tietoturvariskien varalta. Se on uusi sovellus tai se jopa mielletään epävakaaksi. Asenna omalla vastuulla.",
     "Please wait...." : "Odota hetki...",
     "Error while disabling app" : "Virhe poistaessa sovellusta käytöstä",
     "Disable" : "Poista käytöstä",
@@ -76,9 +72,6 @@ OC.L10N.register(
     "Strong password" : "Vahva salasana",
     "Valid until {date}" : "Kelvollinen {date} asti",
     "Delete" : "Poista",
-    "Decrypting files... Please wait, this can take some time." : "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
-    "Delete encryption keys permanently." : "Poista salausavaimet pysyvästi.",
-    "Restore encryption keys." : "Palauta salausavaimet.",
     "Groups" : "Ryhmät",
     "Unable to delete {objName}" : "Kohteen {objName} poistaminen epäonnistui",
     "Error creating group" : "Virhe ryhmää luotaessa",
@@ -97,7 +90,6 @@ OC.L10N.register(
     "__language_name__" : "_kielen_nimi_",
     "Personal info" : "Henkilökohtaiset tiedot",
     "SSL root certificates" : "SSL-juurivarmenteet",
-    "Encryption" : "Salaus",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)",
     "Info, warnings, errors and fatal issues" : "Tiedot, varoitukset, virheet ja vakavat ongelmat",
     "Warnings, errors and fatal issues" : "Varoitukset, virheet ja vakavat ongelmat",
@@ -133,13 +125,14 @@ OC.L10N.register(
     "Last cron job execution: %s." : "Viimeisin cron-työn suoritus: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Viimeisin cron-työn suoritus: %s. Jokin vaikuttaa menneen pieleen.",
     "Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
+    "Open documentation" : "Avaa dokumentaatio",
     "Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
-    "Server Side Encryption" : "Palvelinpään salaus",
     "Enable Server-Side-Encryption" : "Käytä palvelinpään salausta",
     "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
     "Send mode" : "Lähetystila",
+    "Encryption" : "Salaus",
     "From address" : "Lähettäjän osoite",
     "Authentication method" : "Tunnistautumistapa",
     "Authentication required" : "Tunnistautuminen vaaditaan",
@@ -179,15 +172,17 @@ OC.L10N.register(
     "Update to %s" : "Päivitä versioon %s",
     "Enable only for specific groups" : "Salli vain tietyille ryhmille",
     "Uninstall App" : "Poista sovelluksen asennus",
+    "Enable experimental apps" : "Käytä kokeiluasteella olevia sovelluksia",
     "No apps found for your version" : "Sovelluksia ei löytynyt versiollesi",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hei<br><br>Sinulla on nyt %s-tili.<br><br>Käyttäjätunnus: %s<br>Aloita käyttö: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Kippis!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hei\n\nSinulla on nyt %s-tili.\n\nKäyttäjätunnuksesi: %s\nAloita käyttö: %s\n\n",
-    "Administrator Documentation" : "Ylläpito-ohjeistus",
-    "Online Documentation" : "Verkko-ohjeistus",
+    "User documentation" : "Käyttäjädokumentaatio",
+    "Administrator documentation" : "Ylläpidon dokumentaatio",
+    "Online documentation" : "Verkkodokumentaatio",
     "Forum" : "Keskustelupalsta",
-    "Bugtracker" : "Ohjelmistovirheiden jäljitys",
-    "Commercial Support" : "Kaupallinen tuki",
+    "Issue tracker" : "Ongelmien seuranta",
+    "Commercial support" : "Kaupallinen tuki",
     "Get the apps to sync your files" : "Aseta sovellukset synkronoimaan tiedostosi",
     "Desktop client" : "Työpöytäsovellus",
     "Android app" : "Android-sovellus",
@@ -222,12 +217,6 @@ OC.L10N.register(
     "Issued By" : " Myöntänyt",
     "Valid until %s" : "Kelvollinen %s asti",
     "Import root certificate" : "Tuo juurivarmenne",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus",
-    "Log-in password" : "Kirjautumissalasana",
-    "Decrypt all Files" : "Pura kaikkien tiedostojen salaus",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Salausavaimesi siirretään varmuuskopiosijaintiin. Jos jokin menee pieleen, voit palauttaa avaimet. Poista avaimet pysyvästi vain, jos olet varma, että tiedostojen salaus on purettu onnistuneesti.",
-    "Restore Encryption Keys" : "Palauta salausavaimet",
-    "Delete Encryption Keys" : "Poista salausavaimet",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Kehityksestä on vastannut {communityopen}ownCloud-yhteisö{linkclose}, {githubopen}lähdekoodi{linkclose} on {licenseopen}<abbr title=\"Affero General Public License\">AGPL-lisensoitu</abbr>{linkclose}.",
     "Show storage location" : "Näytä tallennustilan sijainti",
     "Show last log in" : "Näytä viimeisin sisäänkirjautuminen",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index 24663101f41..a5036d9e2ba 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Turvallisuus- ja asetusvaroitukset",
     "Sharing" : "Jakaminen",
     "External Storage" : "Erillinen tallennusväline",
+    "Server Side Encryption" : "Palvelinpään salaus",
     "Cron" : "Cron",
     "Email Server" : "Sähköpostipalvelin",
     "Log" : "Loki",
@@ -10,14 +11,7 @@
     "Authentication error" : "Tunnistautumisvirhe",
     "Your full name has been changed." : "Koko nimesi on muutettu.",
     "Unable to change full name" : "Koko nimen muuttaminen epäonnistui",
-    "Files decrypted successfully" : "Tiedostojen salaus purettiin onnistuneesti",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tiedosto tai ota yhteys ylläpitäjään",
-    "Couldn't decrypt your files, check your password and try again" : "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen",
-    "Encryption keys deleted permanently" : "Salausavaimet poistettiin pysyvästi",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Salausavaintesi poistaminen pysyvästi ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
     "Couldn't remove app." : "Sovelluksen poistaminen epäonnistui.",
-    "Backups restored successfully" : "Varmuuskopiot palautettiin onnistuneesti",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Salausavaintesi palauttaminen ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
     "Language changed" : "Kieli on vaihdettu",
     "Invalid request" : "Virheellinen pyyntö",
     "Admins can't remove themself from the admin group" : "Ylläpitäjät eivät poistaa omia tunnuksiaan ylläpitäjien ryhmästä",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Salasanan vaihto ei onnistunut",
     "Enabled" : "Käytössä",
     "Not enabled" : "Ei käytössä",
-    "Recommended" : "Suositeltu",
     "Group already exists." : "Ryhmä on jo olemassa.",
     "Unable to add group." : "Ryhmän lisääminen ei onnistunut.",
     "Unable to delete group." : "Ryhmän poistaminen ei onnistunut.",
@@ -55,6 +48,9 @@
     "Add trusted domain" : "Lisää luotettu toimialue",
     "Sending..." : "Lähetetään...",
     "All" : "Kaikki",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Viralliset sovellukset kehitetään ownCloud-yhteisön toimesta. Sovellukset tarjoavat lisäominaisuuksia ownCloudin keskeisiin toimintoihin liittyen ja ovat valmiita tuotantokäyttöön.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Hyväksytyt sovellukset on kehitetty luotettujen kehittäjien toimesta. Hyväksytyille sovelluksille on suoritettu pintapuolinen turvallisuustarkastus. Sovelluksia ylläpidetään avoimen koodin tietovarastoissa. Sovellusten kehittäjät mieltävät sovellukset vakaiksi ja valmiiksi tavalliseen käyttöön.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Tätä sovellusta ei ole tarkistettu tietoturvariskien varalta. Se on uusi sovellus tai se jopa mielletään epävakaaksi. Asenna omalla vastuulla.",
     "Please wait...." : "Odota hetki...",
     "Error while disabling app" : "Virhe poistaessa sovellusta käytöstä",
     "Disable" : "Poista käytöstä",
@@ -74,9 +70,6 @@
     "Strong password" : "Vahva salasana",
     "Valid until {date}" : "Kelvollinen {date} asti",
     "Delete" : "Poista",
-    "Decrypting files... Please wait, this can take some time." : "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
-    "Delete encryption keys permanently." : "Poista salausavaimet pysyvästi.",
-    "Restore encryption keys." : "Palauta salausavaimet.",
     "Groups" : "Ryhmät",
     "Unable to delete {objName}" : "Kohteen {objName} poistaminen epäonnistui",
     "Error creating group" : "Virhe ryhmää luotaessa",
@@ -95,7 +88,6 @@
     "__language_name__" : "_kielen_nimi_",
     "Personal info" : "Henkilökohtaiset tiedot",
     "SSL root certificates" : "SSL-juurivarmenteet",
-    "Encryption" : "Salaus",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)",
     "Info, warnings, errors and fatal issues" : "Tiedot, varoitukset, virheet ja vakavat ongelmat",
     "Warnings, errors and fatal issues" : "Varoitukset, virheet ja vakavat ongelmat",
@@ -131,13 +123,14 @@
     "Last cron job execution: %s." : "Viimeisin cron-työn suoritus: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Viimeisin cron-työn suoritus: %s. Jokin vaikuttaa menneen pieleen.",
     "Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
+    "Open documentation" : "Avaa dokumentaatio",
     "Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
-    "Server Side Encryption" : "Palvelinpään salaus",
     "Enable Server-Side-Encryption" : "Käytä palvelinpään salausta",
     "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
     "Send mode" : "Lähetystila",
+    "Encryption" : "Salaus",
     "From address" : "Lähettäjän osoite",
     "Authentication method" : "Tunnistautumistapa",
     "Authentication required" : "Tunnistautuminen vaaditaan",
@@ -177,15 +170,17 @@
     "Update to %s" : "Päivitä versioon %s",
     "Enable only for specific groups" : "Salli vain tietyille ryhmille",
     "Uninstall App" : "Poista sovelluksen asennus",
+    "Enable experimental apps" : "Käytä kokeiluasteella olevia sovelluksia",
     "No apps found for your version" : "Sovelluksia ei löytynyt versiollesi",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hei<br><br>Sinulla on nyt %s-tili.<br><br>Käyttäjätunnus: %s<br>Aloita käyttö: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Kippis!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hei\n\nSinulla on nyt %s-tili.\n\nKäyttäjätunnuksesi: %s\nAloita käyttö: %s\n\n",
-    "Administrator Documentation" : "Ylläpito-ohjeistus",
-    "Online Documentation" : "Verkko-ohjeistus",
+    "User documentation" : "Käyttäjädokumentaatio",
+    "Administrator documentation" : "Ylläpidon dokumentaatio",
+    "Online documentation" : "Verkkodokumentaatio",
     "Forum" : "Keskustelupalsta",
-    "Bugtracker" : "Ohjelmistovirheiden jäljitys",
-    "Commercial Support" : "Kaupallinen tuki",
+    "Issue tracker" : "Ongelmien seuranta",
+    "Commercial support" : "Kaupallinen tuki",
     "Get the apps to sync your files" : "Aseta sovellukset synkronoimaan tiedostosi",
     "Desktop client" : "Työpöytäsovellus",
     "Android app" : "Android-sovellus",
@@ -220,12 +215,6 @@
     "Issued By" : " Myöntänyt",
     "Valid until %s" : "Kelvollinen %s asti",
     "Import root certificate" : "Tuo juurivarmenne",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus",
-    "Log-in password" : "Kirjautumissalasana",
-    "Decrypt all Files" : "Pura kaikkien tiedostojen salaus",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Salausavaimesi siirretään varmuuskopiosijaintiin. Jos jokin menee pieleen, voit palauttaa avaimet. Poista avaimet pysyvästi vain, jos olet varma, että tiedostojen salaus on purettu onnistuneesti.",
-    "Restore Encryption Keys" : "Palauta salausavaimet",
-    "Delete Encryption Keys" : "Poista salausavaimet",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Kehityksestä on vastannut {communityopen}ownCloud-yhteisö{linkclose}, {githubopen}lähdekoodi{linkclose} on {licenseopen}<abbr title=\"Affero General Public License\">AGPL-lisensoitu</abbr>{linkclose}.",
     "Show storage location" : "Näytä tallennustilan sijainti",
     "Show last log in" : "Näytä viimeisin sisäänkirjautuminen",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index c23848aeb3e..2d0b3da5480 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Avertissements de sécurité ou de configuration",
     "Sharing" : "Partage",
     "External Storage" : "Stockage externe",
+    "Server Side Encryption" : "Chiffrement côté serveur",
     "Cron" : "Cron",
     "Email Server" : "Serveur mail",
     "Log" : "Log",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Erreur d'authentification",
     "Your full name has been changed." : "Votre nom complet a été modifié.",
     "Unable to change full name" : "Impossible de changer le nom complet",
-    "Files decrypted successfully" : "Fichiers déchiffrés avec succès",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Impossible de déchiffrer vos fichiers. Veuillez vérifier votre owncloud.log ou demander à votre administrateur",
-    "Couldn't decrypt your files, check your password and try again" : "Impossible de déchiffrer vos fichiers. Vérifiez votre mot de passe et essayez à nouveau",
-    "Encryption keys deleted permanently" : "Clés de chiffrement définitivement supprimées.",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Impossible de supprimer définitivement vos clés de chiffrement. Merci de consulter le fichier owncloud.log ou de demander à votre administrateur",
     "Couldn't remove app." : "Impossible de supprimer l'application.",
-    "Backups restored successfully" : "Sauvegardes restaurées avec succès",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Impossible de restaurer vos clés de chiffrement. Merci de consulter le fichier owncloud.log ou de demander à votre administrateur",
     "Language changed" : "Langue changée",
     "Invalid request" : "Requête non valide",
     "Admins can't remove themself from the admin group" : "Les administrateurs ne peuvent pas se retirer eux-mêmes du groupe admin",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Impossible de modifier le mot de passe",
     "Enabled" : "Activées",
     "Not enabled" : "Désactivées",
-    "Recommended" : "Recommandées",
     "Group already exists." : "Ce groupe existe déjà.",
     "Unable to add group." : "Impossible d'ajouter le groupe.",
     "Unable to delete group." : "Impossible de supprimer le groupe.",
@@ -57,6 +50,9 @@ OC.L10N.register(
     "Add trusted domain" : "Ajouter un domaine de confiance",
     "Sending..." : "Envoi en cours...",
     "All" : "Tous",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Les applications officielles sont développées par et avec la communauté ownCloud. Elles offrent ses fonctionnalités principales à ownCloud et sont prêtes pour une utilisation en production. ",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Les applications approuvées sont créées par des développeurs de confiance et ont passé les test de sécurité. Elles sont activement maintenues dans un dépôt ouvert et leurs développeurs pensent qu'elles sont stables pour une utilisation normale.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Cette application n'a pas été testée pour sa sécurité, et est nouvelle ou connue comme étant instable. À installer à vos risques et périls.",
     "Please wait...." : "Veuillez patienter…",
     "Error while disabling app" : "Erreur lors de la désactivation de l'application",
     "Disable" : "Désactiver",
@@ -76,9 +72,6 @@ OC.L10N.register(
     "Strong password" : "Mot de passe de forte sécurité",
     "Valid until {date}" : "Valide jusqu'au {date}",
     "Delete" : "Supprimer",
-    "Decrypting files... Please wait, this can take some time." : "Déchiffrement en cours... Cela peut prendre un certain temps.",
-    "Delete encryption keys permanently." : "Supprimer définitivement les clés de chiffrement",
-    "Restore encryption keys." : "Restaurer les clés de chiffrement",
     "Groups" : "Groupes",
     "Unable to delete {objName}" : "Impossible de supprimer {objName}",
     "Error creating group" : "Erreur lors de la création du groupe",
@@ -98,7 +91,6 @@ OC.L10N.register(
     "Sync clients" : "Clients de synchronisation",
     "Personal info" : "Informations personnelles",
     "SSL root certificates" : "Certificats racine SSL",
-    "Encryption" : "Chiffrement",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
     "Info, warnings, errors and fatal issues" : "Informations, avertissements, erreurs et erreurs fatales",
     "Warnings, errors and fatal issues" : "Avertissements, erreurs et erreurs fatales",
@@ -142,17 +134,17 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré auprès d'un service webcron qui l'exécutera toutes les 15 minutes via http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
-    "Server Side Encryption" : "Chiffrement côté serveur",
     "Enable Server-Side-Encryption" : "Activer le chiffrement côté serveur",
     "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
     "Send mode" : "Mode d'envoi",
+    "Encryption" : "Chiffrement",
     "From address" : "Adresse source",
     "mail" : "mail",
     "Authentication method" : "Méthode d'authentification",
     "Authentication required" : "Authentification requise",
     "Server address" : "Adresse du serveur",
     "Port" : "Port",
-    "Credentials" : "Authentification",
+    "Credentials" : "Informations d'identification",
     "SMTP Username" : "Nom d'utilisateur SMTP",
     "SMTP Password" : "Mot de passe SMTP",
     "Store credentials" : "Enregistrer les identifiants",
@@ -175,6 +167,8 @@ OC.L10N.register(
     "Version" : "Version",
     "More apps" : "Plus d'applications",
     "Developer documentation" : "Documentation pour les développeurs",
+    "Experimental applications ahead" : "Attention! Applications expérimentales",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Les applications expérimentales n'ont pas été testées pour les problèmes de sécurité, sont nouvelles ou connues comme étant instables et sont encore en développement. Les installer peut causer des pertes de données ou des failles de sécurités. ",
     "by" : "par",
     "licensed" : "Sous licence",
     "Documentation:" : "Documentation :",
@@ -186,15 +180,17 @@ OC.L10N.register(
     "Update to %s" : "Mettre à niveau vers la version %s",
     "Enable only for specific groups" : "Activer uniquement pour certains groupes",
     "Uninstall App" : "Désinstaller l'application",
+    "Enable experimental apps" : "Activer les applications expérimentales",
     "No apps found for your version" : "Pas d'application trouvée pour votre version",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Bonjour,<br><br>Un compte %s a été créé pour vous.<br><br>Votre nom d'utilisateur est : %s<br>Visitez votre compte : <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "À bientôt !",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Bonjour,<br><br>Un compte %s a été créé pour vous.<br><br>Votre nom d'utilisateur est : %s<br>Visitez votre compte : %s<br><br>\n",
-    "Administrator Documentation" : "Documentation administrateur",
-    "Online Documentation" : "Documentation en ligne",
+    "User documentation" : "Documentation utilisateur",
+    "Administrator documentation" : "Documentation administrateur",
+    "Online documentation" : "Documentation en ligne",
     "Forum" : "Forum",
-    "Bugtracker" : "Suivi de bugs",
-    "Commercial Support" : "Support commercial",
+    "Issue tracker" : "Suivi de problèmes",
+    "Commercial support" : "Support commercial",
     "Get the apps to sync your files" : "Obtenez les applications de synchronisation de vos fichiers",
     "Desktop client" : "Client de bureau",
     "Android app" : "Application Android",
@@ -229,12 +225,6 @@ OC.L10N.register(
     "Issued By" : "Délivré par",
     "Valid until %s" : "Valide jusqu'à %s",
     "Import root certificate" : "Importer un certificat racine",
-    "The encryption app is no longer enabled, please decrypt all your files" : "L'app de chiffrement n’est plus activée, veuillez déchiffrer tous vos fichiers",
-    "Log-in password" : "Mot de passe de connexion",
-    "Decrypt all Files" : "Déchiffrer tous les fichiers",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vos clés de chiffrement ont été déplacées dans l'emplacement de sauvegarde. Si quelque chose devait mal se passer, vous pourrez restaurer les clés. Choisissez la suppression permanente seulement si vous êtes sûr que tous les fichiers ont été déchiffrés correctement.",
-    "Restore Encryption Keys" : "Restaurer les clés de chiffrement",
-    "Delete Encryption Keys" : "Supprimer les clés de chiffrement",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Développé par la {communityopen}communauté ownCloud{linkclose}, le {githubopen}code source{linkclose} est sous licence {licenseopen}<abbr lang=\"en\" title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Afficher l'emplacement du stockage",
     "Show last log in" : "Montrer la dernière connexion",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 78a0ef69e65..87fbe1f8802 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Avertissements de sécurité ou de configuration",
     "Sharing" : "Partage",
     "External Storage" : "Stockage externe",
+    "Server Side Encryption" : "Chiffrement côté serveur",
     "Cron" : "Cron",
     "Email Server" : "Serveur mail",
     "Log" : "Log",
@@ -10,14 +11,7 @@
     "Authentication error" : "Erreur d'authentification",
     "Your full name has been changed." : "Votre nom complet a été modifié.",
     "Unable to change full name" : "Impossible de changer le nom complet",
-    "Files decrypted successfully" : "Fichiers déchiffrés avec succès",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Impossible de déchiffrer vos fichiers. Veuillez vérifier votre owncloud.log ou demander à votre administrateur",
-    "Couldn't decrypt your files, check your password and try again" : "Impossible de déchiffrer vos fichiers. Vérifiez votre mot de passe et essayez à nouveau",
-    "Encryption keys deleted permanently" : "Clés de chiffrement définitivement supprimées.",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Impossible de supprimer définitivement vos clés de chiffrement. Merci de consulter le fichier owncloud.log ou de demander à votre administrateur",
     "Couldn't remove app." : "Impossible de supprimer l'application.",
-    "Backups restored successfully" : "Sauvegardes restaurées avec succès",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Impossible de restaurer vos clés de chiffrement. Merci de consulter le fichier owncloud.log ou de demander à votre administrateur",
     "Language changed" : "Langue changée",
     "Invalid request" : "Requête non valide",
     "Admins can't remove themself from the admin group" : "Les administrateurs ne peuvent pas se retirer eux-mêmes du groupe admin",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Impossible de modifier le mot de passe",
     "Enabled" : "Activées",
     "Not enabled" : "Désactivées",
-    "Recommended" : "Recommandées",
     "Group already exists." : "Ce groupe existe déjà.",
     "Unable to add group." : "Impossible d'ajouter le groupe.",
     "Unable to delete group." : "Impossible de supprimer le groupe.",
@@ -55,6 +48,9 @@
     "Add trusted domain" : "Ajouter un domaine de confiance",
     "Sending..." : "Envoi en cours...",
     "All" : "Tous",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Les applications officielles sont développées par et avec la communauté ownCloud. Elles offrent ses fonctionnalités principales à ownCloud et sont prêtes pour une utilisation en production. ",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Les applications approuvées sont créées par des développeurs de confiance et ont passé les test de sécurité. Elles sont activement maintenues dans un dépôt ouvert et leurs développeurs pensent qu'elles sont stables pour une utilisation normale.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Cette application n'a pas été testée pour sa sécurité, et est nouvelle ou connue comme étant instable. À installer à vos risques et périls.",
     "Please wait...." : "Veuillez patienter…",
     "Error while disabling app" : "Erreur lors de la désactivation de l'application",
     "Disable" : "Désactiver",
@@ -74,9 +70,6 @@
     "Strong password" : "Mot de passe de forte sécurité",
     "Valid until {date}" : "Valide jusqu'au {date}",
     "Delete" : "Supprimer",
-    "Decrypting files... Please wait, this can take some time." : "Déchiffrement en cours... Cela peut prendre un certain temps.",
-    "Delete encryption keys permanently." : "Supprimer définitivement les clés de chiffrement",
-    "Restore encryption keys." : "Restaurer les clés de chiffrement",
     "Groups" : "Groupes",
     "Unable to delete {objName}" : "Impossible de supprimer {objName}",
     "Error creating group" : "Erreur lors de la création du groupe",
@@ -96,7 +89,6 @@
     "Sync clients" : "Clients de synchronisation",
     "Personal info" : "Informations personnelles",
     "SSL root certificates" : "Certificats racine SSL",
-    "Encryption" : "Chiffrement",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
     "Info, warnings, errors and fatal issues" : "Informations, avertissements, erreurs et erreurs fatales",
     "Warnings, errors and fatal issues" : "Avertissements, erreurs et erreurs fatales",
@@ -140,17 +132,17 @@
     "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré auprès d'un service webcron qui l'exécutera toutes les 15 minutes via http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
-    "Server Side Encryption" : "Chiffrement côté serveur",
     "Enable Server-Side-Encryption" : "Activer le chiffrement côté serveur",
     "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
     "Send mode" : "Mode d'envoi",
+    "Encryption" : "Chiffrement",
     "From address" : "Adresse source",
     "mail" : "mail",
     "Authentication method" : "Méthode d'authentification",
     "Authentication required" : "Authentification requise",
     "Server address" : "Adresse du serveur",
     "Port" : "Port",
-    "Credentials" : "Authentification",
+    "Credentials" : "Informations d'identification",
     "SMTP Username" : "Nom d'utilisateur SMTP",
     "SMTP Password" : "Mot de passe SMTP",
     "Store credentials" : "Enregistrer les identifiants",
@@ -173,6 +165,8 @@
     "Version" : "Version",
     "More apps" : "Plus d'applications",
     "Developer documentation" : "Documentation pour les développeurs",
+    "Experimental applications ahead" : "Attention! Applications expérimentales",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Les applications expérimentales n'ont pas été testées pour les problèmes de sécurité, sont nouvelles ou connues comme étant instables et sont encore en développement. Les installer peut causer des pertes de données ou des failles de sécurités. ",
     "by" : "par",
     "licensed" : "Sous licence",
     "Documentation:" : "Documentation :",
@@ -184,15 +178,17 @@
     "Update to %s" : "Mettre à niveau vers la version %s",
     "Enable only for specific groups" : "Activer uniquement pour certains groupes",
     "Uninstall App" : "Désinstaller l'application",
+    "Enable experimental apps" : "Activer les applications expérimentales",
     "No apps found for your version" : "Pas d'application trouvée pour votre version",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Bonjour,<br><br>Un compte %s a été créé pour vous.<br><br>Votre nom d'utilisateur est : %s<br>Visitez votre compte : <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "À bientôt !",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Bonjour,<br><br>Un compte %s a été créé pour vous.<br><br>Votre nom d'utilisateur est : %s<br>Visitez votre compte : %s<br><br>\n",
-    "Administrator Documentation" : "Documentation administrateur",
-    "Online Documentation" : "Documentation en ligne",
+    "User documentation" : "Documentation utilisateur",
+    "Administrator documentation" : "Documentation administrateur",
+    "Online documentation" : "Documentation en ligne",
     "Forum" : "Forum",
-    "Bugtracker" : "Suivi de bugs",
-    "Commercial Support" : "Support commercial",
+    "Issue tracker" : "Suivi de problèmes",
+    "Commercial support" : "Support commercial",
     "Get the apps to sync your files" : "Obtenez les applications de synchronisation de vos fichiers",
     "Desktop client" : "Client de bureau",
     "Android app" : "Application Android",
@@ -227,12 +223,6 @@
     "Issued By" : "Délivré par",
     "Valid until %s" : "Valide jusqu'à %s",
     "Import root certificate" : "Importer un certificat racine",
-    "The encryption app is no longer enabled, please decrypt all your files" : "L'app de chiffrement n’est plus activée, veuillez déchiffrer tous vos fichiers",
-    "Log-in password" : "Mot de passe de connexion",
-    "Decrypt all Files" : "Déchiffrer tous les fichiers",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vos clés de chiffrement ont été déplacées dans l'emplacement de sauvegarde. Si quelque chose devait mal se passer, vous pourrez restaurer les clés. Choisissez la suppression permanente seulement si vous êtes sûr que tous les fichiers ont été déchiffrés correctement.",
-    "Restore Encryption Keys" : "Restaurer les clés de chiffrement",
-    "Delete Encryption Keys" : "Supprimer les clés de chiffrement",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Développé par la {communityopen}communauté ownCloud{linkclose}, le {githubopen}code source{linkclose} est sous licence {licenseopen}<abbr lang=\"en\" title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Afficher l'emplacement du stockage",
     "Show last log in" : "Montrer la dernière connexion",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index 9eac5c02e7d..a5243375817 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Avisos de seguridade e configuración",
     "Sharing" : "Compartindo",
     "External Storage" : "Almacenamento externo",
+    "Server Side Encryption" : "Cifrado na parte do servidor",
     "Cron" : "Cron",
     "Email Server" : "Servidor de correo",
     "Log" : "Rexistro",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Produciuse un erro de autenticación",
     "Your full name has been changed." : "O seu nome completo foi cambiado",
     "Unable to change full name" : "Non é posíbel cambiar o nome completo",
-    "Files decrypted successfully" : "Ficheiros descifrados satisfactoriamente",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Non foi posíbel descifrar os seus ficheiros. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
-    "Couldn't decrypt your files, check your password and try again" : "Non foi posíbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo",
-    "Encryption keys deleted permanently" : "As chaves de cifrado foron eliminadas permanentemente",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Non foi posíbel eliminar permanentemente as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
     "Couldn't remove app." : "Non foi posíbel retirar a aplicación.",
-    "Backups restored successfully" : "As copias de seguranza foron restauradas satisfactoriamente",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Non foi posíbel restaurar as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
     "Language changed" : "O idioma cambiou",
     "Invalid request" : "Petición incorrecta",
     "Admins can't remove themself from the admin group" : "Os administradores non poden eliminarse a si mesmos do grupo admin",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Non é posíbel cambiar o contrasinal",
     "Enabled" : "Activado",
     "Not enabled" : "Non activado",
-    "Recommended" : "Recomendado",
     "Group already exists." : "Xa existe o grupo.",
     "Unable to add group." : "Non é posíbel engadir o grupo.",
     "Unable to delete group." : "Non é posíbel eliminar o grupo.",
@@ -57,6 +50,9 @@ OC.L10N.register(
     "Add trusted domain" : "Engadir dominio de confianza",
     "Sending..." : "Enviando...",
     "All" : "Todo",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As aplicacións oficiais son desenvolvidas pola comunidade dentro de ownCloud. Ofrecen una funcionalidade central para ownCloud e están preparadas para o seu uso en produción.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "As aplicacións aprobadas son desenvolvidas por desenvolvedores de confianza e pasaron un control de seguridade superficial. Mantéñense activamente nun repositorio de código aberto e os seus mantedores consideran que son estábeis para uso casual normal.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "A esta aplicación non se lle fixeron comprobacións de seguridade, ademais é nova ou coñecida por ser inestábel. Instálea baixo a súa responsabilidade.",
     "Please wait...." : "Agarde...",
     "Error while disabling app" : "Produciuse un erro ao desactivar a aplicación",
     "Disable" : "Desactivar",
@@ -76,9 +72,6 @@ OC.L10N.register(
     "Strong password" : "Contrasinal forte",
     "Valid until {date}" : "Válido ata {date}",
     "Delete" : "Eliminar",
-    "Decrypting files... Please wait, this can take some time." : "Descifrando ficheiros... isto pode levar un anaco.",
-    "Delete encryption keys permanently." : "Eliminar permanentemente as chaves de cifrado.",
-    "Restore encryption keys." : "Restaurar as chaves de cifrado.",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "Non é posíbel eliminar {objName}",
     "Error creating group" : "Produciuse un erro ao crear o grupo",
@@ -98,12 +91,11 @@ OC.L10N.register(
     "Sync clients" : "Clientes de sincronización",
     "Personal info" : "Información persoal",
     "SSL root certificates" : "Certificados raíz SSL",
-    "Encryption" : "Cifrado",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (problemas críticos, erros, avisos, información, depuración)",
-    "Info, warnings, errors and fatal issues" : "Información, avisos, erros e problemas críticos",
-    "Warnings, errors and fatal issues" : "Avisos, erros e problemas críticos",
-    "Errors and fatal issues" : "Erros e problemas críticos",
-    "Fatal issues only" : "Só problemas críticos",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (incidencias críticas, erros, avisos, información, depuración)",
+    "Info, warnings, errors and fatal issues" : "Información, avisos, erros e incidencias críticas",
+    "Warnings, errors and fatal issues" : "Avisos, erros e incidencias críticas",
+    "Errors and fatal issues" : "Erros e incidencias críticas",
+    "Fatal issues only" : "Só incidencias críticas",
     "None" : "Ningún",
     "Login" : "Acceso",
     "Plain" : "Simple",
@@ -119,7 +111,7 @@ OC.L10N.register(
     "System locale can not be set to a one which supports UTF-8." : "Non é posíbel estabelecer a configuración rexional do sistema a unha que admita UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Isto significa que pode haber problemas con certos caracteres en nomes de ficheiro.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Recomendámoslle que instale no sistema os paquetes necesarios para admitir unha das seguintes configuracións rexionais: %s.",
-    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación no está feita na raíz do dominio e usa o sistema cron, pode haber problemas coa xeración de URL. Para evitar estes problemas, axuste a opción «overwrite.cli.url» no seu ficheiro config.php á ruta webroot da instalación (suxestión: «%s»)",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación no está feita na raíz do dominio e usa o sistema cron, pode haber incidencias coa xeración de URL. Para evitar estes problemas, axuste a opción «overwrite.cli.url» no seu ficheiro config.php á ruta webroot da instalación (suxestión: «%s»)",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Non foi posíbel executar a tarefa de cron programada desde a liña de ordes. Atopáronse os seguintes erros técnicos:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Volva comprobar as <a target=\"_blank\" href=\"%s\">guías de instalación ↗</a>, e comprobe que non existen erros ou avisos no <a href=\"#log-section\">rexistro</a>.>.",
     "Allow apps to use the Share API" : "Permitir que as aplicacións empreguen o API para compartir",
@@ -139,13 +131,14 @@ OC.L10N.register(
     "Last cron job execution: %s." : "Última execución da tarefa de cron: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Última execución da tarefa de cron: %s. Semella que algo vai mal",
     "Cron was not executed yet!" : "«Cron» aínda non foi executado!",
+    "Open documentation" : "Abrir a documentación",
     "Execute one task with each page loaded" : "Executar unha tarefa con cada páxina cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
-    "Server Side Encryption" : "Cifrado na parte do servidor",
     "Enable Server-Side-Encryption" : "Activar o cifrado na parte do servidor",
     "This is used for sending out notifications." : "Isto utilizase para o envío de notificacións.",
     "Send mode" : "Modo de envío",
+    "Encryption" : "Cifrado",
     "From address" : "Desde o enderezo",
     "mail" : "correo",
     "Authentication method" : "Método de autenticación",
@@ -175,6 +168,8 @@ OC.L10N.register(
     "Version" : "Versión",
     "More apps" : "Máis aplicativos",
     "Developer documentation" : "Documentación do desenvolvedor",
+    "Experimental applications ahead" : "Ante as aplicacións experimentais",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "As aplicacións experimentais, novas ou coñecidas por ser inestábeis e en forte desenvolvemento, non se lles fan comprobacións de seguridade. A súa instalación pode provocar a perda de datos o violacións de seguridade.",
     "by" : "por",
     "licensed" : "licencidado",
     "Documentation:" : "Documentación:",
@@ -186,15 +181,17 @@ OC.L10N.register(
     "Update to %s" : "Actualizar a %s",
     "Enable only for specific groups" : "Activar só para grupos específicos",
     "Uninstall App" : "Desinstalar unha aplicación",
+    "Enable experimental apps" : "Activar as aplicacións experimentais",
     "No apps found for your version" : "Non se atoparon aplicativos para esta versión",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ola,<br><br>Só facerlle saber que dispón da conta %s.<br><br>O seu nome de usuario: %s<br>Para acceder a ela: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Saúdos!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ola,\n\nSó facerlle saber que dispón da conta %s.\n\nO seu nome de usuario: %s\nPara acceder a ela: %s\n",
-    "Administrator Documentation" : "Documentación do administrador",
-    "Online Documentation" : "Documentación na Rede",
+    "User documentation" : "Documentación do usuario",
+    "Administrator documentation" : "Documentación do administrador",
+    "Online documentation" : "Documentación en liña",
     "Forum" : "Foro",
-    "Bugtracker" : "Seguemento de fallos",
-    "Commercial Support" : "Asistencia comercial",
+    "Issue tracker" : "Seguimento de incidencias",
+    "Commercial support" : "Asistencia comercial",
     "Get the apps to sync your files" : "Obteña as aplicacións para sincronizar os seus ficheiros",
     "Desktop client" : "Cliente de escritorio",
     "Android app" : "Aplicación Android",
@@ -229,12 +226,6 @@ OC.L10N.register(
     "Issued By" : "Fornecido por",
     "Valid until %s" : "Válido ata %s",
     "Import root certificate" : "Importar o certificado raíz",
-    "The encryption app is no longer enabled, please decrypt all your files" : "A aplicación de cifrado non está activada, descifre todos os ficheiros",
-    "Log-in password" : "Contrasinal de acceso",
-    "Decrypt all Files" : "Descifrar todos os ficheiros",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros.",
-    "Restore Encryption Keys" : "Restaurar as chaves de cifrado",
-    "Delete Encryption Keys" : "Eliminar as chaves de cifrado",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido pola {communityopen}comunidade ownCloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado baixo a {licenseopen}<abbr title=\"Licencia Pública Xeral Affero\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Amosar a localización do almacenamento",
     "Show last log in" : "Amosar a última conexión",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index ead3602888e..c9f940e389e 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Avisos de seguridade e configuración",
     "Sharing" : "Compartindo",
     "External Storage" : "Almacenamento externo",
+    "Server Side Encryption" : "Cifrado na parte do servidor",
     "Cron" : "Cron",
     "Email Server" : "Servidor de correo",
     "Log" : "Rexistro",
@@ -10,14 +11,7 @@
     "Authentication error" : "Produciuse un erro de autenticación",
     "Your full name has been changed." : "O seu nome completo foi cambiado",
     "Unable to change full name" : "Non é posíbel cambiar o nome completo",
-    "Files decrypted successfully" : "Ficheiros descifrados satisfactoriamente",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Non foi posíbel descifrar os seus ficheiros. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
-    "Couldn't decrypt your files, check your password and try again" : "Non foi posíbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo",
-    "Encryption keys deleted permanently" : "As chaves de cifrado foron eliminadas permanentemente",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Non foi posíbel eliminar permanentemente as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
     "Couldn't remove app." : "Non foi posíbel retirar a aplicación.",
-    "Backups restored successfully" : "As copias de seguranza foron restauradas satisfactoriamente",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Non foi posíbel restaurar as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
     "Language changed" : "O idioma cambiou",
     "Invalid request" : "Petición incorrecta",
     "Admins can't remove themself from the admin group" : "Os administradores non poden eliminarse a si mesmos do grupo admin",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Non é posíbel cambiar o contrasinal",
     "Enabled" : "Activado",
     "Not enabled" : "Non activado",
-    "Recommended" : "Recomendado",
     "Group already exists." : "Xa existe o grupo.",
     "Unable to add group." : "Non é posíbel engadir o grupo.",
     "Unable to delete group." : "Non é posíbel eliminar o grupo.",
@@ -55,6 +48,9 @@
     "Add trusted domain" : "Engadir dominio de confianza",
     "Sending..." : "Enviando...",
     "All" : "Todo",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As aplicacións oficiais son desenvolvidas pola comunidade dentro de ownCloud. Ofrecen una funcionalidade central para ownCloud e están preparadas para o seu uso en produción.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "As aplicacións aprobadas son desenvolvidas por desenvolvedores de confianza e pasaron un control de seguridade superficial. Mantéñense activamente nun repositorio de código aberto e os seus mantedores consideran que son estábeis para uso casual normal.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "A esta aplicación non se lle fixeron comprobacións de seguridade, ademais é nova ou coñecida por ser inestábel. Instálea baixo a súa responsabilidade.",
     "Please wait...." : "Agarde...",
     "Error while disabling app" : "Produciuse un erro ao desactivar a aplicación",
     "Disable" : "Desactivar",
@@ -74,9 +70,6 @@
     "Strong password" : "Contrasinal forte",
     "Valid until {date}" : "Válido ata {date}",
     "Delete" : "Eliminar",
-    "Decrypting files... Please wait, this can take some time." : "Descifrando ficheiros... isto pode levar un anaco.",
-    "Delete encryption keys permanently." : "Eliminar permanentemente as chaves de cifrado.",
-    "Restore encryption keys." : "Restaurar as chaves de cifrado.",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "Non é posíbel eliminar {objName}",
     "Error creating group" : "Produciuse un erro ao crear o grupo",
@@ -96,12 +89,11 @@
     "Sync clients" : "Clientes de sincronización",
     "Personal info" : "Información persoal",
     "SSL root certificates" : "Certificados raíz SSL",
-    "Encryption" : "Cifrado",
-    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (problemas críticos, erros, avisos, información, depuración)",
-    "Info, warnings, errors and fatal issues" : "Información, avisos, erros e problemas críticos",
-    "Warnings, errors and fatal issues" : "Avisos, erros e problemas críticos",
-    "Errors and fatal issues" : "Erros e problemas críticos",
-    "Fatal issues only" : "Só problemas críticos",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (incidencias críticas, erros, avisos, información, depuración)",
+    "Info, warnings, errors and fatal issues" : "Información, avisos, erros e incidencias críticas",
+    "Warnings, errors and fatal issues" : "Avisos, erros e incidencias críticas",
+    "Errors and fatal issues" : "Erros e incidencias críticas",
+    "Fatal issues only" : "Só incidencias críticas",
     "None" : "Ningún",
     "Login" : "Acceso",
     "Plain" : "Simple",
@@ -117,7 +109,7 @@
     "System locale can not be set to a one which supports UTF-8." : "Non é posíbel estabelecer a configuración rexional do sistema a unha que admita UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Isto significa que pode haber problemas con certos caracteres en nomes de ficheiro.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Recomendámoslle que instale no sistema os paquetes necesarios para admitir unha das seguintes configuracións rexionais: %s.",
-    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación no está feita na raíz do dominio e usa o sistema cron, pode haber problemas coa xeración de URL. Para evitar estes problemas, axuste a opción «overwrite.cli.url» no seu ficheiro config.php á ruta webroot da instalación (suxestión: «%s»)",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación no está feita na raíz do dominio e usa o sistema cron, pode haber incidencias coa xeración de URL. Para evitar estes problemas, axuste a opción «overwrite.cli.url» no seu ficheiro config.php á ruta webroot da instalación (suxestión: «%s»)",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Non foi posíbel executar a tarefa de cron programada desde a liña de ordes. Atopáronse os seguintes erros técnicos:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Volva comprobar as <a target=\"_blank\" href=\"%s\">guías de instalación ↗</a>, e comprobe que non existen erros ou avisos no <a href=\"#log-section\">rexistro</a>.>.",
     "Allow apps to use the Share API" : "Permitir que as aplicacións empreguen o API para compartir",
@@ -137,13 +129,14 @@
     "Last cron job execution: %s." : "Última execución da tarefa de cron: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Última execución da tarefa de cron: %s. Semella que algo vai mal",
     "Cron was not executed yet!" : "«Cron» aínda non foi executado!",
+    "Open documentation" : "Abrir a documentación",
     "Execute one task with each page loaded" : "Executar unha tarefa con cada páxina cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
-    "Server Side Encryption" : "Cifrado na parte do servidor",
     "Enable Server-Side-Encryption" : "Activar o cifrado na parte do servidor",
     "This is used for sending out notifications." : "Isto utilizase para o envío de notificacións.",
     "Send mode" : "Modo de envío",
+    "Encryption" : "Cifrado",
     "From address" : "Desde o enderezo",
     "mail" : "correo",
     "Authentication method" : "Método de autenticación",
@@ -173,6 +166,8 @@
     "Version" : "Versión",
     "More apps" : "Máis aplicativos",
     "Developer documentation" : "Documentación do desenvolvedor",
+    "Experimental applications ahead" : "Ante as aplicacións experimentais",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "As aplicacións experimentais, novas ou coñecidas por ser inestábeis e en forte desenvolvemento, non se lles fan comprobacións de seguridade. A súa instalación pode provocar a perda de datos o violacións de seguridade.",
     "by" : "por",
     "licensed" : "licencidado",
     "Documentation:" : "Documentación:",
@@ -184,15 +179,17 @@
     "Update to %s" : "Actualizar a %s",
     "Enable only for specific groups" : "Activar só para grupos específicos",
     "Uninstall App" : "Desinstalar unha aplicación",
+    "Enable experimental apps" : "Activar as aplicacións experimentais",
     "No apps found for your version" : "Non se atoparon aplicativos para esta versión",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ola,<br><br>Só facerlle saber que dispón da conta %s.<br><br>O seu nome de usuario: %s<br>Para acceder a ela: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Saúdos!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ola,\n\nSó facerlle saber que dispón da conta %s.\n\nO seu nome de usuario: %s\nPara acceder a ela: %s\n",
-    "Administrator Documentation" : "Documentación do administrador",
-    "Online Documentation" : "Documentación na Rede",
+    "User documentation" : "Documentación do usuario",
+    "Administrator documentation" : "Documentación do administrador",
+    "Online documentation" : "Documentación en liña",
     "Forum" : "Foro",
-    "Bugtracker" : "Seguemento de fallos",
-    "Commercial Support" : "Asistencia comercial",
+    "Issue tracker" : "Seguimento de incidencias",
+    "Commercial support" : "Asistencia comercial",
     "Get the apps to sync your files" : "Obteña as aplicacións para sincronizar os seus ficheiros",
     "Desktop client" : "Cliente de escritorio",
     "Android app" : "Aplicación Android",
@@ -227,12 +224,6 @@
     "Issued By" : "Fornecido por",
     "Valid until %s" : "Válido ata %s",
     "Import root certificate" : "Importar o certificado raíz",
-    "The encryption app is no longer enabled, please decrypt all your files" : "A aplicación de cifrado non está activada, descifre todos os ficheiros",
-    "Log-in password" : "Contrasinal de acceso",
-    "Decrypt all Files" : "Descifrar todos os ficheiros",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros.",
-    "Restore Encryption Keys" : "Restaurar as chaves de cifrado",
-    "Delete Encryption Keys" : "Eliminar as chaves de cifrado",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido pola {communityopen}comunidade ownCloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado baixo a {licenseopen}<abbr title=\"Licencia Pública Xeral Affero\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Amosar a localización do almacenamento",
     "Show last log in" : "Amosar a última conexión",
diff --git a/settings/l10n/he.js b/settings/l10n/he.js
index 1f57f9516e6..0873768285e 100644
--- a/settings/l10n/he.js
+++ b/settings/l10n/he.js
@@ -32,12 +32,12 @@ OC.L10N.register(
     "A valid password must be provided" : "יש לספק ססמה תקנית",
     "__language_name__" : "עברית",
     "SSL root certificates" : "שורש אישורי אבטחת SSL ",
-    "Encryption" : "הצפנה",
     "None" : "כלום",
     "Login" : "התחברות",
     "Allow apps to use the Share API" : "לאפשר ליישום להשתמש ב־API השיתוף",
     "Allow resharing" : "לאפשר שיתוף מחדש",
     "Execute one task with each page loaded" : "יש להפעיל משימה אחת עם כל עמוד שנטען",
+    "Encryption" : "הצפנה",
     "Server address" : "כתובת שרת",
     "Port" : "פורט",
     "Credentials" : "פרטי גישה",
@@ -48,11 +48,7 @@ OC.L10N.register(
     "More apps" : "יישומים נוספים",
     "by" : "על ידי",
     "User Documentation" : "תיעוד משתמש",
-    "Administrator Documentation" : "תיעוד מנהלים",
-    "Online Documentation" : "תיעוד מקוון",
     "Forum" : "פורום",
-    "Bugtracker" : "עוקב תקלות",
-    "Commercial Support" : "תמיכה בתשלום",
     "Get the apps to sync your files" : "השג את האפליקציות על מנת לסנכרן את הקבצים שלך",
     "Show First Run Wizard again" : "הצגת אשף ההפעלה הראשונית שוב",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך",
diff --git a/settings/l10n/he.json b/settings/l10n/he.json
index ce2e69f8b83..47e9f8d95e9 100644
--- a/settings/l10n/he.json
+++ b/settings/l10n/he.json
@@ -30,12 +30,12 @@
     "A valid password must be provided" : "יש לספק ססמה תקנית",
     "__language_name__" : "עברית",
     "SSL root certificates" : "שורש אישורי אבטחת SSL ",
-    "Encryption" : "הצפנה",
     "None" : "כלום",
     "Login" : "התחברות",
     "Allow apps to use the Share API" : "לאפשר ליישום להשתמש ב־API השיתוף",
     "Allow resharing" : "לאפשר שיתוף מחדש",
     "Execute one task with each page loaded" : "יש להפעיל משימה אחת עם כל עמוד שנטען",
+    "Encryption" : "הצפנה",
     "Server address" : "כתובת שרת",
     "Port" : "פורט",
     "Credentials" : "פרטי גישה",
@@ -46,11 +46,7 @@
     "More apps" : "יישומים נוספים",
     "by" : "על ידי",
     "User Documentation" : "תיעוד משתמש",
-    "Administrator Documentation" : "תיעוד מנהלים",
-    "Online Documentation" : "תיעוד מקוון",
     "Forum" : "פורום",
-    "Bugtracker" : "עוקב תקלות",
-    "Commercial Support" : "תמיכה בתשלום",
     "Get the apps to sync your files" : "השג את האפליקציות על מנת לסנכרן את הקבצים שלך",
     "Show First Run Wizard again" : "הצגת אשף ההפעלה הראשונית שוב",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך",
diff --git a/settings/l10n/hr.js b/settings/l10n/hr.js
index 037f9ff1e1c..df3fe9cc7df 100644
--- a/settings/l10n/hr.js
+++ b/settings/l10n/hr.js
@@ -10,14 +10,7 @@ OC.L10N.register(
     "Authentication error" : "Pogrešna autentikacija",
     "Your full name has been changed." : "Vaše puno ime je promijenjeno.",
     "Unable to change full name" : "Puno ime nije moguće promijeniti.",
-    "Files decrypted successfully" : "Datoteke uspješno dešifrirane",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Vaše datoteke nije moguće dešifrirati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
-    "Couldn't decrypt your files, check your password and try again" : "Vaše datoteke nije moguće dešifrirati, provjerite svoju lozinku i pokušajte ponovno.",
-    "Encryption keys deleted permanently" : "Ključevi za šifriranje trajno izbrisani",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće trajno izbrisati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
     "Couldn't remove app." : "Nije moguće ukloniti app.",
-    "Backups restored successfully" : "Sigurnosne kopije uspješno obnovljene",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće obnoviti, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
     "Language changed" : "Promjena jezika",
     "Invalid request" : "Zahtjev neispravan",
     "Admins can't remove themself from the admin group" : "Administratori ne mogu sami sebe ukloniti iz admin grupe",
@@ -30,7 +23,6 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Pogrešna admin lozinka za oporavak. Molimo provjerite lozinku i pokušajte ponovno.",
     "Unable to change password" : "Promjena lozinke nije moguća",
     "Enabled" : "Aktivirano",
-    "Recommended" : "Preporuceno",
     "Saved" : "Spremljeno",
     "test email settings" : "Postavke za testiranje e-pošte",
     "Email sent" : "E-pošta je poslana",
@@ -59,9 +51,6 @@ OC.L10N.register(
     "Strong password" : "Lozinka snažna",
     "Valid until {date}" : "Valid until {date}",
     "Delete" : "Izbrišite",
-    "Decrypting files... Please wait, this can take some time." : "Dešifriranje datoteka... Molimo pričekajte, to može potrajati neko vrijeme.",
-    "Delete encryption keys permanently." : "Trajno izbrišite ključeve za šifriranje",
-    "Restore encryption keys." : "Obnovite ključeve za šifriranje",
     "Groups" : "Grupe",
     "Unable to delete {objName}" : "Nije moguće izbrisati {objName}",
     "Error creating group" : "Pogrešno kreiranje grupe",
@@ -76,7 +65,6 @@ OC.L10N.register(
     "A valid password must be provided" : "Nužno je navesti valjanu lozinku",
     "__language_name__" : "__jezik_naziv___",
     "SSL root certificates" : "SSL Root certifikati",
-    "Encryption" : "Šifriranje",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Sve (kobni problemi, pogreške, upozorenja, ispravljanje pogrešaka)",
     "Info, warnings, errors and fatal issues" : "Informacije, upozorenja, pogreške i kobni problemi",
     "Warnings, errors and fatal issues" : "Upozorenja, pogreške i kobni problemi",
@@ -112,6 +100,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Koristite cron uslugu sustava za pozivanje cron.php datoteke svakih 15 minuta.",
     "This is used for sending out notifications." : "Ovo se koristi za slanje notifikacija.",
     "Send mode" : "Način rada za slanje",
+    "Encryption" : "Šifriranje",
     "From address" : "S adrese",
     "mail" : "pošta",
     "Authentication method" : "Postupak autentikacije",
@@ -134,11 +123,7 @@ OC.L10N.register(
     "Enable only for specific groups" : "Omogućite samo za specifične grupe",
     "Uninstall App" : "Deinstalirajte app",
     "Cheers!" : "Cheers!",
-    "Administrator Documentation" : "Dokumentacija administratora",
-    "Online Documentation" : "Online dokumentacija",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Komercijalna podrška",
     "Get the apps to sync your files" : "Koristite aplikacije za sinkronizaciju svojih datoteka",
     "Show First Run Wizard again" : "Opet pokažite First Run Wizard",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Iskoristili ste <strong>%s</strong> od raspoloživog <strong>%s</strong>",
@@ -164,12 +149,6 @@ OC.L10N.register(
     "Valid until" : "Valid until",
     "Issued By" : "Issued By",
     "Valid until %s" : "Valid until %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikacija šifriranja više nije omogćena,molimo dešifrirajte sve svoje datoteke",
-    "Log-in password" : "Lozinka za prijavu",
-    "Decrypt all Files" : "Dešifrirajte sve datoteke",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaši ključevi za šifriranje premješteni su na mjesto sigurnosne kopije. Ako neštokrene loše, ključeve možete obnoviti. Iizbrišite ih trajno samo ako ste sigurni da susve datoteke ispravno dešifrirane.",
-    "Restore Encryption Keys" : "Obnovite ključeve za šifriranje",
-    "Delete Encryption Keys" : "Izbrišite ključeve za šifriranje",
     "Show storage location" : "Prikaži mjesto pohrane",
     "Show last log in" : "Prikaži zadnje spajanje",
     "Username" : "Korisničko ime",
diff --git a/settings/l10n/hr.json b/settings/l10n/hr.json
index b48b3bc4827..8029837f4ac 100644
--- a/settings/l10n/hr.json
+++ b/settings/l10n/hr.json
@@ -8,14 +8,7 @@
     "Authentication error" : "Pogrešna autentikacija",
     "Your full name has been changed." : "Vaše puno ime je promijenjeno.",
     "Unable to change full name" : "Puno ime nije moguće promijeniti.",
-    "Files decrypted successfully" : "Datoteke uspješno dešifrirane",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Vaše datoteke nije moguće dešifrirati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
-    "Couldn't decrypt your files, check your password and try again" : "Vaše datoteke nije moguće dešifrirati, provjerite svoju lozinku i pokušajte ponovno.",
-    "Encryption keys deleted permanently" : "Ključevi za šifriranje trajno izbrisani",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće trajno izbrisati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
     "Couldn't remove app." : "Nije moguće ukloniti app.",
-    "Backups restored successfully" : "Sigurnosne kopije uspješno obnovljene",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće obnoviti, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
     "Language changed" : "Promjena jezika",
     "Invalid request" : "Zahtjev neispravan",
     "Admins can't remove themself from the admin group" : "Administratori ne mogu sami sebe ukloniti iz admin grupe",
@@ -28,7 +21,6 @@
     "Wrong admin recovery password. Please check the password and try again." : "Pogrešna admin lozinka za oporavak. Molimo provjerite lozinku i pokušajte ponovno.",
     "Unable to change password" : "Promjena lozinke nije moguća",
     "Enabled" : "Aktivirano",
-    "Recommended" : "Preporuceno",
     "Saved" : "Spremljeno",
     "test email settings" : "Postavke za testiranje e-pošte",
     "Email sent" : "E-pošta je poslana",
@@ -57,9 +49,6 @@
     "Strong password" : "Lozinka snažna",
     "Valid until {date}" : "Valid until {date}",
     "Delete" : "Izbrišite",
-    "Decrypting files... Please wait, this can take some time." : "Dešifriranje datoteka... Molimo pričekajte, to može potrajati neko vrijeme.",
-    "Delete encryption keys permanently." : "Trajno izbrišite ključeve za šifriranje",
-    "Restore encryption keys." : "Obnovite ključeve za šifriranje",
     "Groups" : "Grupe",
     "Unable to delete {objName}" : "Nije moguće izbrisati {objName}",
     "Error creating group" : "Pogrešno kreiranje grupe",
@@ -74,7 +63,6 @@
     "A valid password must be provided" : "Nužno je navesti valjanu lozinku",
     "__language_name__" : "__jezik_naziv___",
     "SSL root certificates" : "SSL Root certifikati",
-    "Encryption" : "Šifriranje",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Sve (kobni problemi, pogreške, upozorenja, ispravljanje pogrešaka)",
     "Info, warnings, errors and fatal issues" : "Informacije, upozorenja, pogreške i kobni problemi",
     "Warnings, errors and fatal issues" : "Upozorenja, pogreške i kobni problemi",
@@ -110,6 +98,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Koristite cron uslugu sustava za pozivanje cron.php datoteke svakih 15 minuta.",
     "This is used for sending out notifications." : "Ovo se koristi za slanje notifikacija.",
     "Send mode" : "Način rada za slanje",
+    "Encryption" : "Šifriranje",
     "From address" : "S adrese",
     "mail" : "pošta",
     "Authentication method" : "Postupak autentikacije",
@@ -132,11 +121,7 @@
     "Enable only for specific groups" : "Omogućite samo za specifične grupe",
     "Uninstall App" : "Deinstalirajte app",
     "Cheers!" : "Cheers!",
-    "Administrator Documentation" : "Dokumentacija administratora",
-    "Online Documentation" : "Online dokumentacija",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Komercijalna podrška",
     "Get the apps to sync your files" : "Koristite aplikacije za sinkronizaciju svojih datoteka",
     "Show First Run Wizard again" : "Opet pokažite First Run Wizard",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Iskoristili ste <strong>%s</strong> od raspoloživog <strong>%s</strong>",
@@ -162,12 +147,6 @@
     "Valid until" : "Valid until",
     "Issued By" : "Issued By",
     "Valid until %s" : "Valid until %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikacija šifriranja više nije omogćena,molimo dešifrirajte sve svoje datoteke",
-    "Log-in password" : "Lozinka za prijavu",
-    "Decrypt all Files" : "Dešifrirajte sve datoteke",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaši ključevi za šifriranje premješteni su na mjesto sigurnosne kopije. Ako neštokrene loše, ključeve možete obnoviti. Iizbrišite ih trajno samo ako ste sigurni da susve datoteke ispravno dešifrirane.",
-    "Restore Encryption Keys" : "Obnovite ključeve za šifriranje",
-    "Delete Encryption Keys" : "Izbrišite ključeve za šifriranje",
     "Show storage location" : "Prikaži mjesto pohrane",
     "Show last log in" : "Prikaži zadnje spajanje",
     "Username" : "Korisničko ime",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index fbdca20bce4..ab814016112 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -10,14 +10,7 @@ OC.L10N.register(
     "Authentication error" : "Azonosítási hiba",
     "Your full name has been changed." : "Az Ön teljes nevét módosítottuk.",
     "Unable to change full name" : "Nem sikerült megváltoztatni a teljes nevét",
-    "Files decrypted successfully" : "A fájlok titkosítását sikeresen megszüntettük.",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Fájljainak titkosítását nem sikerült megszüntetni, kérjük forduljon a rendszergazdához!",
-    "Couldn't decrypt your files, check your password and try again" : "Fájljainak titkosítását nem sikerült megszüntetni, ellenőrizze a jelszavát, és próbálja újra!",
-    "Encryption keys deleted permanently" : "A titkosítási kulcsait véglegesen töröltük.",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "A titkosítási kulcsait nem sikerült véglegesen törölni, kérjük ellenőrizze az owncloud.log naplófájlt, vagy forduljon a rendszergazdához!",
     "Couldn't remove app." : "Az alkalmazást nem sikerült eltávolítani.",
-    "Backups restored successfully" : "A kulcsokat sikereresen visszaállítottuk a mentésekből.",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "A titkosítási kulcsok visszaállítása nem sikerült. Kérjük ellenőrizze az owncloud.log naplófájlt vagy forduljon a rendszergazdához!",
     "Language changed" : "A nyelv megváltozott",
     "Invalid request" : "Érvénytelen kérés",
     "Admins can't remove themself from the admin group" : "Adminisztrátorok nem távolíthatják el magukat az admin csoportból.",
@@ -30,7 +23,6 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Hibás admin helyreállítási jelszó. Ellenőrizze a jelszót és próbálja újra!",
     "Unable to change password" : "Nem sikerült megváltoztatni a jelszót",
     "Enabled" : "Bekapcsolva",
-    "Recommended" : "Ajánlott",
     "Saved" : "Elmentve",
     "test email settings" : "e-mail beállítások ellenőrzése",
     "Email sent" : "Az e-mailt elküldtük",
@@ -58,9 +50,6 @@ OC.L10N.register(
     "Good password" : "Jó jelszó",
     "Strong password" : "Erős jelszó",
     "Delete" : "Törlés",
-    "Decrypting files... Please wait, this can take some time." : "A fájlok titkosításának megszüntetése folyamatban. van... Kérem várjon, ez hosszabb ideig is eltarthat ...",
-    "Delete encryption keys permanently." : "A tikosítási kulcsok végleges törlése.",
-    "Restore encryption keys." : "A titkosítási kulcsok visszaállítása.",
     "Groups" : "Csoportok",
     "Unable to delete {objName}" : "Ezt nem sikerült törölni: {objName}",
     "Error creating group" : "Hiba történt a csoport létrehozása közben",
@@ -75,7 +64,6 @@ OC.L10N.register(
     "A valid password must be provided" : "Érvényes jelszót kell megadnia",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "SSL tanúsítványok",
-    "Encryption" : "Titkosítás",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
     "Info, warnings, errors and fatal issues" : "Információk, figyelmeztetések, hibák és végzetes hibák",
     "Warnings, errors and fatal issues" : "Figyelmeztetések, hibák és végzetes hibák",
@@ -111,6 +99,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
     "This is used for sending out notifications." : "Ezt használjuk a jelentések kiküldésére.",
     "Send mode" : "Küldési mód",
+    "Encryption" : "Titkosítás",
     "From address" : "A feladó címe",
     "mail" : "mail",
     "Authentication method" : "A felhasználóazonosítás módszere",
@@ -133,11 +122,7 @@ OC.L10N.register(
     "Enable only for specific groups" : "Csak bizonyos csoportok számára tegyük elérhetővé",
     "Uninstall App" : "Az alkalmazás eltávolítása",
     "Cheers!" : "Üdv.",
-    "Administrator Documentation" : "Üzemeltetői leírás",
-    "Online Documentation" : "Online leírás",
     "Forum" : "Fórum",
-    "Bugtracker" : "Hibabejelentések",
-    "Commercial Support" : "Megvásárolható támogatás",
     "Get the apps to sync your files" : "Töltse le az állományok szinkronizációjához szükséges programokat!",
     "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>",
@@ -159,12 +144,6 @@ OC.L10N.register(
     "Choose as profile image" : "Válasszuk ki profilképnek",
     "Language" : "Nyelv",
     "Help translate" : "Segítsen a fordításban!",
-    "The encryption app is no longer enabled, please decrypt all your files" : "A titkosító alkalmazás a továbbiakban nincs engedélyezve, kérem állítsa vissza az állományait titkostásmentes állapotba!",
-    "Log-in password" : "Bejelentkezési jelszó",
-    "Decrypt all Files" : "Mentesíti a titkosítástól az összes fájlt",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "A titkosító kulcsai egy mentési területre kerültek. Ha valami hiba történik, még vissza tudja állítani a titkosító kulcsait. Csak akkor törölje őket véglegesen, ha biztos benne, hogy minden állományt sikerült a visszaállítani a titkosított állapotából.",
-    "Restore Encryption Keys" : "A titkosító kulcsok visszaállítása",
-    "Delete Encryption Keys" : "A titkosító kulcsok törlése",
     "Username" : "Felhasználónév",
     "Create" : "Létrehozás",
     "Admin Recovery Password" : "Adminisztrátori jelszó az állományok visszanyerésére",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index b854bc9da87..cca98b38ae6 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -8,14 +8,7 @@
     "Authentication error" : "Azonosítási hiba",
     "Your full name has been changed." : "Az Ön teljes nevét módosítottuk.",
     "Unable to change full name" : "Nem sikerült megváltoztatni a teljes nevét",
-    "Files decrypted successfully" : "A fájlok titkosítását sikeresen megszüntettük.",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Fájljainak titkosítását nem sikerült megszüntetni, kérjük forduljon a rendszergazdához!",
-    "Couldn't decrypt your files, check your password and try again" : "Fájljainak titkosítását nem sikerült megszüntetni, ellenőrizze a jelszavát, és próbálja újra!",
-    "Encryption keys deleted permanently" : "A titkosítási kulcsait véglegesen töröltük.",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "A titkosítási kulcsait nem sikerült véglegesen törölni, kérjük ellenőrizze az owncloud.log naplófájlt, vagy forduljon a rendszergazdához!",
     "Couldn't remove app." : "Az alkalmazást nem sikerült eltávolítani.",
-    "Backups restored successfully" : "A kulcsokat sikereresen visszaállítottuk a mentésekből.",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "A titkosítási kulcsok visszaállítása nem sikerült. Kérjük ellenőrizze az owncloud.log naplófájlt vagy forduljon a rendszergazdához!",
     "Language changed" : "A nyelv megváltozott",
     "Invalid request" : "Érvénytelen kérés",
     "Admins can't remove themself from the admin group" : "Adminisztrátorok nem távolíthatják el magukat az admin csoportból.",
@@ -28,7 +21,6 @@
     "Wrong admin recovery password. Please check the password and try again." : "Hibás admin helyreállítási jelszó. Ellenőrizze a jelszót és próbálja újra!",
     "Unable to change password" : "Nem sikerült megváltoztatni a jelszót",
     "Enabled" : "Bekapcsolva",
-    "Recommended" : "Ajánlott",
     "Saved" : "Elmentve",
     "test email settings" : "e-mail beállítások ellenőrzése",
     "Email sent" : "Az e-mailt elküldtük",
@@ -56,9 +48,6 @@
     "Good password" : "Jó jelszó",
     "Strong password" : "Erős jelszó",
     "Delete" : "Törlés",
-    "Decrypting files... Please wait, this can take some time." : "A fájlok titkosításának megszüntetése folyamatban. van... Kérem várjon, ez hosszabb ideig is eltarthat ...",
-    "Delete encryption keys permanently." : "A tikosítási kulcsok végleges törlése.",
-    "Restore encryption keys." : "A titkosítási kulcsok visszaállítása.",
     "Groups" : "Csoportok",
     "Unable to delete {objName}" : "Ezt nem sikerült törölni: {objName}",
     "Error creating group" : "Hiba történt a csoport létrehozása közben",
@@ -73,7 +62,6 @@
     "A valid password must be provided" : "Érvényes jelszót kell megadnia",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "SSL tanúsítványok",
-    "Encryption" : "Titkosítás",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
     "Info, warnings, errors and fatal issues" : "Információk, figyelmeztetések, hibák és végzetes hibák",
     "Warnings, errors and fatal issues" : "Figyelmeztetések, hibák és végzetes hibák",
@@ -109,6 +97,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
     "This is used for sending out notifications." : "Ezt használjuk a jelentések kiküldésére.",
     "Send mode" : "Küldési mód",
+    "Encryption" : "Titkosítás",
     "From address" : "A feladó címe",
     "mail" : "mail",
     "Authentication method" : "A felhasználóazonosítás módszere",
@@ -131,11 +120,7 @@
     "Enable only for specific groups" : "Csak bizonyos csoportok számára tegyük elérhetővé",
     "Uninstall App" : "Az alkalmazás eltávolítása",
     "Cheers!" : "Üdv.",
-    "Administrator Documentation" : "Üzemeltetői leírás",
-    "Online Documentation" : "Online leírás",
     "Forum" : "Fórum",
-    "Bugtracker" : "Hibabejelentések",
-    "Commercial Support" : "Megvásárolható támogatás",
     "Get the apps to sync your files" : "Töltse le az állományok szinkronizációjához szükséges programokat!",
     "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>",
@@ -157,12 +142,6 @@
     "Choose as profile image" : "Válasszuk ki profilképnek",
     "Language" : "Nyelv",
     "Help translate" : "Segítsen a fordításban!",
-    "The encryption app is no longer enabled, please decrypt all your files" : "A titkosító alkalmazás a továbbiakban nincs engedélyezve, kérem állítsa vissza az állományait titkostásmentes állapotba!",
-    "Log-in password" : "Bejelentkezési jelszó",
-    "Decrypt all Files" : "Mentesíti a titkosítástól az összes fájlt",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "A titkosító kulcsai egy mentési területre kerültek. Ha valami hiba történik, még vissza tudja állítani a titkosító kulcsait. Csak akkor törölje őket véglegesen, ha biztos benne, hogy minden állományt sikerült a visszaállítani a titkosított állapotából.",
-    "Restore Encryption Keys" : "A titkosító kulcsok visszaállítása",
-    "Delete Encryption Keys" : "A titkosító kulcsok törlése",
     "Username" : "Felhasználónév",
     "Create" : "Létrehozás",
     "Admin Recovery Password" : "Adminisztrátori jelszó az állományok visszanyerésére",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index 3c65f8b0c9c..bc675cc4627 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -10,14 +10,7 @@ OC.L10N.register(
     "Authentication error" : "Terjadi kesalahan saat otentikasi",
     "Your full name has been changed." : "Nama lengkap Anda telah diubah",
     "Unable to change full name" : "Tidak dapat mengubah nama lengkap",
-    "Files decrypted successfully" : "Berkas berhasil dideskripsi",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Tidak dapat mendeskripsi berkas Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda",
-    "Couldn't decrypt your files, check your password and try again" : "Tidak dapat mendeskripsi berkas Anda, periksa sandi Anda dan coba lagi",
-    "Encryption keys deleted permanently" : "Kunci enkripsi dihapus secara permanen",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Tidak dapat menghapus kunci enkripsi anda secara permanen, mohon periksa owncloud.log atau tanyakan pada administrator Anda",
     "Couldn't remove app." : "Tidak dapat menghapus aplikasi.",
-    "Backups restored successfully" : "Cadangan berhasil dipulihkan",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Tidak dapat memulihkan kunci enkripsi Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda.",
     "Language changed" : "Bahasa telah diubah",
     "Invalid request" : "Permintaan tidak valid",
     "Admins can't remove themself from the admin group" : "Admin tidak dapat menghapus dirinya sendiri dari grup admin",
@@ -31,7 +24,6 @@ OC.L10N.register(
     "Unable to change password" : "Tidak dapat mengubah sandi",
     "Enabled" : "Diaktifkan",
     "Not enabled" : "Tidak diaktifkan",
-    "Recommended" : "Direkomendasikan",
     "Group already exists." : "Grup sudah ada.",
     "Unable to add group." : "Tidak dapat menambah grup.",
     "Unable to delete group." : "Tidak dapat menghapus grup.",
@@ -71,9 +63,6 @@ OC.L10N.register(
     "Strong password" : "Sandi kuat",
     "Valid until {date}" : "Berlaku sampai {date}",
     "Delete" : "Hapus",
-    "Decrypting files... Please wait, this can take some time." : "Mendeskripsi berkas... Mohon tunggu, ini memerlukan beberapa saat.",
-    "Delete encryption keys permanently." : "Hapus kunci enkripsi secara permanen.",
-    "Restore encryption keys." : "Memulihkan kunci enkripsi.",
     "Groups" : "Grup",
     "Unable to delete {objName}" : "Tidak dapat menghapus {objName}",
     "Error creating group" : "Terjadi kesalahan saat membuat grup",
@@ -91,7 +80,6 @@ OC.L10N.register(
     "A valid email must be provided" : "Email yang benar harus diberikan",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "Sertifikat root SSL",
-    "Encryption" : "Enkripsi",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Semuanya (Masalah fatal, galat, peringatan, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, peringatan, galat dan masalah fatal",
     "Warnings, errors and fatal issues" : "Peringatan, galat dan masalah fatal",
@@ -132,6 +120,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
     "This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
     "Send mode" : "Modus kirim",
+    "Encryption" : "Enkripsi",
     "From address" : "Dari alamat",
     "mail" : "email",
     "Authentication method" : "Metode otentikasi",
@@ -162,11 +151,7 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hai,<br><br>sekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.<br><br>Nama Pengguna Anda: %s<br>Akses di: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Horee!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hai,\n\nsekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.\n\nNama Pengguna Anda: %s\nAkses di: %s\n",
-    "Administrator Documentation" : "Dokumentasi Administrator",
-    "Online Documentation" : "Dokumentasi Online",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Dukungan Komersial",
     "Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
     "Desktop client" : "Klien desktop",
     "Android app" : "Aplikasi Android",
@@ -197,12 +182,6 @@ OC.L10N.register(
     "Valid until" : "Berlaku sampai",
     "Issued By" : "Diterbitkan oleh",
     "Valid until %s" : "Berlaku sampai %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda",
-    "Log-in password" : "Sandi masuk",
-    "Decrypt all Files" : "Deskripsi semua Berkas",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Kunci enkripsi Anda dipindahkan ke lokasi cadangan. Jika terjadi sesuatu yang tidak beres, Anda dapat memulihkan kunci. Hanya menghapusnya secara permanen jika Anda yakin bahwa semua berkas telah didekripsi dengan benar.",
-    "Restore Encryption Keys" : "Pulihkan Kunci Enkripsi",
-    "Delete Encryption Keys" : "Hapus Kuncu Enkripsi",
     "Show storage location" : "Tampilkan kolasi penyimpanan",
     "Show last log in" : "Tampilkan masuk terakhir",
     "Show user backend" : "Tampilkan pengguna backend",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index 83a40b3a573..366ab477779 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -8,14 +8,7 @@
     "Authentication error" : "Terjadi kesalahan saat otentikasi",
     "Your full name has been changed." : "Nama lengkap Anda telah diubah",
     "Unable to change full name" : "Tidak dapat mengubah nama lengkap",
-    "Files decrypted successfully" : "Berkas berhasil dideskripsi",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Tidak dapat mendeskripsi berkas Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda",
-    "Couldn't decrypt your files, check your password and try again" : "Tidak dapat mendeskripsi berkas Anda, periksa sandi Anda dan coba lagi",
-    "Encryption keys deleted permanently" : "Kunci enkripsi dihapus secara permanen",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Tidak dapat menghapus kunci enkripsi anda secara permanen, mohon periksa owncloud.log atau tanyakan pada administrator Anda",
     "Couldn't remove app." : "Tidak dapat menghapus aplikasi.",
-    "Backups restored successfully" : "Cadangan berhasil dipulihkan",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Tidak dapat memulihkan kunci enkripsi Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda.",
     "Language changed" : "Bahasa telah diubah",
     "Invalid request" : "Permintaan tidak valid",
     "Admins can't remove themself from the admin group" : "Admin tidak dapat menghapus dirinya sendiri dari grup admin",
@@ -29,7 +22,6 @@
     "Unable to change password" : "Tidak dapat mengubah sandi",
     "Enabled" : "Diaktifkan",
     "Not enabled" : "Tidak diaktifkan",
-    "Recommended" : "Direkomendasikan",
     "Group already exists." : "Grup sudah ada.",
     "Unable to add group." : "Tidak dapat menambah grup.",
     "Unable to delete group." : "Tidak dapat menghapus grup.",
@@ -69,9 +61,6 @@
     "Strong password" : "Sandi kuat",
     "Valid until {date}" : "Berlaku sampai {date}",
     "Delete" : "Hapus",
-    "Decrypting files... Please wait, this can take some time." : "Mendeskripsi berkas... Mohon tunggu, ini memerlukan beberapa saat.",
-    "Delete encryption keys permanently." : "Hapus kunci enkripsi secara permanen.",
-    "Restore encryption keys." : "Memulihkan kunci enkripsi.",
     "Groups" : "Grup",
     "Unable to delete {objName}" : "Tidak dapat menghapus {objName}",
     "Error creating group" : "Terjadi kesalahan saat membuat grup",
@@ -89,7 +78,6 @@
     "A valid email must be provided" : "Email yang benar harus diberikan",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "Sertifikat root SSL",
-    "Encryption" : "Enkripsi",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Semuanya (Masalah fatal, galat, peringatan, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, peringatan, galat dan masalah fatal",
     "Warnings, errors and fatal issues" : "Peringatan, galat dan masalah fatal",
@@ -130,6 +118,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
     "This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
     "Send mode" : "Modus kirim",
+    "Encryption" : "Enkripsi",
     "From address" : "Dari alamat",
     "mail" : "email",
     "Authentication method" : "Metode otentikasi",
@@ -160,11 +149,7 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hai,<br><br>sekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.<br><br>Nama Pengguna Anda: %s<br>Akses di: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Horee!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hai,\n\nsekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.\n\nNama Pengguna Anda: %s\nAkses di: %s\n",
-    "Administrator Documentation" : "Dokumentasi Administrator",
-    "Online Documentation" : "Dokumentasi Online",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Dukungan Komersial",
     "Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
     "Desktop client" : "Klien desktop",
     "Android app" : "Aplikasi Android",
@@ -195,12 +180,6 @@
     "Valid until" : "Berlaku sampai",
     "Issued By" : "Diterbitkan oleh",
     "Valid until %s" : "Berlaku sampai %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda",
-    "Log-in password" : "Sandi masuk",
-    "Decrypt all Files" : "Deskripsi semua Berkas",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Kunci enkripsi Anda dipindahkan ke lokasi cadangan. Jika terjadi sesuatu yang tidak beres, Anda dapat memulihkan kunci. Hanya menghapusnya secara permanen jika Anda yakin bahwa semua berkas telah didekripsi dengan benar.",
-    "Restore Encryption Keys" : "Pulihkan Kunci Enkripsi",
-    "Delete Encryption Keys" : "Hapus Kuncu Enkripsi",
     "Show storage location" : "Tampilkan kolasi penyimpanan",
     "Show last log in" : "Tampilkan masuk terakhir",
     "Show user backend" : "Tampilkan pengguna backend",
diff --git a/settings/l10n/is.js b/settings/l10n/is.js
index 85c9edbe728..0d51ee2eb39 100644
--- a/settings/l10n/is.js
+++ b/settings/l10n/is.js
@@ -21,19 +21,15 @@ OC.L10N.register(
     "never" : "aldrei",
     "__language_name__" : "__nafn_tungumáls__",
     "SSL root certificates" : "SSL rótar skilríki",
-    "Encryption" : "Dulkóðun",
     "None" : "Ekkert",
+    "Encryption" : "Dulkóðun",
     "Server address" : "Host nafn netþjóns",
     "More" : "Meira",
     "Less" : "Minna",
     "Version" : "Útgáfa",
     "by" : "af",
     "User Documentation" : "Notenda handbók",
-    "Administrator Documentation" : "Stjórnenda handbók",
-    "Online Documentation" : "Handbók á netinu",
     "Forum" : "Vefspjall",
-    "Bugtracker" : "Villubókhald",
-    "Commercial Support" : "Borgaður stuðningur",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>",
     "Password" : "Lykilorð",
     "Unable to change your password" : "Ekki tókst að breyta lykilorðinu þínu",
diff --git a/settings/l10n/is.json b/settings/l10n/is.json
index 925bfe8836a..ece8f077333 100644
--- a/settings/l10n/is.json
+++ b/settings/l10n/is.json
@@ -19,19 +19,15 @@
     "never" : "aldrei",
     "__language_name__" : "__nafn_tungumáls__",
     "SSL root certificates" : "SSL rótar skilríki",
-    "Encryption" : "Dulkóðun",
     "None" : "Ekkert",
+    "Encryption" : "Dulkóðun",
     "Server address" : "Host nafn netþjóns",
     "More" : "Meira",
     "Less" : "Minna",
     "Version" : "Útgáfa",
     "by" : "af",
     "User Documentation" : "Notenda handbók",
-    "Administrator Documentation" : "Stjórnenda handbók",
-    "Online Documentation" : "Handbók á netinu",
     "Forum" : "Vefspjall",
-    "Bugtracker" : "Villubókhald",
-    "Commercial Support" : "Borgaður stuðningur",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>",
     "Password" : "Lykilorð",
     "Unable to change your password" : "Ekki tókst að breyta lykilorðinu þínu",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index e2b6030637b..7be28b14222 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Avvisi di sicurezza e di configurazione",
     "Sharing" : "Condivisione",
     "External Storage" : "Archiviazione esterna",
+    "Server Side Encryption" : "Cifratura lato server",
     "Cron" : "Cron",
     "Email Server" : "Server di posta",
     "Log" : "Log",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Errore di autenticazione",
     "Your full name has been changed." : "Il tuo nome completo è stato cambiato.",
     "Unable to change full name" : "Impossibile cambiare il nome completo",
-    "Files decrypted successfully" : "File decifrato correttamente",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chiedi al tuo amministratore",
-    "Couldn't decrypt your files, check your password and try again" : "Impossibile decifrare i tuoi file, controlla la password e prova ancora",
-    "Encryption keys deleted permanently" : "Chiavi di cifratura eliminate definitivamente",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Impossibile eliminare definitivamente le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
     "Couldn't remove app." : "Impossibile rimuovere l'applicazione.",
-    "Backups restored successfully" : "Copie di sicurezza ripristinate correttamente",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Impossibile ripristinare le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
     "Language changed" : "Lingua modificata",
     "Invalid request" : "Richiesta non valida",
     "Admins can't remove themself from the admin group" : "Gli amministratori non possono rimuovere se stessi dal gruppo di amministrazione",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Impossibile cambiare la password",
     "Enabled" : "Abilitata",
     "Not enabled" : "Non abilitata",
-    "Recommended" : "Consigliata",
     "Group already exists." : "Il gruppo esiste già.",
     "Unable to add group." : "Impossibile aggiungere il gruppo.",
     "Unable to delete group." : "Impossibile eliminare il gruppo.",
@@ -57,6 +50,9 @@ OC.L10N.register(
     "Add trusted domain" : "Aggiungi dominio attendibile",
     "Sending..." : "Invio in corso...",
     "All" : "Tutti",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Le applicazioni ufficiali sono sviluppate da e con la comunità di ownCloud. Offrono le funzioni fondamentali di ownCloud e sono pronte per l'utilizzo in produzione.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Le applicazioni approvate sono sviluppate da sviluppatori affidabili e hanno passato un rapido controllo di sicurezza. Sono attivamente mantenute in un deposito aperto del codice e i loro responsabili le ritengono pronte sia per un utilizzo casuale che per un utilizzo continuativo.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Questa applicazione non è stata sottoposta a controlli di sicurezza, è nuova o notoriamente instabile. Installala a tuo rischio.",
     "Please wait...." : "Attendere...",
     "Error while disabling app" : "Errore durante la disattivazione",
     "Disable" : "Disabilita",
@@ -76,9 +72,6 @@ OC.L10N.register(
     "Strong password" : "Password forte",
     "Valid until {date}" : "Valido fino al {date}",
     "Delete" : "Elimina",
-    "Decrypting files... Please wait, this can take some time." : "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
-    "Delete encryption keys permanently." : "Elimina definitivamente le chiavi di cifratura.",
-    "Restore encryption keys." : "Ripristina le chiavi di cifratura.",
     "Groups" : "Gruppi",
     "Unable to delete {objName}" : "Impossibile eliminare {objName}",
     "Error creating group" : "Errore durante la creazione del gruppo",
@@ -98,7 +91,6 @@ OC.L10N.register(
     "Sync clients" : "Client di sincronizzazione",
     "Personal info" : "Informazioni personali",
     "SSL root certificates" : "Certificati SSL radice",
-    "Encryption" : "Cifratura",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tutto (problemi gravi, errori, avvisi, informazioni, debug)",
     "Info, warnings, errors and fatal issues" : "Informazioni, avvisi, errori e problemi gravi",
     "Warnings, errors and fatal issues" : "Avvisi, errori e problemi gravi",
@@ -139,13 +131,14 @@ OC.L10N.register(
     "Last cron job execution: %s." : "Ultima esecuzione di cron: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Ultima esecuzione di cron: %s. Potrebbe esserci un problema.",
     "Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
+    "Open documentation" : "Apri la documentazione",
     "Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
-    "Server Side Encryption" : "Cifratura lato server",
     "Enable Server-Side-Encryption" : "Abilita cifratura lato server",
     "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
     "Send mode" : "Modalità di invio",
+    "Encryption" : "Cifratura",
     "From address" : "Indirizzo mittente",
     "mail" : "posta",
     "Authentication method" : "Metodo di autenticazione",
@@ -175,6 +168,8 @@ OC.L10N.register(
     "Version" : "Versione",
     "More apps" : "Altre applicazioni",
     "Developer documentation" : "Documentazione dello sviluppatore",
+    "Experimental applications ahead" : "Prima le applicazioni sperimentali",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Le applicazioni sperimentali non sono sottoposte a controlli di sicurezza, sono nuove o notoriamente instabili e sotto sviluppo intensivo. La loro installazione può causare perdite di dati o problemi di sicurezza.",
     "by" : "di",
     "licensed" : "sotto licenza",
     "Documentation:" : "Documentazione:",
@@ -186,15 +181,17 @@ OC.L10N.register(
     "Update to %s" : "Aggiornato a %s",
     "Enable only for specific groups" : "Abilita solo per gruppi specifici",
     "Uninstall App" : "Disinstalla applicazione",
+    "Enable experimental apps" : "Abilita le applicazioni sperimentali",
     "No apps found for your version" : "Nessuna applicazione trovata per la tua versione",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ciao,<br><br>volevo informarti che ora hai un account %s.<br><br>Il tuo nome utente: %s<br>Accedi: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Saluti!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ciao,\n\nvolevo informarti che ora hai un account %s.\n\nIl tuo nome utente: %s\nAccedi: %s\n\n",
-    "Administrator Documentation" : "Documentazione amministratore",
-    "Online Documentation" : "Documentazione in linea",
+    "User documentation" : "Documentazione utente",
+    "Administrator documentation" : "Documentazione amministratore",
+    "Online documentation" : "Documentazione in linea",
     "Forum" : "Forum",
-    "Bugtracker" : "Sistema di tracciamento bug",
-    "Commercial Support" : "Supporto commerciale",
+    "Issue tracker" : "Sistema di tracciamento dei problemi",
+    "Commercial support" : "Supporto commerciale",
     "Get the apps to sync your files" : "Scarica le applicazioni per sincronizzare i tuoi file",
     "Desktop client" : "Client desktop",
     "Android app" : "Applicazione Android",
@@ -229,12 +226,6 @@ OC.L10N.register(
     "Issued By" : "Emesso da",
     "Valid until %s" : "Valido fino al %s",
     "Import root certificate" : "Importa certificato radice",
-    "The encryption app is no longer enabled, please decrypt all your files" : "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file",
-    "Log-in password" : "Password di accesso",
-    "Decrypt all Files" : "Decifra tutti i file",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Le tue chiavi di cifratura sono state spostate in una posizione sicura. Se qualcosa non dovesse funzionare, potrai ripristinare le chiavi. Eliminale definitivamente solo se sei sicuro che tutti i file siano stati decifrati.",
-    "Restore Encryption Keys" : "Ripristina chiavi di cifratura",
-    "Delete Encryption Keys" : "Elimina chiavi di cifratura",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di ownCloud{linkclose}, il {githubopen}codice sorgente{linkclose} è licenziato nei termini della {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostra posizione di archiviazione",
     "Show last log in" : "Mostra ultimo accesso",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 6b738f2270a..99aed5aefb5 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Avvisi di sicurezza e di configurazione",
     "Sharing" : "Condivisione",
     "External Storage" : "Archiviazione esterna",
+    "Server Side Encryption" : "Cifratura lato server",
     "Cron" : "Cron",
     "Email Server" : "Server di posta",
     "Log" : "Log",
@@ -10,14 +11,7 @@
     "Authentication error" : "Errore di autenticazione",
     "Your full name has been changed." : "Il tuo nome completo è stato cambiato.",
     "Unable to change full name" : "Impossibile cambiare il nome completo",
-    "Files decrypted successfully" : "File decifrato correttamente",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chiedi al tuo amministratore",
-    "Couldn't decrypt your files, check your password and try again" : "Impossibile decifrare i tuoi file, controlla la password e prova ancora",
-    "Encryption keys deleted permanently" : "Chiavi di cifratura eliminate definitivamente",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Impossibile eliminare definitivamente le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
     "Couldn't remove app." : "Impossibile rimuovere l'applicazione.",
-    "Backups restored successfully" : "Copie di sicurezza ripristinate correttamente",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Impossibile ripristinare le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
     "Language changed" : "Lingua modificata",
     "Invalid request" : "Richiesta non valida",
     "Admins can't remove themself from the admin group" : "Gli amministratori non possono rimuovere se stessi dal gruppo di amministrazione",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Impossibile cambiare la password",
     "Enabled" : "Abilitata",
     "Not enabled" : "Non abilitata",
-    "Recommended" : "Consigliata",
     "Group already exists." : "Il gruppo esiste già.",
     "Unable to add group." : "Impossibile aggiungere il gruppo.",
     "Unable to delete group." : "Impossibile eliminare il gruppo.",
@@ -55,6 +48,9 @@
     "Add trusted domain" : "Aggiungi dominio attendibile",
     "Sending..." : "Invio in corso...",
     "All" : "Tutti",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Le applicazioni ufficiali sono sviluppate da e con la comunità di ownCloud. Offrono le funzioni fondamentali di ownCloud e sono pronte per l'utilizzo in produzione.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Le applicazioni approvate sono sviluppate da sviluppatori affidabili e hanno passato un rapido controllo di sicurezza. Sono attivamente mantenute in un deposito aperto del codice e i loro responsabili le ritengono pronte sia per un utilizzo casuale che per un utilizzo continuativo.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Questa applicazione non è stata sottoposta a controlli di sicurezza, è nuova o notoriamente instabile. Installala a tuo rischio.",
     "Please wait...." : "Attendere...",
     "Error while disabling app" : "Errore durante la disattivazione",
     "Disable" : "Disabilita",
@@ -74,9 +70,6 @@
     "Strong password" : "Password forte",
     "Valid until {date}" : "Valido fino al {date}",
     "Delete" : "Elimina",
-    "Decrypting files... Please wait, this can take some time." : "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
-    "Delete encryption keys permanently." : "Elimina definitivamente le chiavi di cifratura.",
-    "Restore encryption keys." : "Ripristina le chiavi di cifratura.",
     "Groups" : "Gruppi",
     "Unable to delete {objName}" : "Impossibile eliminare {objName}",
     "Error creating group" : "Errore durante la creazione del gruppo",
@@ -96,7 +89,6 @@
     "Sync clients" : "Client di sincronizzazione",
     "Personal info" : "Informazioni personali",
     "SSL root certificates" : "Certificati SSL radice",
-    "Encryption" : "Cifratura",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tutto (problemi gravi, errori, avvisi, informazioni, debug)",
     "Info, warnings, errors and fatal issues" : "Informazioni, avvisi, errori e problemi gravi",
     "Warnings, errors and fatal issues" : "Avvisi, errori e problemi gravi",
@@ -137,13 +129,14 @@
     "Last cron job execution: %s." : "Ultima esecuzione di cron: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Ultima esecuzione di cron: %s. Potrebbe esserci un problema.",
     "Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
+    "Open documentation" : "Apri la documentazione",
     "Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
-    "Server Side Encryption" : "Cifratura lato server",
     "Enable Server-Side-Encryption" : "Abilita cifratura lato server",
     "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
     "Send mode" : "Modalità di invio",
+    "Encryption" : "Cifratura",
     "From address" : "Indirizzo mittente",
     "mail" : "posta",
     "Authentication method" : "Metodo di autenticazione",
@@ -173,6 +166,8 @@
     "Version" : "Versione",
     "More apps" : "Altre applicazioni",
     "Developer documentation" : "Documentazione dello sviluppatore",
+    "Experimental applications ahead" : "Prima le applicazioni sperimentali",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Le applicazioni sperimentali non sono sottoposte a controlli di sicurezza, sono nuove o notoriamente instabili e sotto sviluppo intensivo. La loro installazione può causare perdite di dati o problemi di sicurezza.",
     "by" : "di",
     "licensed" : "sotto licenza",
     "Documentation:" : "Documentazione:",
@@ -184,15 +179,17 @@
     "Update to %s" : "Aggiornato a %s",
     "Enable only for specific groups" : "Abilita solo per gruppi specifici",
     "Uninstall App" : "Disinstalla applicazione",
+    "Enable experimental apps" : "Abilita le applicazioni sperimentali",
     "No apps found for your version" : "Nessuna applicazione trovata per la tua versione",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Ciao,<br><br>volevo informarti che ora hai un account %s.<br><br>Il tuo nome utente: %s<br>Accedi: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Saluti!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ciao,\n\nvolevo informarti che ora hai un account %s.\n\nIl tuo nome utente: %s\nAccedi: %s\n\n",
-    "Administrator Documentation" : "Documentazione amministratore",
-    "Online Documentation" : "Documentazione in linea",
+    "User documentation" : "Documentazione utente",
+    "Administrator documentation" : "Documentazione amministratore",
+    "Online documentation" : "Documentazione in linea",
     "Forum" : "Forum",
-    "Bugtracker" : "Sistema di tracciamento bug",
-    "Commercial Support" : "Supporto commerciale",
+    "Issue tracker" : "Sistema di tracciamento dei problemi",
+    "Commercial support" : "Supporto commerciale",
     "Get the apps to sync your files" : "Scarica le applicazioni per sincronizzare i tuoi file",
     "Desktop client" : "Client desktop",
     "Android app" : "Applicazione Android",
@@ -227,12 +224,6 @@
     "Issued By" : "Emesso da",
     "Valid until %s" : "Valido fino al %s",
     "Import root certificate" : "Importa certificato radice",
-    "The encryption app is no longer enabled, please decrypt all your files" : "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file",
-    "Log-in password" : "Password di accesso",
-    "Decrypt all Files" : "Decifra tutti i file",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Le tue chiavi di cifratura sono state spostate in una posizione sicura. Se qualcosa non dovesse funzionare, potrai ripristinare le chiavi. Eliminale definitivamente solo se sei sicuro che tutti i file siano stati decifrati.",
-    "Restore Encryption Keys" : "Ripristina chiavi di cifratura",
-    "Delete Encryption Keys" : "Elimina chiavi di cifratura",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di ownCloud{linkclose}, il {githubopen}codice sorgente{linkclose} è licenziato nei termini della {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostra posizione di archiviazione",
     "Show last log in" : "Mostra ultimo accesso",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index eb1bf6cfa00..04ad2ec4ff0 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -1,23 +1,19 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & setup warnings" : "セキュリティ＆セットアップ警告",
     "Sharing" : "共有",
     "External Storage" : "外部ストレージ",
+    "Server Side Encryption" : "サーバーサイド暗号化",
     "Cron" : "Cron",
     "Email Server" : "メールサーバー",
     "Log" : "ログ",
+    "Tips & tricks" : "Tips & tricks",
     "Updates" : "アップデート",
     "Authentication error" : "認証エラー",
     "Your full name has been changed." : "名前を変更しました。",
     "Unable to change full name" : "名前を変更できません",
-    "Files decrypted successfully" : "ファイルの復号化に成功しました",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "ファイルを復号化することができませんでした。owncloud.logを調査するか、管理者に連絡してください。",
-    "Couldn't decrypt your files, check your password and try again" : "ファイルを復号化することができませんでした。パスワードを確認のうえ再試行してください。",
-    "Encryption keys deleted permanently" : "暗号化キーは完全に削除されます",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
     "Couldn't remove app." : "アプリが削除できませんでした。",
-    "Backups restored successfully" : "バックアップの復元に成功しました",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "暗号化キーを復元できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
     "Language changed" : "言語が変更されました",
     "Invalid request" : "不正なリクエスト",
     "Admins can't remove themself from the admin group" : "管理者は自身を管理者グループから削除できません。",
@@ -28,11 +24,10 @@ OC.L10N.register(
     "No user supplied" : "ユーザーが指定されていません",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "リカバリ用の管理者パスワードを入力してください。そうでない場合は、全ユーザーのデータが失われます。",
     "Wrong admin recovery password. Please check the password and try again." : "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
-    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "バックエンドはパスワード変更をサポートしていませんが、ユーザの暗号化キーは正常に更新されました。",
+    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "バックエンドはパスワードの変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
     "Unable to change password" : "パスワードを変更できません",
     "Enabled" : "有効",
     "Not enabled" : "無効",
-    "Recommended" : "推奨",
     "Group already exists." : "グループは既に存在しています",
     "Unable to add group." : "グループを追加できません",
     "Unable to delete group." : "グループを削除できません",
@@ -42,9 +37,10 @@ OC.L10N.register(
     "Email sent" : "メールを送信しました",
     "You need to set your user email before being able to send test emails." : "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
     "Invalid mail address" : "無効なメールアドレスです",
-    "Unable to create user." : "ユーザを追加できません",
+    "A user with that name already exists." : "そのユーザー名はすでに存在します。",
+    "Unable to create user." : "ユーザーを追加できません。",
     "Your %s account was created" : "アカウント %s を作成しました",
-    "Unable to delete user." : "ユーザを削除できません",
+    "Unable to delete user." : "ユーザーを削除できません。",
     "Forbidden" : "禁止",
     "Invalid user" : "無効なユーザー",
     "Unable to change mail address" : "メールアドレスを変更できません",
@@ -72,9 +68,6 @@ OC.L10N.register(
     "Strong password" : "強いパスワード",
     "Valid until {date}" : "{date} まで有効",
     "Delete" : "削除",
-    "Decrypting files... Please wait, this can take some time." : "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
-    "Delete encryption keys permanently." : "暗号化キーを永久に削除する。",
-    "Restore encryption keys." : "暗号化キーを復元する。",
     "Groups" : "グループ",
     "Unable to delete {objName}" : "{objName} を削除できません",
     "Error creating group" : "グループの作成エラー",
@@ -92,8 +85,8 @@ OC.L10N.register(
     "A valid email must be provided" : "有効なメールアドレスを指定する必要があります",
     "__language_name__" : "Japanese (日本語)",
     "Sync clients" : "クライアントの同期",
+    "Personal info" : "個人情報",
     "SSL root certificates" : "SSLルート証明書",
-    "Encryption" : "暗号化",
     "Everything (fatal issues, errors, warnings, info, debug)" : "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
     "Info, warnings, errors and fatal issues" : "情報、警告、エラー、致命的な問題",
     "Warnings, errors and fatal issues" : "警告、エラー、致命的な問題",
@@ -126,15 +119,20 @@ OC.L10N.register(
     "Enforce expiration date" : "有効期限を反映させる",
     "Allow resharing" : "再共有を許可する",
     "Restrict users to only share with users in their groups" : "グループ内のユーザーでのみ共有するように制限する",
-    "Allow users to send mail notification for shared files to other users" : "共有ファイルに関するメール通知の送信をユーザに許可する",
+    "Allow users to send mail notification for shared files to other users" : "他ユーザーへの共有ファイルに関するメール通知の送信をユーザーに許可する",
     "Exclude groups from sharing" : "共有可能なグループから除外する",
     "These groups will still be able to receive shares, but not to initiate them." : "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
+    "Last cron job execution: %s." : "最終cronジョブ実行: %s。",
+    "Last cron job execution: %s. Something seems wrong." : "最終cronジョブ実行: %s。何らかの問題があります。",
     "Cron was not executed yet!" : "cronはまだ実行されていません！",
+    "Open documentation" : "ドキュメントを開く",
     "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行します。",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています。",
     "Use system's cron service to call the cron.php file every 15 minutes." : "システムのcronサービスを利用して、15分間隔でcron.phpファイルを実行する。",
+    "Enable Server-Side-Encryption" : "サーバーサイド暗号化を有効に",
     "This is used for sending out notifications." : "通知を送信する際に使用します。",
     "Send mode" : "送信モード",
+    "Encryption" : "暗号化",
     "From address" : "送信元アドレス",
     "mail" : "メール",
     "Authentication method" : "認証方法",
@@ -142,7 +140,7 @@ OC.L10N.register(
     "Server address" : "サーバーアドレス",
     "Port" : "ポート",
     "Credentials" : "資格情報",
-    "SMTP Username" : "SMTP ユーザー名",
+    "SMTP Username" : "SMTPユーザー名",
     "SMTP Password" : "SMTP パスワード",
     "Store credentials" : "資格情報を保存",
     "Test email settings" : "メール設定のテスト",
@@ -154,6 +152,10 @@ OC.L10N.register(
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "100MBより大きいlogファイルです。ダウンロードに時間がかかります！",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLiteがデータベースとして使用されています。大規模な運用では別のデータベースに切り替えることをお勧めします。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特にデスクトップクライアントをファイル同期に使用する場合，SQLiteは非推奨です．",
+    "How to do backups" : "バックアップ方法",
+    "Advanced monitoring" : "詳細モニタリング",
+    "Performance tuning" : "パフォーマンスチューニング",
+    "Improving the config.php" : "config.phpの改善",
     "Version" : "バージョン",
     "More apps" : "他のアプリ",
     "Developer documentation" : "デベロッパードキュメント",
@@ -171,11 +173,11 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "こんにちは、<br><br>あなたのアカウント %s が利用可能になったことをお知らせします。<br><br>ユーザー名: %s<br>以下のURLからアクセス: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "それでは！",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "こんにちは、\n\nあなたのアカウント %s が利用可能になったことをお知らせします。\n\nユーザー名: %s\n接続URL: %s\n\n",
-    "Administrator Documentation" : "管理者ドキュメント",
-    "Online Documentation" : "オンラインドキュメント",
+    "User documentation" : "ユーザードキュメント",
+    "Administrator documentation" : "管理者ドキュメント",
+    "Online documentation" : "オンラインドキュメント",
     "Forum" : "フォーラム",
-    "Bugtracker" : "バグトラッカー",
-    "Commercial Support" : "商用サポート",
+    "Commercial support" : "商用サポート",
     "Get the apps to sync your files" : "ファイルを同期するためのアプリを取得",
     "Desktop client" : "デスクトップクライアント",
     "Android app" : "Androidアプリ",
@@ -210,20 +212,14 @@ OC.L10N.register(
     "Issued By" : "発行元",
     "Valid until %s" : "%s まで有効",
     "Import root certificate" : "ルート証明書をインポート",
-    "The encryption app is no longer enabled, please decrypt all your files" : "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
-    "Log-in password" : "ログインパスワード",
-    "Decrypt all Files" : "すべてのファイルを複合する",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "暗号化キーはバックアップ場所に移動されました。何か問題があった場合は、キーを復元することができます。すべてのファイルが正しく復号化されたことが確信できる場合にのみ、キーを完全に削除してください。",
-    "Restore Encryption Keys" : "暗号化キーを復元する",
-    "Delete Encryption Keys" : "暗号化キーを削除する",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : " {communityopen}ownCloud community{link close}によって開発されました、{githubopen}ソースコード{linkclose} は {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{link close}.によってライセンスされます。",
     "Show storage location" : "データの保存場所を表示",
     "Show last log in" : "最終ログインを表示",
-    "Show user backend" : "ユーザバックエンドを表示",
+    "Show user backend" : "ユーザーバックエンドを表示",
     "Send email to new user" : "新規ユーザーにメールを送信",
     "Show email address" : "メールアドレスを表示",
     "Username" : "ユーザーID",
-    "E-Mail" : "Eメール",
+    "E-Mail" : "メール",
     "Create" : "作成",
     "Admin Recovery Password" : "管理者リカバリパスワード",
     "Enter the recovery password in order to recover the users files during password change" : "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
@@ -240,7 +236,7 @@ OC.L10N.register(
     "Group Admin for" : "グループ管理者",
     "Quota" : "クオータ",
     "Storage Location" : "データの保存場所",
-    "User Backend" : "ユーザバックエンド",
+    "User Backend" : "ユーザーバックエンド",
     "Last Login" : "最終ログイン",
     "change full name" : "名前を変更",
     "set new password" : "新しいパスワードを設定",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index b20348da064..daa013178bd 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -1,21 +1,17 @@
 { "translations": {
+    "Security & setup warnings" : "セキュリティ＆セットアップ警告",
     "Sharing" : "共有",
     "External Storage" : "外部ストレージ",
+    "Server Side Encryption" : "サーバーサイド暗号化",
     "Cron" : "Cron",
     "Email Server" : "メールサーバー",
     "Log" : "ログ",
+    "Tips & tricks" : "Tips & tricks",
     "Updates" : "アップデート",
     "Authentication error" : "認証エラー",
     "Your full name has been changed." : "名前を変更しました。",
     "Unable to change full name" : "名前を変更できません",
-    "Files decrypted successfully" : "ファイルの復号化に成功しました",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "ファイルを復号化することができませんでした。owncloud.logを調査するか、管理者に連絡してください。",
-    "Couldn't decrypt your files, check your password and try again" : "ファイルを復号化することができませんでした。パスワードを確認のうえ再試行してください。",
-    "Encryption keys deleted permanently" : "暗号化キーは完全に削除されます",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
     "Couldn't remove app." : "アプリが削除できませんでした。",
-    "Backups restored successfully" : "バックアップの復元に成功しました",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "暗号化キーを復元できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
     "Language changed" : "言語が変更されました",
     "Invalid request" : "不正なリクエスト",
     "Admins can't remove themself from the admin group" : "管理者は自身を管理者グループから削除できません。",
@@ -26,11 +22,10 @@
     "No user supplied" : "ユーザーが指定されていません",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "リカバリ用の管理者パスワードを入力してください。そうでない場合は、全ユーザーのデータが失われます。",
     "Wrong admin recovery password. Please check the password and try again." : "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
-    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "バックエンドはパスワード変更をサポートしていませんが、ユーザの暗号化キーは正常に更新されました。",
+    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "バックエンドはパスワードの変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
     "Unable to change password" : "パスワードを変更できません",
     "Enabled" : "有効",
     "Not enabled" : "無効",
-    "Recommended" : "推奨",
     "Group already exists." : "グループは既に存在しています",
     "Unable to add group." : "グループを追加できません",
     "Unable to delete group." : "グループを削除できません",
@@ -40,9 +35,10 @@
     "Email sent" : "メールを送信しました",
     "You need to set your user email before being able to send test emails." : "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
     "Invalid mail address" : "無効なメールアドレスです",
-    "Unable to create user." : "ユーザを追加できません",
+    "A user with that name already exists." : "そのユーザー名はすでに存在します。",
+    "Unable to create user." : "ユーザーを追加できません。",
     "Your %s account was created" : "アカウント %s を作成しました",
-    "Unable to delete user." : "ユーザを削除できません",
+    "Unable to delete user." : "ユーザーを削除できません。",
     "Forbidden" : "禁止",
     "Invalid user" : "無効なユーザー",
     "Unable to change mail address" : "メールアドレスを変更できません",
@@ -70,9 +66,6 @@
     "Strong password" : "強いパスワード",
     "Valid until {date}" : "{date} まで有効",
     "Delete" : "削除",
-    "Decrypting files... Please wait, this can take some time." : "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
-    "Delete encryption keys permanently." : "暗号化キーを永久に削除する。",
-    "Restore encryption keys." : "暗号化キーを復元する。",
     "Groups" : "グループ",
     "Unable to delete {objName}" : "{objName} を削除できません",
     "Error creating group" : "グループの作成エラー",
@@ -90,8 +83,8 @@
     "A valid email must be provided" : "有効なメールアドレスを指定する必要があります",
     "__language_name__" : "Japanese (日本語)",
     "Sync clients" : "クライアントの同期",
+    "Personal info" : "個人情報",
     "SSL root certificates" : "SSLルート証明書",
-    "Encryption" : "暗号化",
     "Everything (fatal issues, errors, warnings, info, debug)" : "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
     "Info, warnings, errors and fatal issues" : "情報、警告、エラー、致命的な問題",
     "Warnings, errors and fatal issues" : "警告、エラー、致命的な問題",
@@ -124,15 +117,20 @@
     "Enforce expiration date" : "有効期限を反映させる",
     "Allow resharing" : "再共有を許可する",
     "Restrict users to only share with users in their groups" : "グループ内のユーザーでのみ共有するように制限する",
-    "Allow users to send mail notification for shared files to other users" : "共有ファイルに関するメール通知の送信をユーザに許可する",
+    "Allow users to send mail notification for shared files to other users" : "他ユーザーへの共有ファイルに関するメール通知の送信をユーザーに許可する",
     "Exclude groups from sharing" : "共有可能なグループから除外する",
     "These groups will still be able to receive shares, but not to initiate them." : "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
+    "Last cron job execution: %s." : "最終cronジョブ実行: %s。",
+    "Last cron job execution: %s. Something seems wrong." : "最終cronジョブ実行: %s。何らかの問題があります。",
     "Cron was not executed yet!" : "cronはまだ実行されていません！",
+    "Open documentation" : "ドキュメントを開く",
     "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行します。",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています。",
     "Use system's cron service to call the cron.php file every 15 minutes." : "システムのcronサービスを利用して、15分間隔でcron.phpファイルを実行する。",
+    "Enable Server-Side-Encryption" : "サーバーサイド暗号化を有効に",
     "This is used for sending out notifications." : "通知を送信する際に使用します。",
     "Send mode" : "送信モード",
+    "Encryption" : "暗号化",
     "From address" : "送信元アドレス",
     "mail" : "メール",
     "Authentication method" : "認証方法",
@@ -140,7 +138,7 @@
     "Server address" : "サーバーアドレス",
     "Port" : "ポート",
     "Credentials" : "資格情報",
-    "SMTP Username" : "SMTP ユーザー名",
+    "SMTP Username" : "SMTPユーザー名",
     "SMTP Password" : "SMTP パスワード",
     "Store credentials" : "資格情報を保存",
     "Test email settings" : "メール設定のテスト",
@@ -152,6 +150,10 @@
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "100MBより大きいlogファイルです。ダウンロードに時間がかかります！",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLiteがデータベースとして使用されています。大規模な運用では別のデータベースに切り替えることをお勧めします。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特にデスクトップクライアントをファイル同期に使用する場合，SQLiteは非推奨です．",
+    "How to do backups" : "バックアップ方法",
+    "Advanced monitoring" : "詳細モニタリング",
+    "Performance tuning" : "パフォーマンスチューニング",
+    "Improving the config.php" : "config.phpの改善",
     "Version" : "バージョン",
     "More apps" : "他のアプリ",
     "Developer documentation" : "デベロッパードキュメント",
@@ -169,11 +171,11 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "こんにちは、<br><br>あなたのアカウント %s が利用可能になったことをお知らせします。<br><br>ユーザー名: %s<br>以下のURLからアクセス: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "それでは！",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "こんにちは、\n\nあなたのアカウント %s が利用可能になったことをお知らせします。\n\nユーザー名: %s\n接続URL: %s\n\n",
-    "Administrator Documentation" : "管理者ドキュメント",
-    "Online Documentation" : "オンラインドキュメント",
+    "User documentation" : "ユーザードキュメント",
+    "Administrator documentation" : "管理者ドキュメント",
+    "Online documentation" : "オンラインドキュメント",
     "Forum" : "フォーラム",
-    "Bugtracker" : "バグトラッカー",
-    "Commercial Support" : "商用サポート",
+    "Commercial support" : "商用サポート",
     "Get the apps to sync your files" : "ファイルを同期するためのアプリを取得",
     "Desktop client" : "デスクトップクライアント",
     "Android app" : "Androidアプリ",
@@ -208,20 +210,14 @@
     "Issued By" : "発行元",
     "Valid until %s" : "%s まで有効",
     "Import root certificate" : "ルート証明書をインポート",
-    "The encryption app is no longer enabled, please decrypt all your files" : "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
-    "Log-in password" : "ログインパスワード",
-    "Decrypt all Files" : "すべてのファイルを複合する",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "暗号化キーはバックアップ場所に移動されました。何か問題があった場合は、キーを復元することができます。すべてのファイルが正しく復号化されたことが確信できる場合にのみ、キーを完全に削除してください。",
-    "Restore Encryption Keys" : "暗号化キーを復元する",
-    "Delete Encryption Keys" : "暗号化キーを削除する",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : " {communityopen}ownCloud community{link close}によって開発されました、{githubopen}ソースコード{linkclose} は {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{link close}.によってライセンスされます。",
     "Show storage location" : "データの保存場所を表示",
     "Show last log in" : "最終ログインを表示",
-    "Show user backend" : "ユーザバックエンドを表示",
+    "Show user backend" : "ユーザーバックエンドを表示",
     "Send email to new user" : "新規ユーザーにメールを送信",
     "Show email address" : "メールアドレスを表示",
     "Username" : "ユーザーID",
-    "E-Mail" : "Eメール",
+    "E-Mail" : "メール",
     "Create" : "作成",
     "Admin Recovery Password" : "管理者リカバリパスワード",
     "Enter the recovery password in order to recover the users files during password change" : "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
@@ -238,7 +234,7 @@
     "Group Admin for" : "グループ管理者",
     "Quota" : "クオータ",
     "Storage Location" : "データの保存場所",
-    "User Backend" : "ユーザバックエンド",
+    "User Backend" : "ユーザーバックエンド",
     "Last Login" : "最終ログイン",
     "change full name" : "名前を変更",
     "set new password" : "新しいパスワードを設定",
diff --git a/settings/l10n/ka_GE.js b/settings/l10n/ka_GE.js
index b971b147186..33d258279ef 100644
--- a/settings/l10n/ka_GE.js
+++ b/settings/l10n/ka_GE.js
@@ -31,13 +31,13 @@ OC.L10N.register(
     "A valid password must be provided" : "უნდა მიუთითოთ არსებული პაროლი",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "SSL root სერთიფიკატები",
-    "Encryption" : "ენკრიპცია",
     "None" : "არა",
     "Login" : "ლოგინი",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP მოდული 'fileinfo' არ არსებობს. ჩვენ გირჩევთ რომ აუცილებლად ჩართოთ ეს მოდული, რომ მიიღოთ კარგი შედეგები mime-type–ს აღმოჩენისას.",
     "Allow apps to use the Share API" : "დაუშვი აპლიკაციების უფლება  Share API –ზე",
     "Allow resharing" : "გადაზიარების დაშვება",
     "Execute one task with each page loaded" : "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე",
+    "Encryption" : "ენკრიპცია",
     "Server address" : "სერვერის მისამართი",
     "Port" : "პორტი",
     "Credentials" : "იუზერ/პაროლი",
@@ -47,11 +47,7 @@ OC.L10N.register(
     "Version" : "ვერსია",
     "by" : "მიერ",
     "User Documentation" : "მომხმარებლის დოკუმენტაცია",
-    "Administrator Documentation" : "ადმინისტრატორის დოკუმენტაცია",
-    "Online Documentation" : "ონლაინ დოკუმენტაცია",
     "Forum" : "ფორუმი",
-    "Bugtracker" : "ბაგთრექერი",
-    "Commercial Support" : "კომერციული მხარდაჭერა",
     "Get the apps to sync your files" : "აპლიკაცია ფაილების სინქრონიზაციისთვის",
     "Show First Run Wizard again" : "მაჩვენე თავიდან გაშვებული ვიზარდი",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან",
diff --git a/settings/l10n/ka_GE.json b/settings/l10n/ka_GE.json
index 40bf3812518..924a6bce806 100644
--- a/settings/l10n/ka_GE.json
+++ b/settings/l10n/ka_GE.json
@@ -29,13 +29,13 @@
     "A valid password must be provided" : "უნდა მიუთითოთ არსებული პაროლი",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "SSL root სერთიფიკატები",
-    "Encryption" : "ენკრიპცია",
     "None" : "არა",
     "Login" : "ლოგინი",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP მოდული 'fileinfo' არ არსებობს. ჩვენ გირჩევთ რომ აუცილებლად ჩართოთ ეს მოდული, რომ მიიღოთ კარგი შედეგები mime-type–ს აღმოჩენისას.",
     "Allow apps to use the Share API" : "დაუშვი აპლიკაციების უფლება  Share API –ზე",
     "Allow resharing" : "გადაზიარების დაშვება",
     "Execute one task with each page loaded" : "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე",
+    "Encryption" : "ენკრიპცია",
     "Server address" : "სერვერის მისამართი",
     "Port" : "პორტი",
     "Credentials" : "იუზერ/პაროლი",
@@ -45,11 +45,7 @@
     "Version" : "ვერსია",
     "by" : "მიერ",
     "User Documentation" : "მომხმარებლის დოკუმენტაცია",
-    "Administrator Documentation" : "ადმინისტრატორის დოკუმენტაცია",
-    "Online Documentation" : "ონლაინ დოკუმენტაცია",
     "Forum" : "ფორუმი",
-    "Bugtracker" : "ბაგთრექერი",
-    "Commercial Support" : "კომერციული მხარდაჭერა",
     "Get the apps to sync your files" : "აპლიკაცია ფაილების სინქრონიზაციისთვის",
     "Show First Run Wizard again" : "მაჩვენე თავიდან გაშვებული ვიზარდი",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან",
diff --git a/settings/l10n/km.js b/settings/l10n/km.js
index 580d5bcb001..71c614dcfb8 100644
--- a/settings/l10n/km.js
+++ b/settings/l10n/km.js
@@ -36,7 +36,6 @@ OC.L10N.register(
     "Good password" : "ពាក្យ​សម្ងាត់​ល្អ",
     "Strong password" : "ពាក្យ​សម្ងាត់​ខ្លាំង",
     "Delete" : "លុប",
-    "Decrypting files... Please wait, this can take some time." : "កំពុង Decrypt​ ឯកសារ... សូម​រង​ចាំ វា​អាច​ត្រូវការ​ពេល​មួយ​ចំនួន។",
     "Groups" : "ក្រុ",
     "undo" : "មិន​ធ្វើ​វិញ",
     "never" : "មិនដែរ",
@@ -45,7 +44,6 @@ OC.L10N.register(
     "Error creating user" : "មាន​កំហុស​ក្នុង​ការ​បង្កើត​អ្នក​ប្រើ",
     "A valid password must be provided" : "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
     "__language_name__" : "__language_name__",
-    "Encryption" : "កូដនីយកម្ម",
     "None" : "គ្មាន",
     "Login" : "ចូល",
     "SSL" : "SSL",
@@ -54,6 +52,7 @@ OC.L10N.register(
     "Allow apps to use the Share API" : "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ API ចែក​រំលែក",
     "Allow public uploads" : "អនុញ្ញាត​ការ​ផ្ទុក​ឡើង​ជា​សាធារណៈ",
     "Allow resharing" : "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត",
+    "Encryption" : "កូដនីយកម្ម",
     "From address" : "ពី​អាសយដ្ឋាន",
     "Server address" : "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
     "Port" : "ច្រក",
@@ -65,11 +64,7 @@ OC.L10N.register(
     "by" : "ដោយ",
     "User Documentation" : "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់",
     "Admin Documentation" : "កម្រង​ឯកសារ​អភិបាល",
-    "Administrator Documentation" : "ឯកសារ​សម្រាប់​​អ្នក​​គ្រប់​គ្រង​ប្រព័ន្ធ",
-    "Online Documentation" : "ឯកសារ Online",
     "Forum" : "វេទិកាពិភាក្សា",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "ការគាំទ្រលក្ខណៈពាណិជ្ជកម្ម",
     "Get the apps to sync your files" : "ដាក់​អោយកម្មវិធីផ្សេងៗ ​ធ្វើសមកាលកម្ម​ឯកសារ​អ្នក",
     "Show First Run Wizard again" : "បង្ហាញ First Run Wizard ម្តង​ទៀត",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "អ្នក​បាន​ប្រើ <strong>%s</strong> ក្នុង​ចំណោម​ចំនួន​មាន <strong>%s</strong>",
@@ -87,8 +82,6 @@ OC.L10N.register(
     "Cancel" : "លើកលែង",
     "Language" : "ភាសា",
     "Help translate" : "ជួយ​បក​ប្រែ",
-    "Log-in password" : "ពាក្យ​សម្ងាត់​ចូល​គណនី",
-    "Decrypt all Files" : "Decrypt ឯកសារ​ទាំង​អស់",
     "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Create" : "បង្កើត",
     "Admin Recovery Password" : "ការ​ស្វែង​រក​ពាក្យ​សម្ងាត់របស់ប្រធាន​វេបសាយ",
diff --git a/settings/l10n/km.json b/settings/l10n/km.json
index 87784ad3364..fab32e06e57 100644
--- a/settings/l10n/km.json
+++ b/settings/l10n/km.json
@@ -34,7 +34,6 @@
     "Good password" : "ពាក្យ​សម្ងាត់​ល្អ",
     "Strong password" : "ពាក្យ​សម្ងាត់​ខ្លាំង",
     "Delete" : "លុប",
-    "Decrypting files... Please wait, this can take some time." : "កំពុង Decrypt​ ឯកសារ... សូម​រង​ចាំ វា​អាច​ត្រូវការ​ពេល​មួយ​ចំនួន។",
     "Groups" : "ក្រុ",
     "undo" : "មិន​ធ្វើ​វិញ",
     "never" : "មិនដែរ",
@@ -43,7 +42,6 @@
     "Error creating user" : "មាន​កំហុស​ក្នុង​ការ​បង្កើត​អ្នក​ប្រើ",
     "A valid password must be provided" : "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
     "__language_name__" : "__language_name__",
-    "Encryption" : "កូដនីយកម្ម",
     "None" : "គ្មាន",
     "Login" : "ចូល",
     "SSL" : "SSL",
@@ -52,6 +50,7 @@
     "Allow apps to use the Share API" : "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ API ចែក​រំលែក",
     "Allow public uploads" : "អនុញ្ញាត​ការ​ផ្ទុក​ឡើង​ជា​សាធារណៈ",
     "Allow resharing" : "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត",
+    "Encryption" : "កូដនីយកម្ម",
     "From address" : "ពី​អាសយដ្ឋាន",
     "Server address" : "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
     "Port" : "ច្រក",
@@ -63,11 +62,7 @@
     "by" : "ដោយ",
     "User Documentation" : "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់",
     "Admin Documentation" : "កម្រង​ឯកសារ​អភិបាល",
-    "Administrator Documentation" : "ឯកសារ​សម្រាប់​​អ្នក​​គ្រប់​គ្រង​ប្រព័ន្ធ",
-    "Online Documentation" : "ឯកសារ Online",
     "Forum" : "វេទិកាពិភាក្សា",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "ការគាំទ្រលក្ខណៈពាណិជ្ជកម្ម",
     "Get the apps to sync your files" : "ដាក់​អោយកម្មវិធីផ្សេងៗ ​ធ្វើសមកាលកម្ម​ឯកសារ​អ្នក",
     "Show First Run Wizard again" : "បង្ហាញ First Run Wizard ម្តង​ទៀត",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "អ្នក​បាន​ប្រើ <strong>%s</strong> ក្នុង​ចំណោម​ចំនួន​មាន <strong>%s</strong>",
@@ -85,8 +80,6 @@
     "Cancel" : "លើកលែង",
     "Language" : "ភាសា",
     "Help translate" : "ជួយ​បក​ប្រែ",
-    "Log-in password" : "ពាក្យ​សម្ងាត់​ចូល​គណនី",
-    "Decrypt all Files" : "Decrypt ឯកសារ​ទាំង​អស់",
     "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Create" : "បង្កើត",
     "Admin Recovery Password" : "ការ​ស្វែង​រក​ពាក្យ​សម្ងាត់របស់ប្រធាន​វេបសាយ",
diff --git a/settings/l10n/kn.js b/settings/l10n/kn.js
index 38b77900e33..4e739742b48 100644
--- a/settings/l10n/kn.js
+++ b/settings/l10n/kn.js
@@ -7,12 +7,7 @@ OC.L10N.register(
     "Authentication error" : "ದೃಢೀಕರಣ ದೋಷ",
     "Your full name has been changed." : "ನಿಮ್ಮ ಪೂರ್ಣ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ.",
     "Unable to change full name" : "ಪೂರ್ಣ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ",
-    "Files decrypted successfully" : "ಕಡತಗಳನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಅಸಂಕೇತಿಕರಿಸಿದೆ",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "ನಿಮ್ಮ ಕಡತಗಳನ್ನು ಅಸಂಕೇತಿಕರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ, owncloud.log ಪರಿಶೀಲಿಸಿ ಅಥವಾ ನಿಮ್ಮ ನಿರ್ವಾಹಕರ ಸಹಾಯ ಕೇಳಿ",
-    "Encryption keys deleted permanently" : "ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಗಳನ್ನು ಖಯಃ ಅಳಿಸಿ",
     "Couldn't remove app." : "ಅಳಿಸುವಾಗ ಏನೊ ಲೋಪವಾಗಿದೆ",
-    "Backups restored successfully" : " ಹಿಂದೆ ಉಳಿಸಿದ ಅನುಕರಣಿತ ಪ್ರತಿಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಮರುಸ್ಥಾಪಿಸಲಾಗಿದೆ",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "ನಿಮ್ಮ ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಗಳನ್ನು ಮರುಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ, ನಿಮ್ಮ owncloud.log ಪರಿಶೀಲಿಸಿ ಅಥವಾ ನಿಮ್ಮ ನಿರ್ವಾಹಕರ ಸಹಾಯ ಕೇಳಿ",
     "Language changed" : "ಭಾಷೆಯನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ",
     "Invalid request" : "ಅಮಾನ್ಯ ಕೋರಿಕೆ",
     "Admins can't remove themself from the admin group" : "ನಿರ್ವಾಹಕರು ನಿರ್ವಹಣೆ ಗುಂಪಿನಿಂದ ತಮ್ಮನ್ನೇ ತಾವು ತೆಗೆದುಹಾಕಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿಲ್ಲ",
@@ -24,7 +19,6 @@ OC.L10N.register(
     "Unable to change password" : "ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ",
     "Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ",
     "Not enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿಲ್ಲ",
-    "Recommended" : "ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ",
     "Group already exists." : "ಗುಂಪು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.",
     "Unable to add group." : "ಗುಂಪುನ್ನು ಸೇರಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ.",
     "Unable to delete group." : "ಗುಂಪುನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.",
@@ -61,9 +55,6 @@ OC.L10N.register(
     "Strong password" : "ಪ್ರಬಲ ಗುಪ್ತಪದ",
     "Valid until {date}" : "{date} ವರೆಗೆ ಚಾಲ್ತಿಯಲ್ಲಿರುತ್ತದೆ",
     "Delete" : "ಅಳಿಸಿ",
-    "Decrypting files... Please wait, this can take some time." : "ನಿರೀಕ್ಷಿಸಿ, ಕಡತಗಳನ್ನು ಅಸಂಕೇತಿಕರಿಸಲಾಗುತ್ತಿದೆ ...  ಇದು ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು.",
-    "Delete encryption keys permanently." : "ಶಾಶ್ವತವಾಗಿ ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಗಳನ್ನು ಅಳಿಸಿ.",
-    "Restore encryption keys." : "ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಗಳನ್ನು ಮರುಸ್ಥಾಪಿಸಿ.",
     "Groups" : "ಗುಂಪುಗಳು",
     "Unable to delete {objName}" : "{objName} ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ",
     "Error creating group" : "ಗುಂಪುನ್ನು ರಚಿಸುವಾಗ ದೋಷವಾಗಿದೆ",
@@ -79,7 +70,6 @@ OC.L10N.register(
     "A valid password must be provided" : "ಸರಿಯಾದ ಬಳಕೆದಾರ ಗುಪ್ತಪದ ಒದಗಿಸಬೇಕಾಗಿದೆ",
     "A valid email must be provided" : "ಮಾನ್ಯ ಬಳಕೆದಾರ ಇ-ಅಂಚೆಯನ್ನು ಒದಗಿಸಬೇಕಾಗುತ್ತದೆ",
     "__language_name__" : "ಕನ್ನಡ",
-    "Encryption" : "ರಹಸ್ಯ ಸಂಕೇತೀಕರಿಸು",
     "Everything (fatal issues, errors, warnings, info, debug)" : "ಎಲ್ಲ ರೀತಿಗಳು (ವಿನಾಶಕ ಸಮಸ್ಯೆಗಳು, ದೋಷಗಳು, ಎಚ್ಚರಿಕೆಗಳನ್ನು, ಮಾಹಿತಿ, ಇತರೆ )",
     "Info, warnings, errors and fatal issues" : "ಮಾಹಿತಿ, ಎಚ್ಚರಿಕೆ, ದೋಷಗಳು ಮತ್ತು ಮಾರಕ ಸಮಸ್ಯೆಗಳು",
     "Warnings, errors and fatal issues" : "ಎಚ್ಚರಿಕೆ, ದೋಷಗಳು ಮತ್ತು ಮಾರಕ ಸಮಸ್ಯೆಗಳು",
@@ -92,6 +82,7 @@ OC.L10N.register(
     "days" : "ದಿನಗಳು",
     "Enforce expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕವನ್ನು ಬಲವ೦ತವಾಗಿ ಜಾರಿಗೆ ಮಾಡಿ",
     "Send mode" : "ಕಳುಹಿಸುವ ಕ್ರಮ",
+    "Encryption" : "ರಹಸ್ಯ ಸಂಕೇತೀಕರಿಸು",
     "mail" : "ಅಂಚೆ",
     "Authentication method" : "ದೃಢೀಕರಣ ವಿಧಾನ",
     "Authentication required" : "ದೃಢೀಕರಣ ಅಗತ್ಯವಿದೆ",
@@ -112,11 +103,7 @@ OC.L10N.register(
     "Enable only for specific groups" : "ಕೇವಲ ನಿರ್ದಿಷ್ಟ ಗುಂಪುಗಳಿಗೆ ಸಕ್ರಿಯಗೊಳಿಸಿ",
     "Uninstall App" : "ಅಳಿಸಿ",
     "Cheers!" : "ಆನಂದಿಸಿ !",
-    "Administrator Documentation" : "ನಿರ್ವಾಹಕರ ದಾಖಲೆ",
-    "Online Documentation" : "ಅಂತರ್ಜಾಲದಲ್ಲಿರುವ ದಾಖಲೆ",
     "Forum" : "ವೇದಿಕೆ",
-    "Bugtracker" : "ವಿವಾದಾ೦ಶ ಅನ್ವಷಕ ",
-    "Commercial Support" : "ವಾಣಿಜ್ಯ ಬೆಂಬಲ",
     "Password" : "ಗುಪ್ತ ಪದ",
     "Unable to change your password" : "ನಿನ್ನ ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ",
     "Current password" : "ಪ್ರಸ್ತುತ ಗುಪ್ತಪದ",
@@ -127,9 +114,6 @@ OC.L10N.register(
     "Cancel" : "ರದ್ದು",
     "Language" : "ಭಾಷೆ",
     "Help translate" : "ಭಾಷಾಂತರಿಸಲು ಸಹಾಯ ಮಾಡಿ",
-    "Decrypt all Files" : "ಎಲ್ಲಾ ಕಡತಗಳನ್ನು ಅಸಂಕೇತೀಕರಿಸು",
-    "Restore Encryption Keys" : "ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಗಳನ್ನು ಮರುಸ್ಥಾಪಿಸಿ",
-    "Delete Encryption Keys" : "ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಗಳನ್ನು ಅಳಿಸಿ",
     "Username" : "ಬಳಕೆಯ ಹೆಸರು",
     "E-Mail" : "ಇ-ಅಂಚೆ ವಿಳಾಸ",
     "Create" : "ಸೃಷ್ಟಿಸಿ",
diff --git a/settings/l10n/kn.json b/settings/l10n/kn.json
index 9133aac7660..9f50b421edf 100644
--- a/settings/l10n/kn.json
+++ b/settings/l10n/kn.json
@@ -5,12 +5,7 @@
     "Authentication error" : "ದೃಢೀಕರಣ ದೋಷ",
     "Your full name has been changed." : "ನಿಮ್ಮ ಪೂರ್ಣ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ.",
     "Unable to change full name" : "ಪೂರ್ಣ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ",
-    "Files decrypted successfully" : "ಕಡತಗಳನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಅಸಂಕೇತಿಕರಿಸಿದೆ",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "ನಿಮ್ಮ ಕಡತಗಳನ್ನು ಅಸಂಕೇತಿಕರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ, owncloud.log ಪರಿಶೀಲಿಸಿ ಅಥವಾ ನಿಮ್ಮ ನಿರ್ವಾಹಕರ ಸಹಾಯ ಕೇಳಿ",
-    "Encryption keys deleted permanently" : "ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಗಳನ್ನು ಖಯಃ ಅಳಿಸಿ",
     "Couldn't remove app." : "ಅಳಿಸುವಾಗ ಏನೊ ಲೋಪವಾಗಿದೆ",
-    "Backups restored successfully" : " ಹಿಂದೆ ಉಳಿಸಿದ ಅನುಕರಣಿತ ಪ್ರತಿಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಮರುಸ್ಥಾಪಿಸಲಾಗಿದೆ",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "ನಿಮ್ಮ ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಗಳನ್ನು ಮರುಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ, ನಿಮ್ಮ owncloud.log ಪರಿಶೀಲಿಸಿ ಅಥವಾ ನಿಮ್ಮ ನಿರ್ವಾಹಕರ ಸಹಾಯ ಕೇಳಿ",
     "Language changed" : "ಭಾಷೆಯನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ",
     "Invalid request" : "ಅಮಾನ್ಯ ಕೋರಿಕೆ",
     "Admins can't remove themself from the admin group" : "ನಿರ್ವಾಹಕರು ನಿರ್ವಹಣೆ ಗುಂಪಿನಿಂದ ತಮ್ಮನ್ನೇ ತಾವು ತೆಗೆದುಹಾಕಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿಲ್ಲ",
@@ -22,7 +17,6 @@
     "Unable to change password" : "ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ",
     "Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ",
     "Not enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿಲ್ಲ",
-    "Recommended" : "ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ",
     "Group already exists." : "ಗುಂಪು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.",
     "Unable to add group." : "ಗುಂಪುನ್ನು ಸೇರಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ.",
     "Unable to delete group." : "ಗುಂಪುನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.",
@@ -59,9 +53,6 @@
     "Strong password" : "ಪ್ರಬಲ ಗುಪ್ತಪದ",
     "Valid until {date}" : "{date} ವರೆಗೆ ಚಾಲ್ತಿಯಲ್ಲಿರುತ್ತದೆ",
     "Delete" : "ಅಳಿಸಿ",
-    "Decrypting files... Please wait, this can take some time." : "ನಿರೀಕ್ಷಿಸಿ, ಕಡತಗಳನ್ನು ಅಸಂಕೇತಿಕರಿಸಲಾಗುತ್ತಿದೆ ...  ಇದು ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು.",
-    "Delete encryption keys permanently." : "ಶಾಶ್ವತವಾಗಿ ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಗಳನ್ನು ಅಳಿಸಿ.",
-    "Restore encryption keys." : "ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಗಳನ್ನು ಮರುಸ್ಥಾಪಿಸಿ.",
     "Groups" : "ಗುಂಪುಗಳು",
     "Unable to delete {objName}" : "{objName} ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ",
     "Error creating group" : "ಗುಂಪುನ್ನು ರಚಿಸುವಾಗ ದೋಷವಾಗಿದೆ",
@@ -77,7 +68,6 @@
     "A valid password must be provided" : "ಸರಿಯಾದ ಬಳಕೆದಾರ ಗುಪ್ತಪದ ಒದಗಿಸಬೇಕಾಗಿದೆ",
     "A valid email must be provided" : "ಮಾನ್ಯ ಬಳಕೆದಾರ ಇ-ಅಂಚೆಯನ್ನು ಒದಗಿಸಬೇಕಾಗುತ್ತದೆ",
     "__language_name__" : "ಕನ್ನಡ",
-    "Encryption" : "ರಹಸ್ಯ ಸಂಕೇತೀಕರಿಸು",
     "Everything (fatal issues, errors, warnings, info, debug)" : "ಎಲ್ಲ ರೀತಿಗಳು (ವಿನಾಶಕ ಸಮಸ್ಯೆಗಳು, ದೋಷಗಳು, ಎಚ್ಚರಿಕೆಗಳನ್ನು, ಮಾಹಿತಿ, ಇತರೆ )",
     "Info, warnings, errors and fatal issues" : "ಮಾಹಿತಿ, ಎಚ್ಚರಿಕೆ, ದೋಷಗಳು ಮತ್ತು ಮಾರಕ ಸಮಸ್ಯೆಗಳು",
     "Warnings, errors and fatal issues" : "ಎಚ್ಚರಿಕೆ, ದೋಷಗಳು ಮತ್ತು ಮಾರಕ ಸಮಸ್ಯೆಗಳು",
@@ -90,6 +80,7 @@
     "days" : "ದಿನಗಳು",
     "Enforce expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕವನ್ನು ಬಲವ೦ತವಾಗಿ ಜಾರಿಗೆ ಮಾಡಿ",
     "Send mode" : "ಕಳುಹಿಸುವ ಕ್ರಮ",
+    "Encryption" : "ರಹಸ್ಯ ಸಂಕೇತೀಕರಿಸು",
     "mail" : "ಅಂಚೆ",
     "Authentication method" : "ದೃಢೀಕರಣ ವಿಧಾನ",
     "Authentication required" : "ದೃಢೀಕರಣ ಅಗತ್ಯವಿದೆ",
@@ -110,11 +101,7 @@
     "Enable only for specific groups" : "ಕೇವಲ ನಿರ್ದಿಷ್ಟ ಗುಂಪುಗಳಿಗೆ ಸಕ್ರಿಯಗೊಳಿಸಿ",
     "Uninstall App" : "ಅಳಿಸಿ",
     "Cheers!" : "ಆನಂದಿಸಿ !",
-    "Administrator Documentation" : "ನಿರ್ವಾಹಕರ ದಾಖಲೆ",
-    "Online Documentation" : "ಅಂತರ್ಜಾಲದಲ್ಲಿರುವ ದಾಖಲೆ",
     "Forum" : "ವೇದಿಕೆ",
-    "Bugtracker" : "ವಿವಾದಾ೦ಶ ಅನ್ವಷಕ ",
-    "Commercial Support" : "ವಾಣಿಜ್ಯ ಬೆಂಬಲ",
     "Password" : "ಗುಪ್ತ ಪದ",
     "Unable to change your password" : "ನಿನ್ನ ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ",
     "Current password" : "ಪ್ರಸ್ತುತ ಗುಪ್ತಪದ",
@@ -125,9 +112,6 @@
     "Cancel" : "ರದ್ದು",
     "Language" : "ಭಾಷೆ",
     "Help translate" : "ಭಾಷಾಂತರಿಸಲು ಸಹಾಯ ಮಾಡಿ",
-    "Decrypt all Files" : "ಎಲ್ಲಾ ಕಡತಗಳನ್ನು ಅಸಂಕೇತೀಕರಿಸು",
-    "Restore Encryption Keys" : "ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಗಳನ್ನು ಮರುಸ್ಥಾಪಿಸಿ",
-    "Delete Encryption Keys" : "ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಗಳನ್ನು ಅಳಿಸಿ",
     "Username" : "ಬಳಕೆಯ ಹೆಸರು",
     "E-Mail" : "ಇ-ಅಂಚೆ ವಿಳಾಸ",
     "Create" : "ಸೃಷ್ಟಿಸಿ",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index cc557b9b690..fb9b25bebdc 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -10,14 +10,7 @@ OC.L10N.register(
     "Authentication error" : "인증 오류",
     "Your full name has been changed." : "전체 이름이 변경되었습니다.",
     "Unable to change full name" : "전체 이름을 변경할 수 없음",
-    "Files decrypted successfully" : "파일이 복호화됨",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "파일을 복호화할 수 없습니다. owncloud.log 파일을 확인하거나 관리자에게 문의하십시오.",
-    "Couldn't decrypt your files, check your password and try again" : "파일을 복호화할 수 없습니다. 암호를 다시 확인하십시오.",
-    "Encryption keys deleted permanently" : "암호화 키가 영구적으로 삭제됨",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "암호화 키를 영구적으로 삭제할 수 없습니다. owncloud.log 파일을 확인하거나 관리자에게 문의하십시오.",
     "Couldn't remove app." : "앱을 삭제할 수 없습니다.",
-    "Backups restored successfully" : "성공적으로 백업을 복원했습니다",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "암호화 키를 복원할 수 없습니다. owncloud.log 파일을 확인하거나 관리자에게 문의하십시오.",
     "Language changed" : "언어가 변경됨",
     "Invalid request" : "잘못된 요청",
     "Admins can't remove themself from the admin group" : "관리자 자신을 관리자 그룹에서 삭제할 수 없음",
@@ -31,7 +24,6 @@ OC.L10N.register(
     "Unable to change password" : "암호를 변경할 수 없음",
     "Enabled" : "활성",
     "Not enabled" : "비활성",
-    "Recommended" : "추천",
     "Group already exists." : "그룹이 이미 존재합니다.",
     "Unable to add group." : "그룹을 추가할 수 없습니다.",
     "Unable to delete group." : "그룹을 삭제할 수 없습니다.",
@@ -71,9 +63,6 @@ OC.L10N.register(
     "Strong password" : "강력한 암호",
     "Valid until {date}" : "{date}까지 유효함",
     "Delete" : "삭제",
-    "Decrypting files... Please wait, this can take some time." : "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오.",
-    "Delete encryption keys permanently." : "암호화 키를 영구적으로 삭제합니다.",
-    "Restore encryption keys." : "암호화 키를 복원합니다.",
     "Groups" : "그룹",
     "Unable to delete {objName}" : "{objName}을(를) 삭제할 수 없음",
     "Error creating group" : "그룹을 생성하는 중 오류가 발생하였습니다",
@@ -91,7 +80,6 @@ OC.L10N.register(
     "A valid email must be provided" : "올바른 이메일 주소를 입력해야 함",
     "__language_name__" : "한국어",
     "SSL root certificates" : "SSL 루트 인증서",
-    "Encryption" : "암호화",
     "Everything (fatal issues, errors, warnings, info, debug)" : "모두 (치명적 문제, 오류, 경고, 정보, 디버그)",
     "Info, warnings, errors and fatal issues" : "정보, 경고, 오류, 치명적 문제",
     "Warnings, errors and fatal issues" : "경고, 오류, 치명적 문제",
@@ -132,6 +120,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "시스템의 cron 서비스를 통하여 15분마다 cron.php 파일을 실행합니다.",
     "This is used for sending out notifications." : "알림을 보낼 때 사용됩니다.",
     "Send mode" : "보내기 모드",
+    "Encryption" : "암호화",
     "From address" : "보낸 사람 주소",
     "mail" : "메일",
     "Authentication method" : "인증 방법",
@@ -164,11 +153,7 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "안녕하세요.<br><br>%s 계정을 사용할 수 있음을 알려 드립니다.<br><br>사용자 이름: %s<br>접근 링크: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "감사합니다!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "안녕하세요.\n\n%s 계정을 사용할 수 있음을 알려 드립니다.\n\n사용자 이름: %s\n접근 링크: %s\n\n",
-    "Administrator Documentation" : "관리자 문서",
-    "Online Documentation" : "온라인 문서",
     "Forum" : "포럼",
-    "Bugtracker" : "버그 트래커",
-    "Commercial Support" : "상업용 지원",
     "Get the apps to sync your files" : "파일 동기화 앱 가져오기",
     "Desktop client" : "데스크톱 클라이언트",
     "Android app" : "Android 앱",
@@ -199,12 +184,6 @@ OC.L10N.register(
     "Valid until" : "만료 기간:",
     "Issued By" : "발급자:",
     "Valid until %s" : "%s까지 유효함",
-    "The encryption app is no longer enabled, please decrypt all your files" : "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다.",
-    "Log-in password" : "로그인 암호",
-    "Decrypt all Files" : "모든 파일 복호화",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "암호화 키가 백업 위치로 이동하였습니다. 무언가 잘못된 경우 키를 복원할 수 있습니다. 모든 파일이 완전히 복호화되었음이 확실하면 키를 영구적으로 삭제하십시오.",
-    "Restore Encryption Keys" : "암호화 키 복원",
-    "Delete Encryption Keys" : "암호화 키 삭제",
     "Show storage location" : "저장소 위치 보이기",
     "Show last log in" : "마지막 로그인 시간 보이기",
     "Show user backend" : "사용자 백엔드 보이기",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index d4b8ddee211..98c612b116d 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -8,14 +8,7 @@
     "Authentication error" : "인증 오류",
     "Your full name has been changed." : "전체 이름이 변경되었습니다.",
     "Unable to change full name" : "전체 이름을 변경할 수 없음",
-    "Files decrypted successfully" : "파일이 복호화됨",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "파일을 복호화할 수 없습니다. owncloud.log 파일을 확인하거나 관리자에게 문의하십시오.",
-    "Couldn't decrypt your files, check your password and try again" : "파일을 복호화할 수 없습니다. 암호를 다시 확인하십시오.",
-    "Encryption keys deleted permanently" : "암호화 키가 영구적으로 삭제됨",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "암호화 키를 영구적으로 삭제할 수 없습니다. owncloud.log 파일을 확인하거나 관리자에게 문의하십시오.",
     "Couldn't remove app." : "앱을 삭제할 수 없습니다.",
-    "Backups restored successfully" : "성공적으로 백업을 복원했습니다",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "암호화 키를 복원할 수 없습니다. owncloud.log 파일을 확인하거나 관리자에게 문의하십시오.",
     "Language changed" : "언어가 변경됨",
     "Invalid request" : "잘못된 요청",
     "Admins can't remove themself from the admin group" : "관리자 자신을 관리자 그룹에서 삭제할 수 없음",
@@ -29,7 +22,6 @@
     "Unable to change password" : "암호를 변경할 수 없음",
     "Enabled" : "활성",
     "Not enabled" : "비활성",
-    "Recommended" : "추천",
     "Group already exists." : "그룹이 이미 존재합니다.",
     "Unable to add group." : "그룹을 추가할 수 없습니다.",
     "Unable to delete group." : "그룹을 삭제할 수 없습니다.",
@@ -69,9 +61,6 @@
     "Strong password" : "강력한 암호",
     "Valid until {date}" : "{date}까지 유효함",
     "Delete" : "삭제",
-    "Decrypting files... Please wait, this can take some time." : "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오.",
-    "Delete encryption keys permanently." : "암호화 키를 영구적으로 삭제합니다.",
-    "Restore encryption keys." : "암호화 키를 복원합니다.",
     "Groups" : "그룹",
     "Unable to delete {objName}" : "{objName}을(를) 삭제할 수 없음",
     "Error creating group" : "그룹을 생성하는 중 오류가 발생하였습니다",
@@ -89,7 +78,6 @@
     "A valid email must be provided" : "올바른 이메일 주소를 입력해야 함",
     "__language_name__" : "한국어",
     "SSL root certificates" : "SSL 루트 인증서",
-    "Encryption" : "암호화",
     "Everything (fatal issues, errors, warnings, info, debug)" : "모두 (치명적 문제, 오류, 경고, 정보, 디버그)",
     "Info, warnings, errors and fatal issues" : "정보, 경고, 오류, 치명적 문제",
     "Warnings, errors and fatal issues" : "경고, 오류, 치명적 문제",
@@ -130,6 +118,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "시스템의 cron 서비스를 통하여 15분마다 cron.php 파일을 실행합니다.",
     "This is used for sending out notifications." : "알림을 보낼 때 사용됩니다.",
     "Send mode" : "보내기 모드",
+    "Encryption" : "암호화",
     "From address" : "보낸 사람 주소",
     "mail" : "메일",
     "Authentication method" : "인증 방법",
@@ -162,11 +151,7 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "안녕하세요.<br><br>%s 계정을 사용할 수 있음을 알려 드립니다.<br><br>사용자 이름: %s<br>접근 링크: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "감사합니다!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "안녕하세요.\n\n%s 계정을 사용할 수 있음을 알려 드립니다.\n\n사용자 이름: %s\n접근 링크: %s\n\n",
-    "Administrator Documentation" : "관리자 문서",
-    "Online Documentation" : "온라인 문서",
     "Forum" : "포럼",
-    "Bugtracker" : "버그 트래커",
-    "Commercial Support" : "상업용 지원",
     "Get the apps to sync your files" : "파일 동기화 앱 가져오기",
     "Desktop client" : "데스크톱 클라이언트",
     "Android app" : "Android 앱",
@@ -197,12 +182,6 @@
     "Valid until" : "만료 기간:",
     "Issued By" : "발급자:",
     "Valid until %s" : "%s까지 유효함",
-    "The encryption app is no longer enabled, please decrypt all your files" : "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다.",
-    "Log-in password" : "로그인 암호",
-    "Decrypt all Files" : "모든 파일 복호화",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "암호화 키가 백업 위치로 이동하였습니다. 무언가 잘못된 경우 키를 복원할 수 있습니다. 모든 파일이 완전히 복호화되었음이 확실하면 키를 영구적으로 삭제하십시오.",
-    "Restore Encryption Keys" : "암호화 키 복원",
-    "Delete Encryption Keys" : "암호화 키 삭제",
     "Show storage location" : "저장소 위치 보이기",
     "Show last log in" : "마지막 로그인 시간 보이기",
     "Show user backend" : "사용자 백엔드 보이기",
diff --git a/settings/l10n/ku_IQ.js b/settings/l10n/ku_IQ.js
index f83763dc671..1359dc748a3 100644
--- a/settings/l10n/ku_IQ.js
+++ b/settings/l10n/ku_IQ.js
@@ -4,9 +4,9 @@ OC.L10N.register(
     "Invalid request" : "داواکارى نادروستە",
     "All" : "هەمووی",
     "Enable" : "چالاککردن",
-    "Encryption" : "نهێنیکردن",
     "None" : "هیچ",
     "Login" : "چوونەژوورەوە",
+    "Encryption" : "نهێنیکردن",
     "Server address" : "ناونیشانی ڕاژه",
     "by" : "له‌لایه‌ن",
     "Password" : "وشەی تێپەربو",
diff --git a/settings/l10n/ku_IQ.json b/settings/l10n/ku_IQ.json
index 82798fbe15a..f7dfd226aae 100644
--- a/settings/l10n/ku_IQ.json
+++ b/settings/l10n/ku_IQ.json
@@ -2,9 +2,9 @@
     "Invalid request" : "داواکارى نادروستە",
     "All" : "هەمووی",
     "Enable" : "چالاککردن",
-    "Encryption" : "نهێنیکردن",
     "None" : "هیچ",
     "Login" : "چوونەژوورەوە",
+    "Encryption" : "نهێنیکردن",
     "Server address" : "ناونیشانی ڕاژه",
     "by" : "له‌لایه‌ن",
     "Password" : "وشەی تێپەربو",
diff --git a/settings/l10n/lt_LT.js b/settings/l10n/lt_LT.js
index 8794c34b963..dcc63ecfe67 100644
--- a/settings/l10n/lt_LT.js
+++ b/settings/l10n/lt_LT.js
@@ -32,7 +32,6 @@ OC.L10N.register(
     "Updated" : "Atnaujinta",
     "Select a profile picture" : "Pažymėkite profilio paveikslėlį",
     "Delete" : "Ištrinti",
-    "Decrypting files... Please wait, this can take some time." : "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
     "Groups" : "Grupės",
     "undo" : "anuliuoti",
     "never" : "niekada",
@@ -42,7 +41,6 @@ OC.L10N.register(
     "A valid password must be provided" : "Slaptažodis turi būti tinkamas",
     "__language_name__" : "Lietuvių",
     "SSL root certificates" : "SSL sertifikatas",
-    "Encryption" : "Šifravimas",
     "Fatal issues only" : "Tik kritinės problemos",
     "None" : "Nieko",
     "Login" : "Prisijungti",
@@ -52,6 +50,7 @@ OC.L10N.register(
     "Allow resharing" : "Leisti dalintis",
     "Execute one task with each page loaded" : "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php yra registruotas tinklapio suplanuotų užduočių paslaugose, kad iškviesti cron.php kas 15 minučių per http.",
+    "Encryption" : "Šifravimas",
     "Server address" : "Serverio adresas",
     "Port" : "Prievadas",
     "Log level" : "Žurnalo išsamumas",
@@ -62,11 +61,7 @@ OC.L10N.register(
     "by" : " ",
     "User Documentation" : "Naudotojo dokumentacija",
     "Cheers!" : "Sveikinimai!",
-    "Administrator Documentation" : "Administratoriaus dokumentacija",
-    "Online Documentation" : "Dokumentacija tinkle",
     "Forum" : "Forumas",
-    "Bugtracker" : "Klaidų sekimas",
-    "Commercial Support" : "Komercinis palaikymas",
     "Get the apps to sync your files" : "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
     "Desktop client" : "Darbastalio klientas",
     "Android app" : "Android programa",
@@ -89,8 +84,6 @@ OC.L10N.register(
     "Choose as profile image" : "Pasirinkite profilio paveiksliuką",
     "Language" : "Kalba",
     "Help translate" : "Padėkite išversti",
-    "Log-in password" : "Prisijungimo slaptažodis",
-    "Decrypt all Files" : "Iššifruoti visus failus",
     "Username" : "Prisijungimo vardas",
     "Create" : "Sukurti",
     "Admin Recovery Password" : "Administracinis atkūrimo slaptažodis",
diff --git a/settings/l10n/lt_LT.json b/settings/l10n/lt_LT.json
index 198bd9bcd9d..42ed77a5636 100644
--- a/settings/l10n/lt_LT.json
+++ b/settings/l10n/lt_LT.json
@@ -30,7 +30,6 @@
     "Updated" : "Atnaujinta",
     "Select a profile picture" : "Pažymėkite profilio paveikslėlį",
     "Delete" : "Ištrinti",
-    "Decrypting files... Please wait, this can take some time." : "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
     "Groups" : "Grupės",
     "undo" : "anuliuoti",
     "never" : "niekada",
@@ -40,7 +39,6 @@
     "A valid password must be provided" : "Slaptažodis turi būti tinkamas",
     "__language_name__" : "Lietuvių",
     "SSL root certificates" : "SSL sertifikatas",
-    "Encryption" : "Šifravimas",
     "Fatal issues only" : "Tik kritinės problemos",
     "None" : "Nieko",
     "Login" : "Prisijungti",
@@ -50,6 +48,7 @@
     "Allow resharing" : "Leisti dalintis",
     "Execute one task with each page loaded" : "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php yra registruotas tinklapio suplanuotų užduočių paslaugose, kad iškviesti cron.php kas 15 minučių per http.",
+    "Encryption" : "Šifravimas",
     "Server address" : "Serverio adresas",
     "Port" : "Prievadas",
     "Log level" : "Žurnalo išsamumas",
@@ -60,11 +59,7 @@
     "by" : " ",
     "User Documentation" : "Naudotojo dokumentacija",
     "Cheers!" : "Sveikinimai!",
-    "Administrator Documentation" : "Administratoriaus dokumentacija",
-    "Online Documentation" : "Dokumentacija tinkle",
     "Forum" : "Forumas",
-    "Bugtracker" : "Klaidų sekimas",
-    "Commercial Support" : "Komercinis palaikymas",
     "Get the apps to sync your files" : "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
     "Desktop client" : "Darbastalio klientas",
     "Android app" : "Android programa",
@@ -87,8 +82,6 @@
     "Choose as profile image" : "Pasirinkite profilio paveiksliuką",
     "Language" : "Kalba",
     "Help translate" : "Padėkite išversti",
-    "Log-in password" : "Prisijungimo slaptažodis",
-    "Decrypt all Files" : "Iššifruoti visus failus",
     "Username" : "Prisijungimo vardas",
     "Create" : "Sukurti",
     "Admin Recovery Password" : "Administracinis atkūrimo slaptažodis",
diff --git a/settings/l10n/lv.js b/settings/l10n/lv.js
index 9c4d0bc4e96..c0683a44fa1 100644
--- a/settings/l10n/lv.js
+++ b/settings/l10n/lv.js
@@ -9,14 +9,7 @@ OC.L10N.register(
     "Authentication error" : "Autentifikācijas kļūda",
     "Your full name has been changed." : "Jūsu pilnais vārds tika mainīts.",
     "Unable to change full name" : "Nav iespējams nomainīt jūsu pilno vārdu",
-    "Files decrypted successfully" : "Fails veiksmīgi atšifrēts",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nebija iespējams atšifrēt jūsu failus. Lūdzu pārbaudiet owncloud.log failu vai palūdziet to jūsu administratoram",
-    "Couldn't decrypt your files, check your password and try again" : "Nebija iespējams atšifrētu jūsu failus, pārbaudiet jūsu paroli un mēģiniet vēlreiz",
-    "Encryption keys deleted permanently" : "Šifrēšanas atslēgas pilnībā izdzēstas",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebija iespējams pilnībā dzēst jūsu šifrēšanas atslēgas. Lūdzu pārbaudiet owncloud.log failu vai palūdziet to jūsu administratoram",
     "Couldn't remove app." : "Nebija iespējams atslēgt lietoni.",
-    "Backups restored successfully" : "Rezerves kopijas veiksmīgi atjaunotas",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebija iespējams atjaunot jūsu šifrēšanas atslēgas. Lūdzu pārbaudiet owncloud.log failu vai palūdziet to jūsu administratoram",
     "Language changed" : "Valoda tika nomainīta",
     "Invalid request" : "Nederīgs vaicājums",
     "Admins can't remove themself from the admin group" : "Administratori nevar izņemt paši sevi no administratoru grupas",
@@ -30,7 +23,6 @@ OC.L10N.register(
     "Unable to change password" : "Nav iespējams nomainīt paroli",
     "Enabled" : "Pievienots",
     "Not enabled" : "Nav pievienots",
-    "Recommended" : "Rekomendēts",
     "Group already exists." : "Grupa jau eksistē.",
     "Unable to add group." : "Nevar pievienot grupu.",
     "Unable to delete group." : "Nevar izdzēst grupu.",
@@ -69,9 +61,6 @@ OC.L10N.register(
     "Strong password" : "Lieliska parole",
     "Valid until {date}" : "Valīds līdz {date}",
     "Delete" : "Dzēst",
-    "Decrypting files... Please wait, this can take some time." : "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.",
-    "Delete encryption keys permanently." : "Dzēst šifrēšanas atslēgas pilnībā",
-    "Restore encryption keys." : "Atjaunot šifrēšanas atslēgas.",
     "Groups" : "Grupas",
     "Unable to delete {objName}" : "Nevar izdzēst {objName}",
     "Error creating group" : "Kļūda, veidojot grupu",
@@ -88,7 +77,6 @@ OC.L10N.register(
     "A valid email must be provided" : "Jānorāda derīga e-pasta adrese",
     "__language_name__" : "__valodas_nosaukums__",
     "SSL root certificates" : "SSL saknes sertifikāti",
-    "Encryption" : "Šifrēšana",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Viss (letālas problēmas, kļūdas, brīdinājumi, informatīvas ziņas, atkļūdošanas paziņojumi)",
     "Info, warnings, errors and fatal issues" : "Informatīvas ziņas, brīdinājumi, kļūdas un letālas problēmas",
     "Warnings, errors and fatal issues" : "Brīdinājumi, kļūdas un letālas problēmas",
@@ -108,6 +96,7 @@ OC.L10N.register(
     "days" : "dienas",
     "Allow resharing" : "Atļaut atkārtotu koplietošanu",
     "Execute one task with each page loaded" : "Izpildīt vienu uzdevumu ar katru ielādēto lapu",
+    "Encryption" : "Šifrēšana",
     "Server address" : "Servera adrese",
     "Port" : "Ports",
     "Credentials" : "Akreditācijas dati",
@@ -118,11 +107,7 @@ OC.L10N.register(
     "More apps" : "Vairāk programmu",
     "by" : "līdz",
     "User Documentation" : "Lietotāja dokumentācija",
-    "Administrator Documentation" : "Administratora dokumentācija",
-    "Online Documentation" : "Tiešsaistes dokumentācija",
     "Forum" : "Forums",
-    "Bugtracker" : "Kļūdu sekotājs",
-    "Commercial Support" : "Komerciālais atbalsts",
     "Get the apps to sync your files" : "Saņem lietotnes, lai sinhronizētu savas datnes",
     "Desktop client" : "Darbvirsmas klients",
     "Android app" : "Android lietotne",
@@ -143,8 +128,6 @@ OC.L10N.register(
     "Cancel" : "Atcelt",
     "Language" : "Valoda",
     "Help translate" : "Palīdzi tulkot",
-    "Log-in password" : "Pieslēgšanās parole",
-    "Decrypt all Files" : "Atšifrēt visus failus",
     "Username" : "Lietotājvārds",
     "Create" : "Izveidot",
     "Admin Recovery Password" : "Administratora atgūšanas parole",
diff --git a/settings/l10n/lv.json b/settings/l10n/lv.json
index 985320d990e..8b0ed430b9c 100644
--- a/settings/l10n/lv.json
+++ b/settings/l10n/lv.json
@@ -7,14 +7,7 @@
     "Authentication error" : "Autentifikācijas kļūda",
     "Your full name has been changed." : "Jūsu pilnais vārds tika mainīts.",
     "Unable to change full name" : "Nav iespējams nomainīt jūsu pilno vārdu",
-    "Files decrypted successfully" : "Fails veiksmīgi atšifrēts",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nebija iespējams atšifrēt jūsu failus. Lūdzu pārbaudiet owncloud.log failu vai palūdziet to jūsu administratoram",
-    "Couldn't decrypt your files, check your password and try again" : "Nebija iespējams atšifrētu jūsu failus, pārbaudiet jūsu paroli un mēģiniet vēlreiz",
-    "Encryption keys deleted permanently" : "Šifrēšanas atslēgas pilnībā izdzēstas",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebija iespējams pilnībā dzēst jūsu šifrēšanas atslēgas. Lūdzu pārbaudiet owncloud.log failu vai palūdziet to jūsu administratoram",
     "Couldn't remove app." : "Nebija iespējams atslēgt lietoni.",
-    "Backups restored successfully" : "Rezerves kopijas veiksmīgi atjaunotas",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebija iespējams atjaunot jūsu šifrēšanas atslēgas. Lūdzu pārbaudiet owncloud.log failu vai palūdziet to jūsu administratoram",
     "Language changed" : "Valoda tika nomainīta",
     "Invalid request" : "Nederīgs vaicājums",
     "Admins can't remove themself from the admin group" : "Administratori nevar izņemt paši sevi no administratoru grupas",
@@ -28,7 +21,6 @@
     "Unable to change password" : "Nav iespējams nomainīt paroli",
     "Enabled" : "Pievienots",
     "Not enabled" : "Nav pievienots",
-    "Recommended" : "Rekomendēts",
     "Group already exists." : "Grupa jau eksistē.",
     "Unable to add group." : "Nevar pievienot grupu.",
     "Unable to delete group." : "Nevar izdzēst grupu.",
@@ -67,9 +59,6 @@
     "Strong password" : "Lieliska parole",
     "Valid until {date}" : "Valīds līdz {date}",
     "Delete" : "Dzēst",
-    "Decrypting files... Please wait, this can take some time." : "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.",
-    "Delete encryption keys permanently." : "Dzēst šifrēšanas atslēgas pilnībā",
-    "Restore encryption keys." : "Atjaunot šifrēšanas atslēgas.",
     "Groups" : "Grupas",
     "Unable to delete {objName}" : "Nevar izdzēst {objName}",
     "Error creating group" : "Kļūda, veidojot grupu",
@@ -86,7 +75,6 @@
     "A valid email must be provided" : "Jānorāda derīga e-pasta adrese",
     "__language_name__" : "__valodas_nosaukums__",
     "SSL root certificates" : "SSL saknes sertifikāti",
-    "Encryption" : "Šifrēšana",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Viss (letālas problēmas, kļūdas, brīdinājumi, informatīvas ziņas, atkļūdošanas paziņojumi)",
     "Info, warnings, errors and fatal issues" : "Informatīvas ziņas, brīdinājumi, kļūdas un letālas problēmas",
     "Warnings, errors and fatal issues" : "Brīdinājumi, kļūdas un letālas problēmas",
@@ -106,6 +94,7 @@
     "days" : "dienas",
     "Allow resharing" : "Atļaut atkārtotu koplietošanu",
     "Execute one task with each page loaded" : "Izpildīt vienu uzdevumu ar katru ielādēto lapu",
+    "Encryption" : "Šifrēšana",
     "Server address" : "Servera adrese",
     "Port" : "Ports",
     "Credentials" : "Akreditācijas dati",
@@ -116,11 +105,7 @@
     "More apps" : "Vairāk programmu",
     "by" : "līdz",
     "User Documentation" : "Lietotāja dokumentācija",
-    "Administrator Documentation" : "Administratora dokumentācija",
-    "Online Documentation" : "Tiešsaistes dokumentācija",
     "Forum" : "Forums",
-    "Bugtracker" : "Kļūdu sekotājs",
-    "Commercial Support" : "Komerciālais atbalsts",
     "Get the apps to sync your files" : "Saņem lietotnes, lai sinhronizētu savas datnes",
     "Desktop client" : "Darbvirsmas klients",
     "Android app" : "Android lietotne",
@@ -141,8 +126,6 @@
     "Cancel" : "Atcelt",
     "Language" : "Valoda",
     "Help translate" : "Palīdzi tulkot",
-    "Log-in password" : "Pieslēgšanās parole",
-    "Decrypt all Files" : "Atšifrēt visus failus",
     "Username" : "Lietotājvārds",
     "Create" : "Izveidot",
     "Admin Recovery Password" : "Administratora atgūšanas parole",
diff --git a/settings/l10n/mk.js b/settings/l10n/mk.js
index 1ebd43eabcc..4119f985b59 100644
--- a/settings/l10n/mk.js
+++ b/settings/l10n/mk.js
@@ -9,9 +9,6 @@ OC.L10N.register(
     "Authentication error" : "Грешка во автентикација",
     "Your full name has been changed." : "Вашето целосно име е променето.",
     "Unable to change full name" : "Не можам да го променам целото име",
-    "Files decrypted successfully" : "Датотектие се успешно декриптирани",
-    "Encryption keys deleted permanently" : "Енкрипциските клучеви се трајно избришани",
-    "Backups restored successfully" : "Бекапите се успешно реставрирани",
     "Language changed" : "Јазикот е сменет",
     "Invalid request" : "Неправилно барање",
     "Admins can't remove themself from the admin group" : "Администраторите неможе да се избришат себеси од админ групата",
@@ -43,8 +40,6 @@ OC.L10N.register(
     "Good password" : "Добра лозинка",
     "Strong password" : "Јака лозинка",
     "Delete" : "Избриши",
-    "Delete encryption keys permanently." : "Трајно бришење на енкрипциските клучеви.",
-    "Restore encryption keys." : "Поврати ги енкрипцисиките клучеви.",
     "Groups" : "Групи",
     "Error creating group" : "Грешка при креирање на група",
     "A valid group name must be provided" : "Мора да се обезбеди валидно име на група",
@@ -56,7 +51,6 @@ OC.L10N.register(
     "A valid password must be provided" : "Мора да се обезбеди валидна лозинка",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "SSL root сертификати",
-    "Encryption" : "Енкрипција",
     "Info, warnings, errors and fatal issues" : "Информации, предупредувања, грешки и фатални работи",
     "Warnings, errors and fatal issues" : "Предупредувања, грешки и фатални работи",
     "Errors and fatal issues" : "Грешки и фатални работи",
@@ -81,6 +75,7 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Изврши по една задача со секоја вчитана страница",
     "This is used for sending out notifications." : "Ова се користи за испраќање на известувања.",
     "Send mode" : "Мод на испраќање",
+    "Encryption" : "Енкрипција",
     "From address" : "Од адреса",
     "mail" : "Електронска пошта",
     "Authentication method" : "Метод на автентификација",
@@ -102,11 +97,7 @@ OC.L10N.register(
     "Admin Documentation" : "Админстраторска документација",
     "Enable only for specific groups" : "Овозможи само на специфицирани групи",
     "Cheers!" : "Поздрав!",
-    "Administrator Documentation" : "Администраторска документација",
-    "Online Documentation" : "Документација на интернет",
     "Forum" : "Форум",
-    "Bugtracker" : "Тракер на грешки",
-    "Commercial Support" : "Комерцијална подршка",
     "Get the apps to sync your files" : "Преземете апликации за синхронизирање на вашите датотеки",
     "Show First Run Wizard again" : "Прикажи го повторно волшебникот при првото стартување",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>",
@@ -127,10 +118,6 @@ OC.L10N.register(
     "Choose as profile image" : "Одбери фотографија за профилот",
     "Language" : "Јазик",
     "Help translate" : "Помогни во преводот",
-    "Log-in password" : "Лозинка за најавување",
-    "Decrypt all Files" : "Дешифрирај ги сите датотеки",
-    "Restore Encryption Keys" : "Обнови ги енкрипциските клучеви",
-    "Delete Encryption Keys" : "Избриши ги енкрипцисиките клучеви",
     "Username" : "Корисничко име",
     "Create" : "Создај",
     "Admin Recovery Password" : "Обновување на Admin лозинката",
diff --git a/settings/l10n/mk.json b/settings/l10n/mk.json
index bd065363504..40b8b433dea 100644
--- a/settings/l10n/mk.json
+++ b/settings/l10n/mk.json
@@ -7,9 +7,6 @@
     "Authentication error" : "Грешка во автентикација",
     "Your full name has been changed." : "Вашето целосно име е променето.",
     "Unable to change full name" : "Не можам да го променам целото име",
-    "Files decrypted successfully" : "Датотектие се успешно декриптирани",
-    "Encryption keys deleted permanently" : "Енкрипциските клучеви се трајно избришани",
-    "Backups restored successfully" : "Бекапите се успешно реставрирани",
     "Language changed" : "Јазикот е сменет",
     "Invalid request" : "Неправилно барање",
     "Admins can't remove themself from the admin group" : "Администраторите неможе да се избришат себеси од админ групата",
@@ -41,8 +38,6 @@
     "Good password" : "Добра лозинка",
     "Strong password" : "Јака лозинка",
     "Delete" : "Избриши",
-    "Delete encryption keys permanently." : "Трајно бришење на енкрипциските клучеви.",
-    "Restore encryption keys." : "Поврати ги енкрипцисиките клучеви.",
     "Groups" : "Групи",
     "Error creating group" : "Грешка при креирање на група",
     "A valid group name must be provided" : "Мора да се обезбеди валидно име на група",
@@ -54,7 +49,6 @@
     "A valid password must be provided" : "Мора да се обезбеди валидна лозинка",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "SSL root сертификати",
-    "Encryption" : "Енкрипција",
     "Info, warnings, errors and fatal issues" : "Информации, предупредувања, грешки и фатални работи",
     "Warnings, errors and fatal issues" : "Предупредувања, грешки и фатални работи",
     "Errors and fatal issues" : "Грешки и фатални работи",
@@ -79,6 +73,7 @@
     "Execute one task with each page loaded" : "Изврши по една задача со секоја вчитана страница",
     "This is used for sending out notifications." : "Ова се користи за испраќање на известувања.",
     "Send mode" : "Мод на испраќање",
+    "Encryption" : "Енкрипција",
     "From address" : "Од адреса",
     "mail" : "Електронска пошта",
     "Authentication method" : "Метод на автентификација",
@@ -100,11 +95,7 @@
     "Admin Documentation" : "Админстраторска документација",
     "Enable only for specific groups" : "Овозможи само на специфицирани групи",
     "Cheers!" : "Поздрав!",
-    "Administrator Documentation" : "Администраторска документација",
-    "Online Documentation" : "Документација на интернет",
     "Forum" : "Форум",
-    "Bugtracker" : "Тракер на грешки",
-    "Commercial Support" : "Комерцијална подршка",
     "Get the apps to sync your files" : "Преземете апликации за синхронизирање на вашите датотеки",
     "Show First Run Wizard again" : "Прикажи го повторно волшебникот при првото стартување",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>",
@@ -125,10 +116,6 @@
     "Choose as profile image" : "Одбери фотографија за профилот",
     "Language" : "Јазик",
     "Help translate" : "Помогни во преводот",
-    "Log-in password" : "Лозинка за најавување",
-    "Decrypt all Files" : "Дешифрирај ги сите датотеки",
-    "Restore Encryption Keys" : "Обнови ги енкрипциските клучеви",
-    "Delete Encryption Keys" : "Избриши ги енкрипцисиките клучеви",
     "Username" : "Корисничко име",
     "Create" : "Создај",
     "Admin Recovery Password" : "Обновување на Admin лозинката",
diff --git a/settings/l10n/mn.js b/settings/l10n/mn.js
index 7b56c73c2bd..099846ae293 100644
--- a/settings/l10n/mn.js
+++ b/settings/l10n/mn.js
@@ -8,12 +8,7 @@ OC.L10N.register(
     "Authentication error" : "Нотолгооны алдаа",
     "Your full name has been changed." : "Таны бүтэн нэр солигдлоо.",
     "Unable to change full name" : "Бүтэн нэр солих боломжгүй байна",
-    "Files decrypted successfully" : "Файл амжилттай хөрвүүлэгдлээ",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Таны файлыг хөрвүүлж чадахгүй байна, та админаасаа асуух эсвэл өөрийнхөө лог бичилтийг шалгана уу",
-    "Couldn't decrypt your files, check your password and try again" : "Таны файлыг хөрвүүлж чадахгүй байна, та нууц үгээ шалгаад дахин оролдоно уу",
-    "Encryption keys deleted permanently" : "Хөрвүүлэгч түлхүүр үгнүүд бүр мөсөн устгагдлаа",
     "Couldn't remove app." : "Апп-ыг устгаж чадсангүй",
-    "Backups restored successfully" : "Нөөцүүд амжилттай сэргээгдлээ",
     "Language changed" : "Хэл солигдлоо",
     "Invalid request" : "Буруу хүсэлт",
     "Admins can't remove themself from the admin group" : "Админууд өөрсдийгөө Админ бүлгээс хасаж чадахгүй",
diff --git a/settings/l10n/mn.json b/settings/l10n/mn.json
index 828ae435eb8..7ad0993ae09 100644
--- a/settings/l10n/mn.json
+++ b/settings/l10n/mn.json
@@ -6,12 +6,7 @@
     "Authentication error" : "Нотолгооны алдаа",
     "Your full name has been changed." : "Таны бүтэн нэр солигдлоо.",
     "Unable to change full name" : "Бүтэн нэр солих боломжгүй байна",
-    "Files decrypted successfully" : "Файл амжилттай хөрвүүлэгдлээ",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Таны файлыг хөрвүүлж чадахгүй байна, та админаасаа асуух эсвэл өөрийнхөө лог бичилтийг шалгана уу",
-    "Couldn't decrypt your files, check your password and try again" : "Таны файлыг хөрвүүлж чадахгүй байна, та нууц үгээ шалгаад дахин оролдоно уу",
-    "Encryption keys deleted permanently" : "Хөрвүүлэгч түлхүүр үгнүүд бүр мөсөн устгагдлаа",
     "Couldn't remove app." : "Апп-ыг устгаж чадсангүй",
-    "Backups restored successfully" : "Нөөцүүд амжилттай сэргээгдлээ",
     "Language changed" : "Хэл солигдлоо",
     "Invalid request" : "Буруу хүсэлт",
     "Admins can't remove themself from the admin group" : "Админууд өөрсдийгөө Админ бүлгээс хасаж чадахгүй",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index 912c072fa2a..3a5ee411a43 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Advarsler om sikkerhet og oppsett",
     "Sharing" : "Deling",
     "External Storage" : "Ekstern lagring",
+    "Server Side Encryption" : "Serverkryptering",
     "Cron" : "Cron",
     "Email Server" : "E-postserver",
     "Log" : "Logg",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Autentiseringsfeil",
     "Your full name has been changed." : "Ditt fulle navn er blitt endret.",
     "Unable to change full name" : "Klarte ikke å endre fullt navn",
-    "Files decrypted successfully" : "Dekryptering av filer vellykket",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Kunne ikke dekryptere filene dine. Sjekk owncloud.log eller spør administratoren",
-    "Couldn't decrypt your files, check your password and try again" : "Kunne ikke dekryptere filene dine. Sjekk passordet ditt og prøv igjen",
-    "Encryption keys deleted permanently" : "Krypteringsnøkler permanent slettet",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke slette krypteringsnøklene dine permanent. Sjekk owncloud.log eller spør administratoren",
     "Couldn't remove app." : "Klarte ikke å fjerne app.",
-    "Backups restored successfully" : "Vellykket gjenoppretting fra sikkerhetskopier",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke gjenopprette krypteringsnøklene dine. Sjekk owncloud.log eller spør administratoren",
     "Language changed" : "Språk endret",
     "Invalid request" : "Ugyldig forespørsel",
     "Admins can't remove themself from the admin group" : "Admin kan ikke flytte seg selv fra admingruppen",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Kunne ikke endre passord",
     "Enabled" : "Aktiv",
     "Not enabled" : "Ikke aktivert",
-    "Recommended" : "Anbefalt",
     "Group already exists." : "Gruppe finnes allerede.",
     "Unable to add group." : "Kan ikke legge til gruppe.",
     "Unable to delete group." : "Kan ikke slette gruppe.",
@@ -76,9 +69,6 @@ OC.L10N.register(
     "Strong password" : "Sterkt passord",
     "Valid until {date}" : "Gyldig til {date}",
     "Delete" : "Slett",
-    "Decrypting files... Please wait, this can take some time." : "Dekrypterer filer... Vennligst vent, dette kan ta litt tid.",
-    "Delete encryption keys permanently." : "Slett krypteringsnøkler permanent.",
-    "Restore encryption keys." : "Gjenopprett krypteringsnøkler.",
     "Groups" : "Grupper",
     "Unable to delete {objName}" : "Kan ikke slette {objName}",
     "Error creating group" : "Feil ved oppretting av gruppe",
@@ -98,7 +88,6 @@ OC.L10N.register(
     "Sync clients" : "Synkroniseringsklienter",
     "Personal info" : "Personlig informasjon",
     "SSL root certificates" : "SSL rotsertifikater",
-    "Encryption" : "Kryptering",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (fatale problemer, feil, advarsler, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, advarsler, feil og fatale problemer",
     "Warnings, errors and fatal issues" : "Advarsler, feil og fatale problemer",
@@ -142,10 +131,10 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Utfør en oppgave med hver side som blir lastet",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
-    "Server Side Encryption" : "Serverkryptering",
     "Enable Server-Side-Encryption" : "Slå på serverkryptering",
     "This is used for sending out notifications." : "Dette brukes for utsending av varsler.",
     "Send mode" : "Sendemåte",
+    "Encryption" : "Kryptering",
     "From address" : "Fra adresse",
     "mail" : "e-post",
     "Authentication method" : "Autentiseringsmetode",
@@ -190,11 +179,7 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hei,<br><br>vil bare informere om at du nå har en %s-konto.<br><br>Brukernavnet ditt: %s<br>Gå dit: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Ha det!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hei,\n\nVil bare informere om at du nå har en %s-konto.\n\nBrukernavnet ditt: %s\nGå dit: %s\n\n",
-    "Administrator Documentation" : "Dokumentasjon for administratorer",
-    "Online Documentation" : "Online dokumentasjon",
     "Forum" : "Forum",
-    "Bugtracker" : "Innmelding og sporing av feil",
-    "Commercial Support" : "Forretningsstøtte",
     "Get the apps to sync your files" : "Hent apper som synkroniserer filene dine",
     "Desktop client" : "Skrivebordsklient",
     "Android app" : "Android-app",
@@ -229,12 +214,6 @@ OC.L10N.register(
     "Issued By" : "Utstedt av",
     "Valid until %s" : "Gyldig til %s",
     "Import root certificate" : "Importer rotsertifikat",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Krypterings-appen er ikke aktiv lenger. Vennligst dekrypter alle filene dine",
-    "Log-in password" : "Innloggingspassord",
-    "Decrypt all Files" : "Dekrypter alle filer",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Krypteringsnøklene dine er flyttet til en plass for sikkerhetskopier. Hvis noe gikk galt kan du gjenopprette nøklene. Ikke slett dem permanent før du er ikker på at alle filer er dekryptert korrekt.",
-    "Restore Encryption Keys" : "Gjenopprett krypteringsnøkler",
-    "Delete Encryption Keys" : "Slett krypteringsnøkler",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Utviklet av {communityopen}ownCloud-fellesskapet{linkclose}. {githubopen}Kildekoden{linkclose} er lisensiert under {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Vis lagringssted",
     "Show last log in" : "Vis site innlogging",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index 479bbbe2dbd..6e5a29f8cd4 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Advarsler om sikkerhet og oppsett",
     "Sharing" : "Deling",
     "External Storage" : "Ekstern lagring",
+    "Server Side Encryption" : "Serverkryptering",
     "Cron" : "Cron",
     "Email Server" : "E-postserver",
     "Log" : "Logg",
@@ -10,14 +11,7 @@
     "Authentication error" : "Autentiseringsfeil",
     "Your full name has been changed." : "Ditt fulle navn er blitt endret.",
     "Unable to change full name" : "Klarte ikke å endre fullt navn",
-    "Files decrypted successfully" : "Dekryptering av filer vellykket",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Kunne ikke dekryptere filene dine. Sjekk owncloud.log eller spør administratoren",
-    "Couldn't decrypt your files, check your password and try again" : "Kunne ikke dekryptere filene dine. Sjekk passordet ditt og prøv igjen",
-    "Encryption keys deleted permanently" : "Krypteringsnøkler permanent slettet",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke slette krypteringsnøklene dine permanent. Sjekk owncloud.log eller spør administratoren",
     "Couldn't remove app." : "Klarte ikke å fjerne app.",
-    "Backups restored successfully" : "Vellykket gjenoppretting fra sikkerhetskopier",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke gjenopprette krypteringsnøklene dine. Sjekk owncloud.log eller spør administratoren",
     "Language changed" : "Språk endret",
     "Invalid request" : "Ugyldig forespørsel",
     "Admins can't remove themself from the admin group" : "Admin kan ikke flytte seg selv fra admingruppen",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Kunne ikke endre passord",
     "Enabled" : "Aktiv",
     "Not enabled" : "Ikke aktivert",
-    "Recommended" : "Anbefalt",
     "Group already exists." : "Gruppe finnes allerede.",
     "Unable to add group." : "Kan ikke legge til gruppe.",
     "Unable to delete group." : "Kan ikke slette gruppe.",
@@ -74,9 +67,6 @@
     "Strong password" : "Sterkt passord",
     "Valid until {date}" : "Gyldig til {date}",
     "Delete" : "Slett",
-    "Decrypting files... Please wait, this can take some time." : "Dekrypterer filer... Vennligst vent, dette kan ta litt tid.",
-    "Delete encryption keys permanently." : "Slett krypteringsnøkler permanent.",
-    "Restore encryption keys." : "Gjenopprett krypteringsnøkler.",
     "Groups" : "Grupper",
     "Unable to delete {objName}" : "Kan ikke slette {objName}",
     "Error creating group" : "Feil ved oppretting av gruppe",
@@ -96,7 +86,6 @@
     "Sync clients" : "Synkroniseringsklienter",
     "Personal info" : "Personlig informasjon",
     "SSL root certificates" : "SSL rotsertifikater",
-    "Encryption" : "Kryptering",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (fatale problemer, feil, advarsler, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, advarsler, feil og fatale problemer",
     "Warnings, errors and fatal issues" : "Advarsler, feil og fatale problemer",
@@ -140,10 +129,10 @@
     "Execute one task with each page loaded" : "Utfør en oppgave med hver side som blir lastet",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
-    "Server Side Encryption" : "Serverkryptering",
     "Enable Server-Side-Encryption" : "Slå på serverkryptering",
     "This is used for sending out notifications." : "Dette brukes for utsending av varsler.",
     "Send mode" : "Sendemåte",
+    "Encryption" : "Kryptering",
     "From address" : "Fra adresse",
     "mail" : "e-post",
     "Authentication method" : "Autentiseringsmetode",
@@ -188,11 +177,7 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hei,<br><br>vil bare informere om at du nå har en %s-konto.<br><br>Brukernavnet ditt: %s<br>Gå dit: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Ha det!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hei,\n\nVil bare informere om at du nå har en %s-konto.\n\nBrukernavnet ditt: %s\nGå dit: %s\n\n",
-    "Administrator Documentation" : "Dokumentasjon for administratorer",
-    "Online Documentation" : "Online dokumentasjon",
     "Forum" : "Forum",
-    "Bugtracker" : "Innmelding og sporing av feil",
-    "Commercial Support" : "Forretningsstøtte",
     "Get the apps to sync your files" : "Hent apper som synkroniserer filene dine",
     "Desktop client" : "Skrivebordsklient",
     "Android app" : "Android-app",
@@ -227,12 +212,6 @@
     "Issued By" : "Utstedt av",
     "Valid until %s" : "Gyldig til %s",
     "Import root certificate" : "Importer rotsertifikat",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Krypterings-appen er ikke aktiv lenger. Vennligst dekrypter alle filene dine",
-    "Log-in password" : "Innloggingspassord",
-    "Decrypt all Files" : "Dekrypter alle filer",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Krypteringsnøklene dine er flyttet til en plass for sikkerhetskopier. Hvis noe gikk galt kan du gjenopprette nøklene. Ikke slett dem permanent før du er ikker på at alle filer er dekryptert korrekt.",
-    "Restore Encryption Keys" : "Gjenopprett krypteringsnøkler",
-    "Delete Encryption Keys" : "Slett krypteringsnøkler",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Utviklet av {communityopen}ownCloud-fellesskapet{linkclose}. {githubopen}Kildekoden{linkclose} er lisensiert under {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Vis lagringssted",
     "Show last log in" : "Vis site innlogging",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 526158c0eb9..80389ed6d80 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Beveiligings- en instellingswaarschuwingen",
     "Sharing" : "Delen",
     "External Storage" : "Externe opslag",
+    "Server Side Encryption" : "Server-side versleuteling",
     "Cron" : "Cron",
     "Email Server" : "E-mailserver",
     "Log" : "Log",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Authenticatie fout",
     "Your full name has been changed." : "Uw volledige naam is gewijzigd.",
     "Unable to change full name" : "Kan de volledige naam niet wijzigen",
-    "Files decrypted successfully" : "Bestanden succesvol ontsleuteld",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag het uw beheerder",
-    "Couldn't decrypt your files, check your password and try again" : "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw",
-    "Encryption keys deleted permanently" : "Cryptosleutels permanent verwijderd",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud.log, of neem contact op met uw beheerder.",
     "Couldn't remove app." : "Kon app niet verwijderen.",
-    "Backups restored successfully" : "Backup succesvol terggezet",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kon uw cryptosleutels niet herstellen. Controleer uw owncloud.log of neem contact op met uw beheerder",
     "Language changed" : "Taal aangepast",
     "Invalid request" : "Ongeldige aanvraag",
     "Admins can't remove themself from the admin group" : "Admins kunnen zichzelf niet uit de admin groep verwijderen",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Kan wachtwoord niet wijzigen",
     "Enabled" : "Geactiveerd",
     "Not enabled" : "Niet ingeschakeld",
-    "Recommended" : "Aanbevolen",
     "Group already exists." : "Groep bestaat al.",
     "Unable to add group." : "Kan groep niet toevoegen.",
     "Unable to delete group." : "Kan groep niet verwijderen.",
@@ -48,16 +41,19 @@ OC.L10N.register(
     "A user with that name already exists." : "Er bestaat al een gebruiker met die naam.",
     "Unable to create user." : "Kan gebruiker niet aanmaken.",
     "Your %s account was created" : "Uw %s account is aangemaakt",
-    "Unable to delete user." : "Kan gebruiker niet afvoeren.",
+    "Unable to delete user." : "Kan gebruiker niet verwijderen.",
     "Forbidden" : "Verboden",
     "Invalid user" : "Ongeldige gebruiker",
-    "Unable to change mail address" : "Kan e-mailadressen niet wijzigen",
+    "Unable to change mail address" : "Kan e-mailadres niet wijzigen",
     "Email saved" : "E-mail bewaard",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Weet u zeker dat u \"{domain}\" als een vertrouwd domein wilt toevoegen?",
     "Add trusted domain" : "Vertrouwd domein toevoegen",
     "Sending..." : "Versturen...",
     "All" : "Alle",
-    "Please wait...." : "Even geduld aub....",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officiële apps zijn ontwikkeld door en binnen de ownCloud community. Ze bieden functionaliteit binnen ownCloud en zijn klaar voor gebruik in een productie omgeving.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Goedgekeurde apps zijn ontwikkeld door vertrouwde ontwikkelaars en hebben een beveiligingscontrole ondergaan. Ze worden actief onderhouden in een open code repository en hun ontwikkelaars vinden ze stabiel genoeg voor informeel of normaal gebruik.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Deze app is niet gecontroleerd op beveiligingsproblemen en is nieuw of staat bekend als instabiel. Installatie is op eigen risico.",
+    "Please wait...." : "Even geduld a.u.b.",
     "Error while disabling app" : "Fout tijdens het uitzetten van het programma",
     "Disable" : "Uitschakelen",
     "Enable" : "Activeer",
@@ -76,9 +72,6 @@ OC.L10N.register(
     "Strong password" : "Sterk wachtwoord",
     "Valid until {date}" : "Geldig tot {date}",
     "Delete" : "Verwijder",
-    "Decrypting files... Please wait, this can take some time." : "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
-    "Delete encryption keys permanently." : "Verwijder de encryptiesleutels permanent",
-    "Restore encryption keys." : "Herstel de encryptiesleutels",
     "Groups" : "Groepen",
     "Unable to delete {objName}" : "Kan {objName} niet verwijderen",
     "Error creating group" : "Fout bij aanmaken groep",
@@ -88,7 +81,7 @@ OC.L10N.register(
     "no group" : "geen groep",
     "never" : "geen",
     "deleted {userName}" : "verwijderd {userName}",
-    "add group" : "toevoegen groep",
+    "add group" : "Nieuwe groep",
     "Changing the password will result in data loss, because data recovery is not available for this user" : "Wijzigen van het wachtwoord leidt tot gegevensverlies, omdat gegevensherstel voor deze gebruiker niet beschikbaar is",
     "A valid username must be provided" : "Er moet een geldige gebruikersnaam worden opgegeven",
     "Error creating user" : "Fout bij aanmaken gebruiker",
@@ -98,7 +91,6 @@ OC.L10N.register(
     "Sync clients" : "Sync clients",
     "Personal info" : "Persoonlijke info",
     "SSL root certificates" : "SSL root certificaten",
-    "Encryption" : "Versleuteling",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale problemen, fouten, waarschuwingen, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, waarschuwingen, fouten en fatale problemen",
     "Warnings, errors and fatal issues" : "Waarschuwingen, fouten en fatale problemen",
@@ -139,13 +131,14 @@ OC.L10N.register(
     "Last cron job execution: %s." : "Laatst uitgevoerde cronjob: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Laatst uitgevoerde cronjob: %s. Er lijkt iets fout gegaan.",
     "Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
+    "Open documentation" : "Open documentatie",
     "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 every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
-    "Server Side Encryption" : "Server-side versleuteling",
     "Enable Server-Side-Encryption" : "Inschakelen server-side versleuteling",
     "This is used for sending out notifications." : "Dit wordt gebruikt voor het verzenden van meldingen.",
     "Send mode" : "Verstuurmodus",
+    "Encryption" : "Versleuteling",
     "From address" : "Afzenderadres",
     "mail" : "e-mail",
     "Authentication method" : "Authenticatiemethode",
@@ -169,12 +162,14 @@ OC.L10N.register(
     "How to do backups" : "Hoe maak je back-ups",
     "Advanced monitoring" : "Geavanceerde monitoring",
     "Performance tuning" : "Prestatie afstelling",
-    "Improving the config.php" : "Verbeter de config.php",
+    "Improving the config.php" : "config.php verbeteren",
     "Theming" : "Thema's",
     "Hardening and security guidance" : "Hardening en security advies",
     "Version" : "Versie",
     "More apps" : "Meer applicaties",
     "Developer documentation" : "Ontwikkelaarsdocumentatie",
+    "Experimental applications ahead" : "Experimentele applicaties vooraan",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentele apps zijn niet gecontroleerd op beveiligingsproblemen, zijn nieuw of staan bekend als instabiel en worden volop ontwikkeld. Installatie kan leiden tot gegevensverlies of beveiligingsincidenten.",
     "by" : "door",
     "licensed" : "gelicenseerd",
     "Documentation:" : "Documentatie:",
@@ -186,15 +181,17 @@ OC.L10N.register(
     "Update to %s" : "Bijgewerkt naar %s",
     "Enable only for specific groups" : "Alleen voor bepaalde groepen activeren",
     "Uninstall App" : "De-installeren app",
+    "Enable experimental apps" : "Inschakelen experimentele apps",
     "No apps found for your version" : "Geen apps gevonden voor uw versie",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo daar,<br><br>we willen u laten weten dat u nu een %s account hebt.<br><br>Uw gebruikersnaam: %s<br>Ga naar: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Proficiat!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nwe willen u laten weten dat u nu een %s account hebt.\n\nUw gebruikersnaam: %s\nGa naar: %s\n\n",
-    "Administrator Documentation" : "Beheerdersdocumentatie",
-    "Online Documentation" : "Online documentatie",
+    "User documentation" : "Gebruikersdocumentatie",
+    "Administrator documentation" : "Beheerdersdocumentatie",
+    "Online documentation" : "Online documentatie",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Commerciële ondersteuning",
+    "Issue tracker" : "Issue tracker",
+    "Commercial support" : "Commerciële ondersteuning",
     "Get the apps to sync your files" : "Download de apps om bestanden te synchroniseren",
     "Desktop client" : "Desktop client",
     "Android app" : "Android app",
@@ -217,7 +214,7 @@ OC.L10N.register(
     "Profile picture" : "Profielafbeelding",
     "Upload new" : "Upload een nieuwe",
     "Select new from Files" : "Selecteer een nieuwe vanuit bestanden",
-    "Remove image" : "Verwijder afbeelding",
+    "Remove image" : "Afbeelding verwijderen",
     "Either png or jpg. Ideally square but you will be able to crop it." : "Of png, of jpg. Bij voorkeur vierkant, maar u kunt de afbeelding bijsnijden.",
     "Your avatar is provided by your original account." : "Uw avatar is verstrekt door uw originele account.",
     "Cancel" : "Annuleer",
@@ -229,12 +226,6 @@ OC.L10N.register(
     "Issued By" : "Uitgegeven door",
     "Valid until %s" : "Geldig tot %s",
     "Import root certificate" : "Importeren root certificaat",
-    "The encryption app is no longer enabled, please decrypt all your files" : "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten.",
-    "Log-in password" : "Inlog-wachtwoord",
-    "Decrypt all Files" : "Decodeer alle bestanden",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Uw cryptosleutels zijn verplaatst naar een backup locatie. Als iets iets verkeerd ging, kunt u de sleutels herstellen. Verwijder ze alleen permanent als u zeker weet dat de bestanden goed zijn versleuteld.",
-    "Restore Encryption Keys" : "Herstel cryptosleutels",
-    "Delete Encryption Keys" : "Verwijder cryptosleutels",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Ontwikkeld door de {communityopen}ownCloud gemeenschaplinkclose}, de {githubopen}source code{linkclose} is gelicenseerd onder de {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Toon opslaglocatie",
     "Show last log in" : "Toon laatste inlog",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index f00fa79c9ea..80a6f944a3f 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Beveiligings- en instellingswaarschuwingen",
     "Sharing" : "Delen",
     "External Storage" : "Externe opslag",
+    "Server Side Encryption" : "Server-side versleuteling",
     "Cron" : "Cron",
     "Email Server" : "E-mailserver",
     "Log" : "Log",
@@ -10,14 +11,7 @@
     "Authentication error" : "Authenticatie fout",
     "Your full name has been changed." : "Uw volledige naam is gewijzigd.",
     "Unable to change full name" : "Kan de volledige naam niet wijzigen",
-    "Files decrypted successfully" : "Bestanden succesvol ontsleuteld",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag het uw beheerder",
-    "Couldn't decrypt your files, check your password and try again" : "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw",
-    "Encryption keys deleted permanently" : "Cryptosleutels permanent verwijderd",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud.log, of neem contact op met uw beheerder.",
     "Couldn't remove app." : "Kon app niet verwijderen.",
-    "Backups restored successfully" : "Backup succesvol terggezet",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kon uw cryptosleutels niet herstellen. Controleer uw owncloud.log of neem contact op met uw beheerder",
     "Language changed" : "Taal aangepast",
     "Invalid request" : "Ongeldige aanvraag",
     "Admins can't remove themself from the admin group" : "Admins kunnen zichzelf niet uit de admin groep verwijderen",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Kan wachtwoord niet wijzigen",
     "Enabled" : "Geactiveerd",
     "Not enabled" : "Niet ingeschakeld",
-    "Recommended" : "Aanbevolen",
     "Group already exists." : "Groep bestaat al.",
     "Unable to add group." : "Kan groep niet toevoegen.",
     "Unable to delete group." : "Kan groep niet verwijderen.",
@@ -46,16 +39,19 @@
     "A user with that name already exists." : "Er bestaat al een gebruiker met die naam.",
     "Unable to create user." : "Kan gebruiker niet aanmaken.",
     "Your %s account was created" : "Uw %s account is aangemaakt",
-    "Unable to delete user." : "Kan gebruiker niet afvoeren.",
+    "Unable to delete user." : "Kan gebruiker niet verwijderen.",
     "Forbidden" : "Verboden",
     "Invalid user" : "Ongeldige gebruiker",
-    "Unable to change mail address" : "Kan e-mailadressen niet wijzigen",
+    "Unable to change mail address" : "Kan e-mailadres niet wijzigen",
     "Email saved" : "E-mail bewaard",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Weet u zeker dat u \"{domain}\" als een vertrouwd domein wilt toevoegen?",
     "Add trusted domain" : "Vertrouwd domein toevoegen",
     "Sending..." : "Versturen...",
     "All" : "Alle",
-    "Please wait...." : "Even geduld aub....",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officiële apps zijn ontwikkeld door en binnen de ownCloud community. Ze bieden functionaliteit binnen ownCloud en zijn klaar voor gebruik in een productie omgeving.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Goedgekeurde apps zijn ontwikkeld door vertrouwde ontwikkelaars en hebben een beveiligingscontrole ondergaan. Ze worden actief onderhouden in een open code repository en hun ontwikkelaars vinden ze stabiel genoeg voor informeel of normaal gebruik.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Deze app is niet gecontroleerd op beveiligingsproblemen en is nieuw of staat bekend als instabiel. Installatie is op eigen risico.",
+    "Please wait...." : "Even geduld a.u.b.",
     "Error while disabling app" : "Fout tijdens het uitzetten van het programma",
     "Disable" : "Uitschakelen",
     "Enable" : "Activeer",
@@ -74,9 +70,6 @@
     "Strong password" : "Sterk wachtwoord",
     "Valid until {date}" : "Geldig tot {date}",
     "Delete" : "Verwijder",
-    "Decrypting files... Please wait, this can take some time." : "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
-    "Delete encryption keys permanently." : "Verwijder de encryptiesleutels permanent",
-    "Restore encryption keys." : "Herstel de encryptiesleutels",
     "Groups" : "Groepen",
     "Unable to delete {objName}" : "Kan {objName} niet verwijderen",
     "Error creating group" : "Fout bij aanmaken groep",
@@ -86,7 +79,7 @@
     "no group" : "geen groep",
     "never" : "geen",
     "deleted {userName}" : "verwijderd {userName}",
-    "add group" : "toevoegen groep",
+    "add group" : "Nieuwe groep",
     "Changing the password will result in data loss, because data recovery is not available for this user" : "Wijzigen van het wachtwoord leidt tot gegevensverlies, omdat gegevensherstel voor deze gebruiker niet beschikbaar is",
     "A valid username must be provided" : "Er moet een geldige gebruikersnaam worden opgegeven",
     "Error creating user" : "Fout bij aanmaken gebruiker",
@@ -96,7 +89,6 @@
     "Sync clients" : "Sync clients",
     "Personal info" : "Persoonlijke info",
     "SSL root certificates" : "SSL root certificaten",
-    "Encryption" : "Versleuteling",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale problemen, fouten, waarschuwingen, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, waarschuwingen, fouten en fatale problemen",
     "Warnings, errors and fatal issues" : "Waarschuwingen, fouten en fatale problemen",
@@ -137,13 +129,14 @@
     "Last cron job execution: %s." : "Laatst uitgevoerde cronjob: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Laatst uitgevoerde cronjob: %s. Er lijkt iets fout gegaan.",
     "Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
+    "Open documentation" : "Open documentatie",
     "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 every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
-    "Server Side Encryption" : "Server-side versleuteling",
     "Enable Server-Side-Encryption" : "Inschakelen server-side versleuteling",
     "This is used for sending out notifications." : "Dit wordt gebruikt voor het verzenden van meldingen.",
     "Send mode" : "Verstuurmodus",
+    "Encryption" : "Versleuteling",
     "From address" : "Afzenderadres",
     "mail" : "e-mail",
     "Authentication method" : "Authenticatiemethode",
@@ -167,12 +160,14 @@
     "How to do backups" : "Hoe maak je back-ups",
     "Advanced monitoring" : "Geavanceerde monitoring",
     "Performance tuning" : "Prestatie afstelling",
-    "Improving the config.php" : "Verbeter de config.php",
+    "Improving the config.php" : "config.php verbeteren",
     "Theming" : "Thema's",
     "Hardening and security guidance" : "Hardening en security advies",
     "Version" : "Versie",
     "More apps" : "Meer applicaties",
     "Developer documentation" : "Ontwikkelaarsdocumentatie",
+    "Experimental applications ahead" : "Experimentele applicaties vooraan",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentele apps zijn niet gecontroleerd op beveiligingsproblemen, zijn nieuw of staan bekend als instabiel en worden volop ontwikkeld. Installatie kan leiden tot gegevensverlies of beveiligingsincidenten.",
     "by" : "door",
     "licensed" : "gelicenseerd",
     "Documentation:" : "Documentatie:",
@@ -184,15 +179,17 @@
     "Update to %s" : "Bijgewerkt naar %s",
     "Enable only for specific groups" : "Alleen voor bepaalde groepen activeren",
     "Uninstall App" : "De-installeren app",
+    "Enable experimental apps" : "Inschakelen experimentele apps",
     "No apps found for your version" : "Geen apps gevonden voor uw versie",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo daar,<br><br>we willen u laten weten dat u nu een %s account hebt.<br><br>Uw gebruikersnaam: %s<br>Ga naar: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Proficiat!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nwe willen u laten weten dat u nu een %s account hebt.\n\nUw gebruikersnaam: %s\nGa naar: %s\n\n",
-    "Administrator Documentation" : "Beheerdersdocumentatie",
-    "Online Documentation" : "Online documentatie",
+    "User documentation" : "Gebruikersdocumentatie",
+    "Administrator documentation" : "Beheerdersdocumentatie",
+    "Online documentation" : "Online documentatie",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Commerciële ondersteuning",
+    "Issue tracker" : "Issue tracker",
+    "Commercial support" : "Commerciële ondersteuning",
     "Get the apps to sync your files" : "Download de apps om bestanden te synchroniseren",
     "Desktop client" : "Desktop client",
     "Android app" : "Android app",
@@ -215,7 +212,7 @@
     "Profile picture" : "Profielafbeelding",
     "Upload new" : "Upload een nieuwe",
     "Select new from Files" : "Selecteer een nieuwe vanuit bestanden",
-    "Remove image" : "Verwijder afbeelding",
+    "Remove image" : "Afbeelding verwijderen",
     "Either png or jpg. Ideally square but you will be able to crop it." : "Of png, of jpg. Bij voorkeur vierkant, maar u kunt de afbeelding bijsnijden.",
     "Your avatar is provided by your original account." : "Uw avatar is verstrekt door uw originele account.",
     "Cancel" : "Annuleer",
@@ -227,12 +224,6 @@
     "Issued By" : "Uitgegeven door",
     "Valid until %s" : "Geldig tot %s",
     "Import root certificate" : "Importeren root certificaat",
-    "The encryption app is no longer enabled, please decrypt all your files" : "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten.",
-    "Log-in password" : "Inlog-wachtwoord",
-    "Decrypt all Files" : "Decodeer alle bestanden",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Uw cryptosleutels zijn verplaatst naar een backup locatie. Als iets iets verkeerd ging, kunt u de sleutels herstellen. Verwijder ze alleen permanent als u zeker weet dat de bestanden goed zijn versleuteld.",
-    "Restore Encryption Keys" : "Herstel cryptosleutels",
-    "Delete Encryption Keys" : "Verwijder cryptosleutels",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Ontwikkeld door de {communityopen}ownCloud gemeenschaplinkclose}, de {githubopen}source code{linkclose} is gelicenseerd onder de {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Toon opslaglocatie",
     "Show last log in" : "Toon laatste inlog",
diff --git a/settings/l10n/nn_NO.js b/settings/l10n/nn_NO.js
index 9daf6c4c198..9a40a2d57ec 100644
--- a/settings/l10n/nn_NO.js
+++ b/settings/l10n/nn_NO.js
@@ -31,7 +31,6 @@ OC.L10N.register(
     "Very weak password" : "Veldig svakt passord",
     "Weak password" : "Svakt passord",
     "Delete" : "Slett",
-    "Decrypting files... Please wait, this can take some time." : "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
     "Groups" : "Grupper",
     "undo" : "angra",
     "never" : "aldri",
@@ -40,13 +39,13 @@ OC.L10N.register(
     "Error creating user" : "Feil ved oppretting av brukar",
     "A valid password must be provided" : "Du må oppgje eit gyldig passord",
     "__language_name__" : "Nynorsk",
-    "Encryption" : "Kryptering",
     "Login" : "Logg inn",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
     "Allow apps to use the Share API" : "La app-ar bruka API-et til deling",
     "Allow public uploads" : "Tillat offentlege opplastingar",
     "Allow resharing" : "Tillat vidaredeling",
     "Execute one task with each page loaded" : "Utfør éi oppgåve for kvar sidelasting",
+    "Encryption" : "Kryptering",
     "Server address" : "Tenaradresse",
     "Log level" : "Log nivå",
     "More" : "Meir",
@@ -54,11 +53,7 @@ OC.L10N.register(
     "Version" : "Utgåve",
     "by" : "av",
     "User Documentation" : "Brukardokumentasjon",
-    "Administrator Documentation" : "Administratordokumentasjon",
-    "Online Documentation" : "Dokumentasjon på nett",
     "Forum" : "Forum",
-    "Bugtracker" : "Feilsporar",
-    "Commercial Support" : "Betalt brukarstøtte",
     "Get the apps to sync your files" : "Få app-ar som kan synkronisera filene dine",
     "Show First Run Wizard again" : "Vis Oppstartvegvisaren igjen",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>",
@@ -78,8 +73,6 @@ OC.L10N.register(
     "Choose as profile image" : "Vel som profilbilete",
     "Language" : "Språk",
     "Help translate" : "Hjelp oss å omsetja",
-    "Log-in password" : "Innloggingspassord",
-    "Decrypt all Files" : "Dekrypter alle filene",
     "Username" : "Brukarnamn",
     "Create" : "Lag",
     "Admin Recovery Password" : "Gjenopprettingspassord for administrator",
diff --git a/settings/l10n/nn_NO.json b/settings/l10n/nn_NO.json
index 300c18683f3..fe5c4d55395 100644
--- a/settings/l10n/nn_NO.json
+++ b/settings/l10n/nn_NO.json
@@ -29,7 +29,6 @@
     "Very weak password" : "Veldig svakt passord",
     "Weak password" : "Svakt passord",
     "Delete" : "Slett",
-    "Decrypting files... Please wait, this can take some time." : "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
     "Groups" : "Grupper",
     "undo" : "angra",
     "never" : "aldri",
@@ -38,13 +37,13 @@
     "Error creating user" : "Feil ved oppretting av brukar",
     "A valid password must be provided" : "Du må oppgje eit gyldig passord",
     "__language_name__" : "Nynorsk",
-    "Encryption" : "Kryptering",
     "Login" : "Logg inn",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
     "Allow apps to use the Share API" : "La app-ar bruka API-et til deling",
     "Allow public uploads" : "Tillat offentlege opplastingar",
     "Allow resharing" : "Tillat vidaredeling",
     "Execute one task with each page loaded" : "Utfør éi oppgåve for kvar sidelasting",
+    "Encryption" : "Kryptering",
     "Server address" : "Tenaradresse",
     "Log level" : "Log nivå",
     "More" : "Meir",
@@ -52,11 +51,7 @@
     "Version" : "Utgåve",
     "by" : "av",
     "User Documentation" : "Brukardokumentasjon",
-    "Administrator Documentation" : "Administratordokumentasjon",
-    "Online Documentation" : "Dokumentasjon på nett",
     "Forum" : "Forum",
-    "Bugtracker" : "Feilsporar",
-    "Commercial Support" : "Betalt brukarstøtte",
     "Get the apps to sync your files" : "Få app-ar som kan synkronisera filene dine",
     "Show First Run Wizard again" : "Vis Oppstartvegvisaren igjen",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>",
@@ -76,8 +71,6 @@
     "Choose as profile image" : "Vel som profilbilete",
     "Language" : "Språk",
     "Help translate" : "Hjelp oss å omsetja",
-    "Log-in password" : "Innloggingspassord",
-    "Decrypt all Files" : "Dekrypter alle filene",
     "Username" : "Brukarnamn",
     "Create" : "Lag",
     "Admin Recovery Password" : "Gjenopprettingspassord for administrator",
diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js
index ed400795989..6f484bac110 100644
--- a/settings/l10n/pl.js
+++ b/settings/l10n/pl.js
@@ -10,14 +10,7 @@ OC.L10N.register(
     "Authentication error" : "Błąd uwierzytelniania",
     "Your full name has been changed." : "Twoja pełna nazwa została zmieniona.",
     "Unable to change full name" : "Nie można zmienić pełnej nazwy",
-    "Files decrypted successfully" : "Pliki zostały poprawnie zdeszyfrowane",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nie można zdeszyfrować Twoich plików, proszę sprawdzić owncloud.log lub zapytać administratora",
-    "Couldn't decrypt your files, check your password and try again" : "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie",
-    "Encryption keys deleted permanently" : "Klucze szyfrujące zostały trwale usunięte",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora",
     "Couldn't remove app." : "Nie można usunąć aplikacji.",
-    "Backups restored successfully" : "Archiwum zostało prawidłowo przywrócone",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nie można przywrócić kluczy szyfrujących, proszę sprawdzić owncloud.log lub zapytać administratora",
     "Language changed" : "Zmieniono język",
     "Invalid request" : "Nieprawidłowe żądanie",
     "Admins can't remove themself from the admin group" : "Administratorzy nie mogą usunąć siebie samych z grupy administratorów",
@@ -31,7 +24,6 @@ OC.L10N.register(
     "Unable to change password" : "Nie można zmienić hasła",
     "Enabled" : "Włączone",
     "Not enabled" : "Nie włączone",
-    "Recommended" : "Polecane",
     "Group already exists." : "Grupa już istnieje.",
     "Unable to add group." : "Nie można dodać grupy.",
     "Unable to delete group." : "Nie można usunąć grupy.",
@@ -71,9 +63,6 @@ OC.L10N.register(
     "Strong password" : "Mocne hasło",
     "Valid until {date}" : "Ważny do {date}",
     "Delete" : "Usuń",
-    "Decrypting files... Please wait, this can take some time." : "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
-    "Delete encryption keys permanently." : "Usuń trwale klucze szyfrujące.",
-    "Restore encryption keys." : "Przywróć klucze szyfrujące.",
     "Groups" : "Grupy",
     "Unable to delete {objName}" : "Nie można usunąć {objName}",
     "Error creating group" : "Błąd podczas tworzenia grupy",
@@ -91,7 +80,6 @@ OC.L10N.register(
     "A valid email must be provided" : "Podaj poprawny adres email",
     "__language_name__" : "polski",
     "SSL root certificates" : "Główny certyfikat SSL",
-    "Encryption" : "Szyfrowanie",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Wszystko  (Informacje, ostrzeżenia, błędy i poważne problemy, debug)",
     "Info, warnings, errors and fatal issues" : "Informacje, ostrzeżenia, błędy i poważne problemy",
     "Warnings, errors and fatal issues" : "Ostrzeżenia, błędy i poważne problemy",
@@ -129,6 +117,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Użyj systemowej usługi cron do wywoływania cron.php co 15 minut.",
     "This is used for sending out notifications." : "To jest używane do wysyłania powiadomień",
     "Send mode" : "Tryb wysyłki",
+    "Encryption" : "Szyfrowanie",
     "From address" : "Z adresu",
     "mail" : "mail",
     "Authentication method" : "Metoda autentykacji",
@@ -159,11 +148,7 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Witaj,<br><br>informujemy, że teraz masz konto na %s .<br><br>Twoja nazwa użytkownika: %s<br>Dostęp pod adresem: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Pozdrawiam!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Witaj,\n\ninformujemy, że teraz masz konto na %s .\n\nTwoja nazwa użytkownika:: %s\nDostęp pod adresem: %s\n\n",
-    "Administrator Documentation" : "Dokumentacja administratora",
-    "Online Documentation" : "Dokumentacja online",
     "Forum" : "Forum",
-    "Bugtracker" : "Zgłaszanie błędów",
-    "Commercial Support" : "Wsparcie komercyjne",
     "Get the apps to sync your files" : "Pobierz aplikacje żeby synchronizować swoje pliki",
     "Desktop client" : "Klient na komputer",
     "Android app" : "Aplikacja Android",
@@ -194,12 +179,6 @@ OC.L10N.register(
     "Valid until" : "Ważny do",
     "Issued By" : "Wydany przez",
     "Valid until %s" : "Ważny do %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik",
-    "Log-in password" : "Hasło logowania",
-    "Decrypt all Files" : "Odszyfruj wszystkie pliki",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Twoje klucze szyfrujące zostały przeniesione do lokalizacji archialnej. Jeśli coś poszło nie tak, możesz je przywrócić. Usuń je trwale tylko, gdy jesteś pewien(na), że wszystkie pliki zostały prawidłowo zdeszyfrowane.",
-    "Restore Encryption Keys" : "Przywróć klucze szyfrujące",
-    "Delete Encryption Keys" : "Usuń klucze szyfrujące",
     "Show storage location" : "Pokaż miejsce przechowywania",
     "Show last log in" : "Pokaż ostatni login",
     "Send email to new user" : "Wyślij email do nowego użytkownika",
diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json
index 1cecf623463..7671b69af61 100644
--- a/settings/l10n/pl.json
+++ b/settings/l10n/pl.json
@@ -8,14 +8,7 @@
     "Authentication error" : "Błąd uwierzytelniania",
     "Your full name has been changed." : "Twoja pełna nazwa została zmieniona.",
     "Unable to change full name" : "Nie można zmienić pełnej nazwy",
-    "Files decrypted successfully" : "Pliki zostały poprawnie zdeszyfrowane",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nie można zdeszyfrować Twoich plików, proszę sprawdzić owncloud.log lub zapytać administratora",
-    "Couldn't decrypt your files, check your password and try again" : "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie",
-    "Encryption keys deleted permanently" : "Klucze szyfrujące zostały trwale usunięte",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora",
     "Couldn't remove app." : "Nie można usunąć aplikacji.",
-    "Backups restored successfully" : "Archiwum zostało prawidłowo przywrócone",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nie można przywrócić kluczy szyfrujących, proszę sprawdzić owncloud.log lub zapytać administratora",
     "Language changed" : "Zmieniono język",
     "Invalid request" : "Nieprawidłowe żądanie",
     "Admins can't remove themself from the admin group" : "Administratorzy nie mogą usunąć siebie samych z grupy administratorów",
@@ -29,7 +22,6 @@
     "Unable to change password" : "Nie można zmienić hasła",
     "Enabled" : "Włączone",
     "Not enabled" : "Nie włączone",
-    "Recommended" : "Polecane",
     "Group already exists." : "Grupa już istnieje.",
     "Unable to add group." : "Nie można dodać grupy.",
     "Unable to delete group." : "Nie można usunąć grupy.",
@@ -69,9 +61,6 @@
     "Strong password" : "Mocne hasło",
     "Valid until {date}" : "Ważny do {date}",
     "Delete" : "Usuń",
-    "Decrypting files... Please wait, this can take some time." : "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
-    "Delete encryption keys permanently." : "Usuń trwale klucze szyfrujące.",
-    "Restore encryption keys." : "Przywróć klucze szyfrujące.",
     "Groups" : "Grupy",
     "Unable to delete {objName}" : "Nie można usunąć {objName}",
     "Error creating group" : "Błąd podczas tworzenia grupy",
@@ -89,7 +78,6 @@
     "A valid email must be provided" : "Podaj poprawny adres email",
     "__language_name__" : "polski",
     "SSL root certificates" : "Główny certyfikat SSL",
-    "Encryption" : "Szyfrowanie",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Wszystko  (Informacje, ostrzeżenia, błędy i poważne problemy, debug)",
     "Info, warnings, errors and fatal issues" : "Informacje, ostrzeżenia, błędy i poważne problemy",
     "Warnings, errors and fatal issues" : "Ostrzeżenia, błędy i poważne problemy",
@@ -127,6 +115,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Użyj systemowej usługi cron do wywoływania cron.php co 15 minut.",
     "This is used for sending out notifications." : "To jest używane do wysyłania powiadomień",
     "Send mode" : "Tryb wysyłki",
+    "Encryption" : "Szyfrowanie",
     "From address" : "Z adresu",
     "mail" : "mail",
     "Authentication method" : "Metoda autentykacji",
@@ -157,11 +146,7 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Witaj,<br><br>informujemy, że teraz masz konto na %s .<br><br>Twoja nazwa użytkownika: %s<br>Dostęp pod adresem: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Pozdrawiam!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Witaj,\n\ninformujemy, że teraz masz konto na %s .\n\nTwoja nazwa użytkownika:: %s\nDostęp pod adresem: %s\n\n",
-    "Administrator Documentation" : "Dokumentacja administratora",
-    "Online Documentation" : "Dokumentacja online",
     "Forum" : "Forum",
-    "Bugtracker" : "Zgłaszanie błędów",
-    "Commercial Support" : "Wsparcie komercyjne",
     "Get the apps to sync your files" : "Pobierz aplikacje żeby synchronizować swoje pliki",
     "Desktop client" : "Klient na komputer",
     "Android app" : "Aplikacja Android",
@@ -192,12 +177,6 @@
     "Valid until" : "Ważny do",
     "Issued By" : "Wydany przez",
     "Valid until %s" : "Ważny do %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik",
-    "Log-in password" : "Hasło logowania",
-    "Decrypt all Files" : "Odszyfruj wszystkie pliki",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Twoje klucze szyfrujące zostały przeniesione do lokalizacji archialnej. Jeśli coś poszło nie tak, możesz je przywrócić. Usuń je trwale tylko, gdy jesteś pewien(na), że wszystkie pliki zostały prawidłowo zdeszyfrowane.",
-    "Restore Encryption Keys" : "Przywróć klucze szyfrujące",
-    "Delete Encryption Keys" : "Usuń klucze szyfrujące",
     "Show storage location" : "Pokaż miejsce przechowywania",
     "Show last log in" : "Pokaż ostatni login",
     "Send email to new user" : "Wyślij email do nowego użytkownika",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 83ae60a11b0..20e1697930a 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Segurança & avisos de configuração",
     "Sharing" : "Compartilhamento",
     "External Storage" : "Armazenamento Externo",
+    "Server Side Encryption" : "Criptografia do Lado do Servidor",
     "Cron" : "Cron",
     "Email Server" : "Servidor de Email",
     "Log" : "Registro",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Erro de autenticação",
     "Your full name has been changed." : "Seu nome completo foi alterado.",
     "Unable to change full name" : "Não é possível alterar o nome completo",
-    "Files decrypted successfully" : "Arquivos descriptografados com sucesso",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível descriptografar os arquivos, verifique a sua owncloud.log ou pergunte ao seu administrador",
-    "Couldn't decrypt your files, check your password and try again" : "Não foi possível descriptografar os arquivos, verifique sua senha e tente novamente",
-    "Encryption keys deleted permanently" : "Chaves de criptografia excluídas permanentemente",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente suas chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
     "Couldn't remove app." : "Não foi possível remover aplicativos.",
-    "Backups restored successfully" : "Backup restaurado com sucesso",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível salvar as chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
     "Language changed" : "Idioma alterado",
     "Invalid request" : "Pedido inválido",
     "Admins can't remove themself from the admin group" : "Administradores não pode remover a si mesmos do grupo de administração",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Impossível modificar senha",
     "Enabled" : "Habilitado",
     "Not enabled" : "Desabilitado",
-    "Recommended" : "Recomendado",
     "Group already exists." : "O Grupo já existe.",
     "Unable to add group." : "Não é possível adicionar grupo.",
     "Unable to delete group." : "Não é possível excluir grupo.",
@@ -57,6 +50,9 @@ OC.L10N.register(
     "Add trusted domain" : "Adicionar domínio confiável",
     "Sending..." : "Enviando...",
     "All" : "Todos",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplicativos oficiais são desenvolvidos por e dentro da comunidade ownCloud. Eles oferecem funcionalidade central para ownCloud e estão prontos para uso em produção.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplicativos aprovados são desenvolvidos pelos desenvolvedores confiáveis e passaram por uma verificação de segurança superficial. Eles são ativamente mantidos em um repositório de código aberto e seus mantenedores consideram que eles para sejam estáveis para um casual uso normal.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Este aplicativo não está marcado por questões de segurança e é novo ou conhecido por ser instável. Instale por seu próprio risco.",
     "Please wait...." : "Por favor, aguarde...",
     "Error while disabling app" : "Erro enquanto desabilitava o aplicativo",
     "Disable" : "Desabilitar",
@@ -76,9 +72,6 @@ OC.L10N.register(
     "Strong password" : "Senha forte",
     "Valid until {date}" : "Vádido até {date}",
     "Delete" : "Excluir",
-    "Decrypting files... Please wait, this can take some time." : "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
-    "Delete encryption keys permanently." : "Eliminando a chave de criptografia permanentemente.",
-    "Restore encryption keys." : "Restaurar chave de criptografia.",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "Não é possível excluir {objName}",
     "Error creating group" : "Erro ao criar grupo",
@@ -98,7 +91,6 @@ OC.L10N.register(
     "Sync clients" : "Clientes de Sincronização",
     "Personal info" : "Informação pessoal",
     "SSL root certificates" : "Certificados SSL raíz",
-    "Encryption" : "Criptografia",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (questões fatais, erros, avisos, informações, depuração)",
     "Info, warnings, errors and fatal issues" : "Informações, avisos, erros e problemas fatais",
     "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
@@ -139,13 +131,14 @@ OC.L10N.register(
     "Last cron job execution: %s." : "Última execução do trabalho cron: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Última execução do trabalho cron: %s. Algo parece errado.",
     "Cron was not executed yet!" : "Cron não foi executado ainda!",
+    "Open documentation" : "Abrir documentação",
     "Execute one task with each page loaded" : "Execute uma tarefa com cada página carregada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
-    "Server Side Encryption" : "Criptografia do Lado do Servidor",
     "Enable Server-Side-Encryption" : "Habilitar a Criptografia do Lado do Servidor",
     "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
     "Send mode" : "Modo enviar",
+    "Encryption" : "Criptografia",
     "From address" : "Do Endereço",
     "mail" : "email",
     "Authentication method" : "Método de autenticação",
@@ -175,6 +168,8 @@ OC.L10N.register(
     "Version" : "Versão",
     "More apps" : "Mais aplicativos",
     "Developer documentation" : "Documentação do desenvolvedor",
+    "Experimental applications ahead" : "Aplicações experimentais à frente",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Aplicativos experimentais não são marcados por questões de segurança, por serem novos ou conhecidos como instáveis e sob forte desenvolvimento. Instalá-los pode causar perda de dados ou falhas de segurança.",
     "by" : "por",
     "licensed" : "licenciado",
     "Documentation:" : "Documentação:",
@@ -186,15 +181,17 @@ OC.L10N.register(
     "Update to %s" : "Atualizado para %s",
     "Enable only for specific groups" : "Ativar apenas para grupos específicos",
     "Uninstall App" : "Desinstalar Aplicativo",
+    "Enable experimental apps" : "Habilitar aplicativos experimentais",
     "No apps found for your version" : "Nenhum aplicativo encontrados para a sua versão",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Olá,<br><br>somente para lembrar que agora você tem uma conta %s.<br><br>Seu nome de usuário é: %s<br>Acesse em: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Saúde!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Olá,\n\nsomente para lembrar que agora você tem uma conta %s.\n\nSeu nome de usuário é: %s\nAcesse em: %s\n\n",
-    "Administrator Documentation" : "Documentação de Administrador",
-    "Online Documentation" : "Documentação Online",
+    "User documentation" : "Documentação do usuário",
+    "Administrator documentation" : "Documentação do administrador",
+    "Online documentation" : "Documentação online",
     "Forum" : "Fórum",
-    "Bugtracker" : "Rastreador de Bugs",
-    "Commercial Support" : "Suporte Comercial",
+    "Issue tracker" : "Rastreador de tópicos",
+    "Commercial support" : "Suporte comercial",
     "Get the apps to sync your files" : "Faça com que os apps sincronizem seus arquivos",
     "Desktop client" : "Cliente Desktop",
     "Android app" : "App Android",
@@ -229,12 +226,6 @@ OC.L10N.register(
     "Issued By" : "Emitido Por",
     "Valid until %s" : "Válido até %s",
     "Import root certificate" : "Importar certificado raiz",
-    "The encryption app is no longer enabled, please decrypt all your files" : "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos",
-    "Log-in password" : "Senha de login",
-    "Decrypt all Files" : "Descriptografar todos os Arquivos",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluí-las permanentemente se você tiver certeza de que  todos os arquivos forão descriptografados corretamente.",
-    "Restore Encryption Keys" : "Restaurar Chaves de Criptografia",
-    "Delete Encryption Keys" : "Eliminar Chaves de Criptografia",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido {communityopen}pela comunidade ownCloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado sob a {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostrar localização de armazenamento",
     "Show last log in" : "Mostrar o último acesso",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 1ed0fd995a7..d76516f2ac0 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Segurança & avisos de configuração",
     "Sharing" : "Compartilhamento",
     "External Storage" : "Armazenamento Externo",
+    "Server Side Encryption" : "Criptografia do Lado do Servidor",
     "Cron" : "Cron",
     "Email Server" : "Servidor de Email",
     "Log" : "Registro",
@@ -10,14 +11,7 @@
     "Authentication error" : "Erro de autenticação",
     "Your full name has been changed." : "Seu nome completo foi alterado.",
     "Unable to change full name" : "Não é possível alterar o nome completo",
-    "Files decrypted successfully" : "Arquivos descriptografados com sucesso",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível descriptografar os arquivos, verifique a sua owncloud.log ou pergunte ao seu administrador",
-    "Couldn't decrypt your files, check your password and try again" : "Não foi possível descriptografar os arquivos, verifique sua senha e tente novamente",
-    "Encryption keys deleted permanently" : "Chaves de criptografia excluídas permanentemente",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente suas chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
     "Couldn't remove app." : "Não foi possível remover aplicativos.",
-    "Backups restored successfully" : "Backup restaurado com sucesso",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível salvar as chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
     "Language changed" : "Idioma alterado",
     "Invalid request" : "Pedido inválido",
     "Admins can't remove themself from the admin group" : "Administradores não pode remover a si mesmos do grupo de administração",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Impossível modificar senha",
     "Enabled" : "Habilitado",
     "Not enabled" : "Desabilitado",
-    "Recommended" : "Recomendado",
     "Group already exists." : "O Grupo já existe.",
     "Unable to add group." : "Não é possível adicionar grupo.",
     "Unable to delete group." : "Não é possível excluir grupo.",
@@ -55,6 +48,9 @@
     "Add trusted domain" : "Adicionar domínio confiável",
     "Sending..." : "Enviando...",
     "All" : "Todos",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplicativos oficiais são desenvolvidos por e dentro da comunidade ownCloud. Eles oferecem funcionalidade central para ownCloud e estão prontos para uso em produção.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplicativos aprovados são desenvolvidos pelos desenvolvedores confiáveis e passaram por uma verificação de segurança superficial. Eles são ativamente mantidos em um repositório de código aberto e seus mantenedores consideram que eles para sejam estáveis para um casual uso normal.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Este aplicativo não está marcado por questões de segurança e é novo ou conhecido por ser instável. Instale por seu próprio risco.",
     "Please wait...." : "Por favor, aguarde...",
     "Error while disabling app" : "Erro enquanto desabilitava o aplicativo",
     "Disable" : "Desabilitar",
@@ -74,9 +70,6 @@
     "Strong password" : "Senha forte",
     "Valid until {date}" : "Vádido até {date}",
     "Delete" : "Excluir",
-    "Decrypting files... Please wait, this can take some time." : "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
-    "Delete encryption keys permanently." : "Eliminando a chave de criptografia permanentemente.",
-    "Restore encryption keys." : "Restaurar chave de criptografia.",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "Não é possível excluir {objName}",
     "Error creating group" : "Erro ao criar grupo",
@@ -96,7 +89,6 @@
     "Sync clients" : "Clientes de Sincronização",
     "Personal info" : "Informação pessoal",
     "SSL root certificates" : "Certificados SSL raíz",
-    "Encryption" : "Criptografia",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (questões fatais, erros, avisos, informações, depuração)",
     "Info, warnings, errors and fatal issues" : "Informações, avisos, erros e problemas fatais",
     "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
@@ -137,13 +129,14 @@
     "Last cron job execution: %s." : "Última execução do trabalho cron: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Última execução do trabalho cron: %s. Algo parece errado.",
     "Cron was not executed yet!" : "Cron não foi executado ainda!",
+    "Open documentation" : "Abrir documentação",
     "Execute one task with each page loaded" : "Execute uma tarefa com cada página carregada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
-    "Server Side Encryption" : "Criptografia do Lado do Servidor",
     "Enable Server-Side-Encryption" : "Habilitar a Criptografia do Lado do Servidor",
     "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
     "Send mode" : "Modo enviar",
+    "Encryption" : "Criptografia",
     "From address" : "Do Endereço",
     "mail" : "email",
     "Authentication method" : "Método de autenticação",
@@ -173,6 +166,8 @@
     "Version" : "Versão",
     "More apps" : "Mais aplicativos",
     "Developer documentation" : "Documentação do desenvolvedor",
+    "Experimental applications ahead" : "Aplicações experimentais à frente",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Aplicativos experimentais não são marcados por questões de segurança, por serem novos ou conhecidos como instáveis e sob forte desenvolvimento. Instalá-los pode causar perda de dados ou falhas de segurança.",
     "by" : "por",
     "licensed" : "licenciado",
     "Documentation:" : "Documentação:",
@@ -184,15 +179,17 @@
     "Update to %s" : "Atualizado para %s",
     "Enable only for specific groups" : "Ativar apenas para grupos específicos",
     "Uninstall App" : "Desinstalar Aplicativo",
+    "Enable experimental apps" : "Habilitar aplicativos experimentais",
     "No apps found for your version" : "Nenhum aplicativo encontrados para a sua versão",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Olá,<br><br>somente para lembrar que agora você tem uma conta %s.<br><br>Seu nome de usuário é: %s<br>Acesse em: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Saúde!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Olá,\n\nsomente para lembrar que agora você tem uma conta %s.\n\nSeu nome de usuário é: %s\nAcesse em: %s\n\n",
-    "Administrator Documentation" : "Documentação de Administrador",
-    "Online Documentation" : "Documentação Online",
+    "User documentation" : "Documentação do usuário",
+    "Administrator documentation" : "Documentação do administrador",
+    "Online documentation" : "Documentação online",
     "Forum" : "Fórum",
-    "Bugtracker" : "Rastreador de Bugs",
-    "Commercial Support" : "Suporte Comercial",
+    "Issue tracker" : "Rastreador de tópicos",
+    "Commercial support" : "Suporte comercial",
     "Get the apps to sync your files" : "Faça com que os apps sincronizem seus arquivos",
     "Desktop client" : "Cliente Desktop",
     "Android app" : "App Android",
@@ -227,12 +224,6 @@
     "Issued By" : "Emitido Por",
     "Valid until %s" : "Válido até %s",
     "Import root certificate" : "Importar certificado raiz",
-    "The encryption app is no longer enabled, please decrypt all your files" : "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos",
-    "Log-in password" : "Senha de login",
-    "Decrypt all Files" : "Descriptografar todos os Arquivos",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluí-las permanentemente se você tiver certeza de que  todos os arquivos forão descriptografados corretamente.",
-    "Restore Encryption Keys" : "Restaurar Chaves de Criptografia",
-    "Delete Encryption Keys" : "Eliminar Chaves de Criptografia",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido {communityopen}pela comunidade ownCloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado sob a {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostrar localização de armazenamento",
     "Show last log in" : "Mostrar o último acesso",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index f5fe176439f..73563e8b35d 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Avisos de configuração e segurança",
     "Sharing" : "Partilha",
     "External Storage" : "Armazenamento Externo",
+    "Server Side Encryption" : "Encriptação do lado do Servidor",
     "Cron" : "Cron",
     "Email Server" : "Servidor de e-mail",
     "Log" : "Registo",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Erro na autenticação",
     "Your full name has been changed." : "O seu nome completo foi alterado.",
     "Unable to change full name" : "Não foi possível alterar o seu nome completo",
-    "Files decrypted successfully" : "Ficheiros desencriptados com sucesso",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador",
-    "Couldn't decrypt your files, check your password and try again" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua palavra-passe e tente novamente",
-    "Encryption keys deleted permanently" : "As chaves de encriptação foram eliminadas para sempre",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível apagar as suas chaves de encriptação. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Couldn't remove app." : "Não foi possível remover a aplicação.",
-    "Backups restored successfully" : "Cópias de segurança restauradas com sucesso",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possivel restaurar as suas chaves de encriptacao. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Language changed" : "Idioma alterado",
     "Invalid request" : "Pedido Inválido",
     "Admins can't remove themself from the admin group" : "Os administradores não se podem remover a eles próprios do grupo 'admin'.",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Não foi possível alterar a sua palavra-passe ",
     "Enabled" : "Ativada",
     "Not enabled" : "Desativada",
-    "Recommended" : "Recomendado",
     "Group already exists." : "O grupo já existe.",
     "Unable to add group." : "Impossível acrescentar o grupo.",
     "Unable to delete group." : "Impossível apagar grupo.",
@@ -76,9 +69,6 @@ OC.L10N.register(
     "Strong password" : "Palavra-passe forte",
     "Valid until {date}" : "Válida até {date}",
     "Delete" : "Apagar",
-    "Decrypting files... Please wait, this can take some time." : "A descodificar os ficheiros... Por favor, aguarde, esta operação pode demorar algum tempo.",
-    "Delete encryption keys permanently." : "Apagar as chaves encriptadas para sempre.",
-    "Restore encryption keys." : "Restaurar as chaves encriptadas.",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "Não é possível apagar {objNome}",
     "Error creating group" : "Ocorreu um erro ao criar o grupo",
@@ -98,7 +88,6 @@ OC.L10N.register(
     "Sync clients" : "Clientes de sync",
     "Personal info" : "Informação pessoal",
     "SSL root certificates" : "Certificados de raiz SSL",
-    "Encryption" : "Encriptação",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (problemas fatais, erros, avisos, informação, depuração)",
     "Info, warnings, errors and fatal issues" : "Informação, avisos, erros e problemas fatais",
     "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
@@ -142,10 +131,10 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
-    "Server Side Encryption" : "Encriptação do lado do Servidor",
     "Enable Server-Side-Encryption" : "Ativar encriptação do lado do servidor",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
     "Send mode" : "Modo de Envio",
+    "Encryption" : "Encriptação",
     "From address" : "Do endereço",
     "mail" : "Correio",
     "Authentication method" : "Método de Autenticação",
@@ -190,11 +179,11 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Olá,<br><br>apenas para informar que você tem uma conta %s.<br><br>O seu nome de utilizador: %s<br>Acesse à sua conta: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Parabéns!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Olá,\n\napenas para informar que você tem uma conta %s.\n\nO seu nome de utilizador: %s\nAcesse à sua conta: %s\n\n",
-    "Administrator Documentation" : "Documentação de Administrador",
-    "Online Documentation" : "Documentação Online",
+    "User documentation" : "Documentação de Utilizador",
+    "Administrator documentation" : "Documentação de Administrador.",
+    "Online documentation" : "Documentação Online",
     "Forum" : "Fórum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Suporte Comercial",
+    "Commercial support" : "Suporte Comercial",
     "Get the apps to sync your files" : "Obtenha as aplicações para sincronizar os seus ficheiros",
     "Desktop client" : "Cliente Desktop",
     "Android app" : "Aplicação Android",
@@ -229,12 +218,6 @@ OC.L10N.register(
     "Issued By" : "Emitido Por",
     "Valid until %s" : "Válido até %s",
     "Import root certificate" : "Importar certificado root",
-    "The encryption app is no longer enabled, please decrypt all your files" : "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros",
-    "Log-in password" : "Palavra-passe de Iniciar a Sessão",
-    "Decrypt all Files" : "Desencriptar todos os ficheiros",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves.  Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente.",
-    "Restore Encryption Keys" : "Restaurar as chaves de encriptação",
-    "Delete Encryption Keys" : "Apagar as chaves de encriptação",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido pela {communityopen}comunidade ownCloud{linkclose}, o {githubopen}código-fonte{linkclose} está licenciado sob a {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostrar a localização do armazenamento",
     "Show last log in" : "Mostrar ultimo acesso de entrada",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index 57bb52e1c02..438de6006f0 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Avisos de configuração e segurança",
     "Sharing" : "Partilha",
     "External Storage" : "Armazenamento Externo",
+    "Server Side Encryption" : "Encriptação do lado do Servidor",
     "Cron" : "Cron",
     "Email Server" : "Servidor de e-mail",
     "Log" : "Registo",
@@ -10,14 +11,7 @@
     "Authentication error" : "Erro na autenticação",
     "Your full name has been changed." : "O seu nome completo foi alterado.",
     "Unable to change full name" : "Não foi possível alterar o seu nome completo",
-    "Files decrypted successfully" : "Ficheiros desencriptados com sucesso",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador",
-    "Couldn't decrypt your files, check your password and try again" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua palavra-passe e tente novamente",
-    "Encryption keys deleted permanently" : "As chaves de encriptação foram eliminadas para sempre",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível apagar as suas chaves de encriptação. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Couldn't remove app." : "Não foi possível remover a aplicação.",
-    "Backups restored successfully" : "Cópias de segurança restauradas com sucesso",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possivel restaurar as suas chaves de encriptacao. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Language changed" : "Idioma alterado",
     "Invalid request" : "Pedido Inválido",
     "Admins can't remove themself from the admin group" : "Os administradores não se podem remover a eles próprios do grupo 'admin'.",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Não foi possível alterar a sua palavra-passe ",
     "Enabled" : "Ativada",
     "Not enabled" : "Desativada",
-    "Recommended" : "Recomendado",
     "Group already exists." : "O grupo já existe.",
     "Unable to add group." : "Impossível acrescentar o grupo.",
     "Unable to delete group." : "Impossível apagar grupo.",
@@ -74,9 +67,6 @@
     "Strong password" : "Palavra-passe forte",
     "Valid until {date}" : "Válida até {date}",
     "Delete" : "Apagar",
-    "Decrypting files... Please wait, this can take some time." : "A descodificar os ficheiros... Por favor, aguarde, esta operação pode demorar algum tempo.",
-    "Delete encryption keys permanently." : "Apagar as chaves encriptadas para sempre.",
-    "Restore encryption keys." : "Restaurar as chaves encriptadas.",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "Não é possível apagar {objNome}",
     "Error creating group" : "Ocorreu um erro ao criar o grupo",
@@ -96,7 +86,6 @@
     "Sync clients" : "Clientes de sync",
     "Personal info" : "Informação pessoal",
     "SSL root certificates" : "Certificados de raiz SSL",
-    "Encryption" : "Encriptação",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (problemas fatais, erros, avisos, informação, depuração)",
     "Info, warnings, errors and fatal issues" : "Informação, avisos, erros e problemas fatais",
     "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
@@ -140,10 +129,10 @@
     "Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
-    "Server Side Encryption" : "Encriptação do lado do Servidor",
     "Enable Server-Side-Encryption" : "Ativar encriptação do lado do servidor",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
     "Send mode" : "Modo de Envio",
+    "Encryption" : "Encriptação",
     "From address" : "Do endereço",
     "mail" : "Correio",
     "Authentication method" : "Método de Autenticação",
@@ -188,11 +177,11 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Olá,<br><br>apenas para informar que você tem uma conta %s.<br><br>O seu nome de utilizador: %s<br>Acesse à sua conta: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Parabéns!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Olá,\n\napenas para informar que você tem uma conta %s.\n\nO seu nome de utilizador: %s\nAcesse à sua conta: %s\n\n",
-    "Administrator Documentation" : "Documentação de Administrador",
-    "Online Documentation" : "Documentação Online",
+    "User documentation" : "Documentação de Utilizador",
+    "Administrator documentation" : "Documentação de Administrador.",
+    "Online documentation" : "Documentação Online",
     "Forum" : "Fórum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Suporte Comercial",
+    "Commercial support" : "Suporte Comercial",
     "Get the apps to sync your files" : "Obtenha as aplicações para sincronizar os seus ficheiros",
     "Desktop client" : "Cliente Desktop",
     "Android app" : "Aplicação Android",
@@ -227,12 +216,6 @@
     "Issued By" : "Emitido Por",
     "Valid until %s" : "Válido até %s",
     "Import root certificate" : "Importar certificado root",
-    "The encryption app is no longer enabled, please decrypt all your files" : "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros",
-    "Log-in password" : "Palavra-passe de Iniciar a Sessão",
-    "Decrypt all Files" : "Desencriptar todos os ficheiros",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves.  Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente.",
-    "Restore Encryption Keys" : "Restaurar as chaves de encriptação",
-    "Delete Encryption Keys" : "Apagar as chaves de encriptação",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Desenvolvido pela {communityopen}comunidade ownCloud{linkclose}, o {githubopen}código-fonte{linkclose} está licenciado sob a {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostrar a localização do armazenamento",
     "Show last log in" : "Mostrar ultimo acesso de entrada",
diff --git a/settings/l10n/ro.js b/settings/l10n/ro.js
index 7204b70ef5b..8b7f63c7197 100644
--- a/settings/l10n/ro.js
+++ b/settings/l10n/ro.js
@@ -8,10 +8,6 @@ OC.L10N.register(
     "Authentication error" : "Eroare la autentificare",
     "Your full name has been changed." : "Numele tău complet a fost schimbat.",
     "Unable to change full name" : "Nu s-a puput schimba numele complet",
-    "Files decrypted successfully" : "Fișierele au fost decriptate cu succes",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nu s-a puput decripta fișierele tale, verifică owncloud.log sau întreabă administratorul",
-    "Couldn't decrypt your files, check your password and try again" : "Nu s-a puput decripta fișierele tale, verifică parola și  încearcă din nou",
-    "Backups restored successfully" : "Copiile de rezervă au fost restaurate cu succes",
     "Language changed" : "Limba a fost schimbată",
     "Invalid request" : "Cerere eronată",
     "Admins can't remove themself from the admin group" : "Administratorii nu se pot șterge singuri din grupul admin",
@@ -22,7 +18,6 @@ OC.L10N.register(
     "No user supplied" : "Nici un utilizator furnizat",
     "Unable to change password" : "Imposibil de schimbat parola",
     "Enabled" : "Activat",
-    "Recommended" : "Recomandat",
     "Group already exists." : "Grupul deja exista.",
     "Unable to add group." : "Nu se poate adăuga grupul.",
     "Unable to delete group." : "Nu se poate sterge grupul.",
@@ -49,7 +44,6 @@ OC.L10N.register(
     "Good password" : "Parolă bună",
     "Strong password" : "Parolă puternică",
     "Delete" : "Șterge",
-    "Decrypting files... Please wait, this can take some time." : "Decriptare fișiere... Te rog așteaptă, poate dura ceva timp.",
     "Groups" : "Grupuri",
     "undo" : "Anulează ultima acțiune",
     "never" : "niciodată",
@@ -59,7 +53,6 @@ OC.L10N.register(
     "A valid password must be provided" : "Trebuie să furnizaţi o parolă validă",
     "__language_name__" : "_language_name_",
     "SSL root certificates" : "Certificate SSL root",
-    "Encryption" : "Încriptare",
     "None" : "Niciuna",
     "Login" : "Autentificare",
     "SSL" : "SSL",
@@ -71,6 +64,7 @@ OC.L10N.register(
     "Allow resharing" : "Permite repartajarea",
     "Execute one task with each page loaded" : "Execută o sarcină la fiecare pagină încărcată",
     "Send mode" : "Modul de expediere",
+    "Encryption" : "Încriptare",
     "Authentication method" : "Modul de autentificare",
     "Authentication required" : "Autentificare necesară",
     "Server address" : "Adresa server-ului",
@@ -85,11 +79,7 @@ OC.L10N.register(
     "Version" : "Versiunea",
     "by" : "după",
     "User Documentation" : "Documentație utilizator",
-    "Administrator Documentation" : "Documentație administrator",
-    "Online Documentation" : "Documentație online",
     "Forum" : "Forum",
-    "Bugtracker" : "Urmărire bug-uri",
-    "Commercial Support" : "Suport comercial",
     "Get the apps to sync your files" : "Ia acum aplicatia pentru sincronizarea fisierelor ",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
     "Password" : "Parolă",
@@ -108,8 +98,6 @@ OC.L10N.register(
     "Choose as profile image" : "Alege drept imagine de profil",
     "Language" : "Limba",
     "Help translate" : "Ajută la traducere",
-    "Log-in password" : "Parolă",
-    "Decrypt all Files" : "Decriptează toate fișierele",
     "Username" : "Nume utilizator",
     "Create" : "Crează",
     "Admin Recovery Password" : "Parolă de recuperare a Administratorului",
diff --git a/settings/l10n/ro.json b/settings/l10n/ro.json
index 118f67f929c..cdbe2ed734a 100644
--- a/settings/l10n/ro.json
+++ b/settings/l10n/ro.json
@@ -6,10 +6,6 @@
     "Authentication error" : "Eroare la autentificare",
     "Your full name has been changed." : "Numele tău complet a fost schimbat.",
     "Unable to change full name" : "Nu s-a puput schimba numele complet",
-    "Files decrypted successfully" : "Fișierele au fost decriptate cu succes",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nu s-a puput decripta fișierele tale, verifică owncloud.log sau întreabă administratorul",
-    "Couldn't decrypt your files, check your password and try again" : "Nu s-a puput decripta fișierele tale, verifică parola și  încearcă din nou",
-    "Backups restored successfully" : "Copiile de rezervă au fost restaurate cu succes",
     "Language changed" : "Limba a fost schimbată",
     "Invalid request" : "Cerere eronată",
     "Admins can't remove themself from the admin group" : "Administratorii nu se pot șterge singuri din grupul admin",
@@ -20,7 +16,6 @@
     "No user supplied" : "Nici un utilizator furnizat",
     "Unable to change password" : "Imposibil de schimbat parola",
     "Enabled" : "Activat",
-    "Recommended" : "Recomandat",
     "Group already exists." : "Grupul deja exista.",
     "Unable to add group." : "Nu se poate adăuga grupul.",
     "Unable to delete group." : "Nu se poate sterge grupul.",
@@ -47,7 +42,6 @@
     "Good password" : "Parolă bună",
     "Strong password" : "Parolă puternică",
     "Delete" : "Șterge",
-    "Decrypting files... Please wait, this can take some time." : "Decriptare fișiere... Te rog așteaptă, poate dura ceva timp.",
     "Groups" : "Grupuri",
     "undo" : "Anulează ultima acțiune",
     "never" : "niciodată",
@@ -57,7 +51,6 @@
     "A valid password must be provided" : "Trebuie să furnizaţi o parolă validă",
     "__language_name__" : "_language_name_",
     "SSL root certificates" : "Certificate SSL root",
-    "Encryption" : "Încriptare",
     "None" : "Niciuna",
     "Login" : "Autentificare",
     "SSL" : "SSL",
@@ -69,6 +62,7 @@
     "Allow resharing" : "Permite repartajarea",
     "Execute one task with each page loaded" : "Execută o sarcină la fiecare pagină încărcată",
     "Send mode" : "Modul de expediere",
+    "Encryption" : "Încriptare",
     "Authentication method" : "Modul de autentificare",
     "Authentication required" : "Autentificare necesară",
     "Server address" : "Adresa server-ului",
@@ -83,11 +77,7 @@
     "Version" : "Versiunea",
     "by" : "după",
     "User Documentation" : "Documentație utilizator",
-    "Administrator Documentation" : "Documentație administrator",
-    "Online Documentation" : "Documentație online",
     "Forum" : "Forum",
-    "Bugtracker" : "Urmărire bug-uri",
-    "Commercial Support" : "Suport comercial",
     "Get the apps to sync your files" : "Ia acum aplicatia pentru sincronizarea fisierelor ",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
     "Password" : "Parolă",
@@ -106,8 +96,6 @@
     "Choose as profile image" : "Alege drept imagine de profil",
     "Language" : "Limba",
     "Help translate" : "Ajută la traducere",
-    "Log-in password" : "Parolă",
-    "Decrypt all Files" : "Decriptează toate fișierele",
     "Username" : "Nume utilizator",
     "Create" : "Crează",
     "Admin Recovery Password" : "Parolă de recuperare a Administratorului",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 4e7144879c9..6ee0f04e2b3 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Предупреждения безопасности и установки",
     "Sharing" : "Общий доступ",
     "External Storage" : "Внешнее хранилище",
+    "Server Side Encryption" : "Шифрование на стороне сервера",
     "Cron" : "Cron (планировщик задач)",
     "Email Server" : "Почтовый сервер",
     "Log" : "Журнал",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Ошибка аутентификации",
     "Your full name has been changed." : "Ваше полное имя было изменено.",
     "Unable to change full name" : "Невозможно изменить полное имя",
-    "Files decrypted successfully" : "Расшифровка файлов прошло успешно",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Не удалось расшифровать ваши файлы, проверьте файл owncloud.log или обратитесь к вашему администратору.",
-    "Couldn't decrypt your files, check your password and try again" : "Ошибка при расшифровке файлов. Проверьте пароль и повторите попытку",
-    "Encryption keys deleted permanently" : "Ключи шифрования перманентно удалены",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Не удалось удалить ваши ключи шифрования, проверьте файл owncloud.log или обратитесь к вашему администратору",
     "Couldn't remove app." : "Невозможно удалить приложение.",
-    "Backups restored successfully" : "Резервные копии успешно восстановлены",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Не удалось восстановить ваши ключи шифрования, проверьте файл owncloud.log или обратитесь к вашему администратору.",
     "Language changed" : "Язык изменён",
     "Invalid request" : "Неправильный запрос",
     "Admins can't remove themself from the admin group" : "Администратор не может удалить сам себя из группы администраторов",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Невозможно изменить пароль",
     "Enabled" : "Включено",
     "Not enabled" : "Не включено",
-    "Recommended" : "Рекомендовано",
     "Group already exists." : "Группа уже существует.",
     "Unable to add group." : "Невозможно добавить группу.",
     "Unable to delete group." : "Невозможно удалить группу.",
@@ -57,6 +50,9 @@ OC.L10N.register(
     "Add trusted domain" : "Добавить доверенный домен",
     "Sending..." : "Отправляется ...",
     "All" : "Все",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Официальные приложения разработаны силами сообщества ownCloud. Они полностью функциональны и готовы к работе.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Подтвержденные приложения разработаны доверенными разработчиками и прошли краткую проверку на наличие проблем с безопасностью. Они активно поддерживаются в открытых репозиториях и сопровождающие их разработчики подтверждают, что приложения достаточно стабильны для нормальной работы.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Это приложение не проверялось на наличие проблем с безопасностью, а так-же может работать нестабильно. Устанавливайте на свой страх и риск.",
     "Please wait...." : "Пожалуйста подождите...",
     "Error while disabling app" : "Ошибка при отключении приложения",
     "Disable" : "Выключить",
@@ -76,9 +72,6 @@ OC.L10N.register(
     "Strong password" : "Стойкий пароль",
     "Valid until {date}" : "Действительно до {дата}",
     "Delete" : "Удалить",
-    "Decrypting files... Please wait, this can take some time." : "Расшифровка файлов... Пожалуйста подождите, это может занять некоторое время.",
-    "Delete encryption keys permanently." : "Перманентно удалить ключи шифрования. ",
-    "Restore encryption keys." : "Восстановить ключи шифрования.",
     "Groups" : "Группы",
     "Unable to delete {objName}" : "Невозможно удалить {objName}",
     "Error creating group" : "Ошибка создания группы",
@@ -98,7 +91,6 @@ OC.L10N.register(
     "Sync clients" : "Синхронизация клиентов",
     "Personal info" : "Личная информация",
     "SSL root certificates" : "Корневые сертификаты SSL",
-    "Encryption" : "Шифрование",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Все (критические проблемы, ошибки, предупреждения, информационные, отладочные)",
     "Info, warnings, errors and fatal issues" : "Информационные, предупреждения, ошибки и критические проблемы",
     "Warnings, errors and fatal issues" : "Предупреждения, ошибки и критические проблемы",
@@ -139,13 +131,14 @@ OC.L10N.register(
     "Last cron job execution: %s." : "Последнее выполненное Cron задание: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Последнее выполненное Cron задание: %s. Что-то кажется неправильным.",
     "Cron was not executed yet!" : "Задачи cron ещё не запускались!",
+    "Open documentation" : "Открыть документацию",
     "Execute one task with each page loaded" : "Выполнять одно задание с каждой загруженной страницей",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
-    "Server Side Encryption" : "Шифрование на стороне сервера",
     "Enable Server-Side-Encryption" : "Включить шифрование на стороне сервера",
     "This is used for sending out notifications." : "Используется для отправки уведомлений.",
     "Send mode" : "Способ отправки",
+    "Encryption" : "Шифрование",
     "From address" : "Адрес отправителя",
     "mail" : "почта",
     "Authentication method" : "Метод проверки подлинности",
@@ -175,6 +168,8 @@ OC.L10N.register(
     "Version" : "Версия",
     "More apps" : "Ещё приложения",
     "Developer documentation" : "Документация для разработчиков",
+    "Experimental applications ahead" : "Экспериментальные приложения",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Экспериментальные приложения не проверялись на наличие уязвимостей безопасности, так-же могут быть не стабильны, т.к. находятся в активной разработке. Их установка может повлечь потерю информации или нарушение безопасности.",
     "by" : "автор",
     "licensed" : "Лицензировано",
     "Documentation:" : "Документация:",
@@ -186,15 +181,17 @@ OC.L10N.register(
     "Update to %s" : "Обновить до %s",
     "Enable only for specific groups" : "Включить только для этих групп",
     "Uninstall App" : "Удалить приложение",
+    "Enable experimental apps" : "Включить экспериментальные приложения",
     "No apps found for your version" : "Не найдено приложений на вашу версию",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Здравствуйте,<br><br>просто хотим сообщить, что теперь у вас есть учетная запись на %s.<br><br>Ваше имя пользователя: %s<br>Зайти: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Удачи!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Здравствуйте,\n\nПросто хотим сообщить, что теперь у вас есть учетная запись на %s.\n\nИмя пользователя: %s\nЗайти: %s\n",
-    "Administrator Documentation" : "Документация администратора",
-    "Online Documentation" : "Online документация",
+    "User documentation" : "Пользовательская документация",
+    "Administrator documentation" : "Документация администратора",
+    "Online documentation" : "Online-документация",
     "Forum" : "Форум",
-    "Bugtracker" : "Багтрекер",
-    "Commercial Support" : "Коммерческая поддержка",
+    "Issue tracker" : "трекер проблем",
+    "Commercial support" : "Коммерческая поддержка",
     "Get the apps to sync your files" : "Получить приложения для синхронизации ваших файлов",
     "Desktop client" : "Клиент для ПК",
     "Android app" : "Android приложение",
@@ -229,12 +226,6 @@ OC.L10N.register(
     "Issued By" : "Выдан",
     "Valid until %s" : "Действительно до %s",
     "Import root certificate" : "Импорт корневого сертификата",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Приложение шифрования больше не используется, пожалуйста расшифруйте все ваши файлы",
-    "Log-in password" : "Пароль входа",
-    "Decrypt all Files" : "Снять шифрование со всех файлов",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ключи шифрования были перемещены в папку с резервными копиями. Если что-то пойдёт не так, то вы сможете восстановить ключи. Удаляйте ключи из архива только тогда, когда вы будете уверены, что все файлы были успешно расшифрованы.",
-    "Restore Encryption Keys" : "Восстановить Ключи Шифрования",
-    "Delete Encryption Keys" : "Удалить Ключи Шифрования",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Разработано {communityopen}сообществом ownCloud{linkclose}, {githubopen}исходный код{linkclose} лицензируется в соответствии с{licenseopen}<abbr title=\"Публичной лицензией Affero General\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Показать местонахождение хранилища",
     "Show last log in" : "Показать последний вход в систему",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 7ea41182920..8d811c7a27e 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Предупреждения безопасности и установки",
     "Sharing" : "Общий доступ",
     "External Storage" : "Внешнее хранилище",
+    "Server Side Encryption" : "Шифрование на стороне сервера",
     "Cron" : "Cron (планировщик задач)",
     "Email Server" : "Почтовый сервер",
     "Log" : "Журнал",
@@ -10,14 +11,7 @@
     "Authentication error" : "Ошибка аутентификации",
     "Your full name has been changed." : "Ваше полное имя было изменено.",
     "Unable to change full name" : "Невозможно изменить полное имя",
-    "Files decrypted successfully" : "Расшифровка файлов прошло успешно",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Не удалось расшифровать ваши файлы, проверьте файл owncloud.log или обратитесь к вашему администратору.",
-    "Couldn't decrypt your files, check your password and try again" : "Ошибка при расшифровке файлов. Проверьте пароль и повторите попытку",
-    "Encryption keys deleted permanently" : "Ключи шифрования перманентно удалены",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Не удалось удалить ваши ключи шифрования, проверьте файл owncloud.log или обратитесь к вашему администратору",
     "Couldn't remove app." : "Невозможно удалить приложение.",
-    "Backups restored successfully" : "Резервные копии успешно восстановлены",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Не удалось восстановить ваши ключи шифрования, проверьте файл owncloud.log или обратитесь к вашему администратору.",
     "Language changed" : "Язык изменён",
     "Invalid request" : "Неправильный запрос",
     "Admins can't remove themself from the admin group" : "Администратор не может удалить сам себя из группы администраторов",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Невозможно изменить пароль",
     "Enabled" : "Включено",
     "Not enabled" : "Не включено",
-    "Recommended" : "Рекомендовано",
     "Group already exists." : "Группа уже существует.",
     "Unable to add group." : "Невозможно добавить группу.",
     "Unable to delete group." : "Невозможно удалить группу.",
@@ -55,6 +48,9 @@
     "Add trusted domain" : "Добавить доверенный домен",
     "Sending..." : "Отправляется ...",
     "All" : "Все",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Официальные приложения разработаны силами сообщества ownCloud. Они полностью функциональны и готовы к работе.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Подтвержденные приложения разработаны доверенными разработчиками и прошли краткую проверку на наличие проблем с безопасностью. Они активно поддерживаются в открытых репозиториях и сопровождающие их разработчики подтверждают, что приложения достаточно стабильны для нормальной работы.",
+    "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Это приложение не проверялось на наличие проблем с безопасностью, а так-же может работать нестабильно. Устанавливайте на свой страх и риск.",
     "Please wait...." : "Пожалуйста подождите...",
     "Error while disabling app" : "Ошибка при отключении приложения",
     "Disable" : "Выключить",
@@ -74,9 +70,6 @@
     "Strong password" : "Стойкий пароль",
     "Valid until {date}" : "Действительно до {дата}",
     "Delete" : "Удалить",
-    "Decrypting files... Please wait, this can take some time." : "Расшифровка файлов... Пожалуйста подождите, это может занять некоторое время.",
-    "Delete encryption keys permanently." : "Перманентно удалить ключи шифрования. ",
-    "Restore encryption keys." : "Восстановить ключи шифрования.",
     "Groups" : "Группы",
     "Unable to delete {objName}" : "Невозможно удалить {objName}",
     "Error creating group" : "Ошибка создания группы",
@@ -96,7 +89,6 @@
     "Sync clients" : "Синхронизация клиентов",
     "Personal info" : "Личная информация",
     "SSL root certificates" : "Корневые сертификаты SSL",
-    "Encryption" : "Шифрование",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Все (критические проблемы, ошибки, предупреждения, информационные, отладочные)",
     "Info, warnings, errors and fatal issues" : "Информационные, предупреждения, ошибки и критические проблемы",
     "Warnings, errors and fatal issues" : "Предупреждения, ошибки и критические проблемы",
@@ -137,13 +129,14 @@
     "Last cron job execution: %s." : "Последнее выполненное Cron задание: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Последнее выполненное Cron задание: %s. Что-то кажется неправильным.",
     "Cron was not executed yet!" : "Задачи cron ещё не запускались!",
+    "Open documentation" : "Открыть документацию",
     "Execute one task with each page loaded" : "Выполнять одно задание с каждой загруженной страницей",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
-    "Server Side Encryption" : "Шифрование на стороне сервера",
     "Enable Server-Side-Encryption" : "Включить шифрование на стороне сервера",
     "This is used for sending out notifications." : "Используется для отправки уведомлений.",
     "Send mode" : "Способ отправки",
+    "Encryption" : "Шифрование",
     "From address" : "Адрес отправителя",
     "mail" : "почта",
     "Authentication method" : "Метод проверки подлинности",
@@ -173,6 +166,8 @@
     "Version" : "Версия",
     "More apps" : "Ещё приложения",
     "Developer documentation" : "Документация для разработчиков",
+    "Experimental applications ahead" : "Экспериментальные приложения",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Экспериментальные приложения не проверялись на наличие уязвимостей безопасности, так-же могут быть не стабильны, т.к. находятся в активной разработке. Их установка может повлечь потерю информации или нарушение безопасности.",
     "by" : "автор",
     "licensed" : "Лицензировано",
     "Documentation:" : "Документация:",
@@ -184,15 +179,17 @@
     "Update to %s" : "Обновить до %s",
     "Enable only for specific groups" : "Включить только для этих групп",
     "Uninstall App" : "Удалить приложение",
+    "Enable experimental apps" : "Включить экспериментальные приложения",
     "No apps found for your version" : "Не найдено приложений на вашу версию",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Здравствуйте,<br><br>просто хотим сообщить, что теперь у вас есть учетная запись на %s.<br><br>Ваше имя пользователя: %s<br>Зайти: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Удачи!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Здравствуйте,\n\nПросто хотим сообщить, что теперь у вас есть учетная запись на %s.\n\nИмя пользователя: %s\nЗайти: %s\n",
-    "Administrator Documentation" : "Документация администратора",
-    "Online Documentation" : "Online документация",
+    "User documentation" : "Пользовательская документация",
+    "Administrator documentation" : "Документация администратора",
+    "Online documentation" : "Online-документация",
     "Forum" : "Форум",
-    "Bugtracker" : "Багтрекер",
-    "Commercial Support" : "Коммерческая поддержка",
+    "Issue tracker" : "трекер проблем",
+    "Commercial support" : "Коммерческая поддержка",
     "Get the apps to sync your files" : "Получить приложения для синхронизации ваших файлов",
     "Desktop client" : "Клиент для ПК",
     "Android app" : "Android приложение",
@@ -227,12 +224,6 @@
     "Issued By" : "Выдан",
     "Valid until %s" : "Действительно до %s",
     "Import root certificate" : "Импорт корневого сертификата",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Приложение шифрования больше не используется, пожалуйста расшифруйте все ваши файлы",
-    "Log-in password" : "Пароль входа",
-    "Decrypt all Files" : "Снять шифрование со всех файлов",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ключи шифрования были перемещены в папку с резервными копиями. Если что-то пойдёт не так, то вы сможете восстановить ключи. Удаляйте ключи из архива только тогда, когда вы будете уверены, что все файлы были успешно расшифрованы.",
-    "Restore Encryption Keys" : "Восстановить Ключи Шифрования",
-    "Delete Encryption Keys" : "Удалить Ключи Шифрования",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Разработано {communityopen}сообществом ownCloud{linkclose}, {githubopen}исходный код{linkclose} лицензируется в соответствии с{licenseopen}<abbr title=\"Публичной лицензией Affero General\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Показать местонахождение хранилища",
     "Show last log in" : "Показать последний вход в систему",
diff --git a/settings/l10n/si_LK.js b/settings/l10n/si_LK.js
index 7b3613fcad4..8dc28f5ab1f 100644
--- a/settings/l10n/si_LK.js
+++ b/settings/l10n/si_LK.js
@@ -18,10 +18,10 @@ OC.L10N.register(
     "undo" : "නිෂ්ප්‍රභ කරන්න",
     "never" : "කවදාවත්",
     "SSL root certificates" : "SSL මූල සහතිකයන්",
-    "Encryption" : "ගුප්ත කේතනය",
     "None" : "කිසිවක් නැත",
     "Login" : "ප්‍රවිශ්ටය",
     "Allow resharing" : "යළි යළිත් හුවමාරුවට අවසර දෙමි",
+    "Encryption" : "ගුප්ත කේතනය",
     "Server address" : "සේවාදායකයේ ලිපිනය",
     "Port" : "තොට",
     "More" : "වැඩි",
diff --git a/settings/l10n/si_LK.json b/settings/l10n/si_LK.json
index 3a6c9b836e8..afded14ebf1 100644
--- a/settings/l10n/si_LK.json
+++ b/settings/l10n/si_LK.json
@@ -16,10 +16,10 @@
     "undo" : "නිෂ්ප්‍රභ කරන්න",
     "never" : "කවදාවත්",
     "SSL root certificates" : "SSL මූල සහතිකයන්",
-    "Encryption" : "ගුප්ත කේතනය",
     "None" : "කිසිවක් නැත",
     "Login" : "ප්‍රවිශ්ටය",
     "Allow resharing" : "යළි යළිත් හුවමාරුවට අවසර දෙමි",
+    "Encryption" : "ගුප්ත කේතනය",
     "Server address" : "සේවාදායකයේ ලිපිනය",
     "Port" : "තොට",
     "More" : "වැඩි",
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index 308e1d8fe3a..ebed064f331 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -10,14 +10,7 @@ OC.L10N.register(
     "Authentication error" : "Chyba autentifikácie",
     "Your full name has been changed." : "Vaše meno a priezvisko bolo zmenené.",
     "Unable to change full name" : "Nemožno zmeniť meno a priezvisko",
-    "Files decrypted successfully" : "Súbory sú úspešne dešifrované",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nemožno dešifrovať vaše súbory, skontrolujte svoj owncloud.log alebo požiadajte o pomoc adminstrátora",
-    "Couldn't decrypt your files, check your password and try again" : "Nemožno dešifrovať vaše súbory, skontrolujte svoje heslo a skúste to znova",
-    "Encryption keys deleted permanently" : "Šifrovacie kľúče sú trvale vymazané",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebolo možné natrvalo vymazať vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
     "Couldn't remove app." : "Nemožno odstrániť aplikáciu.",
-    "Backups restored successfully" : "Zálohy boli úspešne obnovené",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebolo možné obnoviť vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
     "Language changed" : "Jazyk zmenený",
     "Invalid request" : "Neplatná požiadavka",
     "Admins can't remove themself from the admin group" : "Administrátori nesmú odstrániť sami seba zo skupiny admin",
@@ -32,7 +25,6 @@ OC.L10N.register(
     "Unable to change password" : "Zmena hesla sa nepodarila",
     "Enabled" : "Povolené",
     "Not enabled" : "Zakázané",
-    "Recommended" : "Odporúčané",
     "Group already exists." : "Skupina už existuje.",
     "Unable to add group." : "Nie je možné pridať skupinu.",
     "Unable to delete group." : "Nie je možné zmazať skupinu.",
@@ -72,9 +64,6 @@ OC.L10N.register(
     "Strong password" : "Silné heslo",
     "Valid until {date}" : "Platný do {date}",
     "Delete" : "Zmazať",
-    "Decrypting files... Please wait, this can take some time." : "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
-    "Delete encryption keys permanently." : "Natrvalo vymazať šifrovacie kľúče.",
-    "Restore encryption keys." : "Obnoviť šifrovacie kľúče.",
     "Groups" : "Skupiny",
     "Unable to delete {objName}" : "Nemožno vymazať {objName}",
     "Error creating group" : "Chyba pri vytváraní skupiny",
@@ -92,7 +81,6 @@ OC.L10N.register(
     "A valid email must be provided" : "Musíte zadať platnú emailovú adresu",
     "__language_name__" : "Slovensky",
     "SSL root certificates" : "Koreňové SSL certifikáty",
-    "Encryption" : "Šifrovanie",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Všetko (fatálne problémy, chyby, upozornenia, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, upozornenia, chyby a fatálne problémy",
     "Warnings, errors and fatal issues" : "Upozornenia, chyby a fatálne problémy",
@@ -134,6 +122,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Použiť systémovú službu cron na spúšťanie súboru cron.php každých 15 minút.",
     "This is used for sending out notifications." : "Používa sa na odosielanie upozornení.",
     "Send mode" : "Mód odosielania",
+    "Encryption" : "Šifrovanie",
     "From address" : "Z adresy",
     "mail" : "email",
     "Authentication method" : "Autentifikačná metóda",
@@ -168,11 +157,7 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Dobrý deň,<br><br>toto je oznámenie o novo vytvorenom účte %s.<br><br>Vaše používateľské meno: %s<br>Prihlásiť sa môžete tu: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Pekný deň!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ahoj,\n\ntoto je oznámenie o novo vytvorenom účte %s.\n\nVaše používateľské meno: %s\nPrihlásiť sa môžete tu: %s\n\n",
-    "Administrator Documentation" : "Príručka administrátora",
-    "Online Documentation" : "Online príručka",
     "Forum" : "Fórum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Komerčná podpora",
     "Get the apps to sync your files" : "Získať aplikácie na synchronizáciu vašich súborov",
     "Desktop client" : "Desktopový klient",
     "Android app" : "Android aplikácia",
@@ -205,12 +190,6 @@ OC.L10N.register(
     "Valid until" : "Platný do",
     "Issued By" : "Vydal",
     "Valid until %s" : "Platný do %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Šifrovacia aplikácia už nie je spustená, dešifrujte všetky svoje súbory.",
-    "Log-in password" : "Prihlasovacie heslo",
-    "Decrypt all Files" : "Dešifrovať všetky súbory",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaše šifrovacie kľúče boli zazálohované. Ak by sa niečo nepodarilo, dajú sa znovu obnoviť. Natrvalo ich vymažte len ak ste si istí, že sú všetky súbory bezchybne dešifrované.",
-    "Restore Encryption Keys" : "Obnoviť šifrovacie kľúče",
-    "Delete Encryption Keys" : "Vymazať šifrovacie kľúče",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Vyvinula {communityopen}komunita ownCloud{linkclose}. {githubopen}Zdrojový kód{linkclose} je dostupný za podmienok licencie {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Zobraziť umiestnenie úložiska",
     "Show last log in" : "Zobraziť posledné prihlásenie",
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index 2b92631707a..d38e82e26a8 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -8,14 +8,7 @@
     "Authentication error" : "Chyba autentifikácie",
     "Your full name has been changed." : "Vaše meno a priezvisko bolo zmenené.",
     "Unable to change full name" : "Nemožno zmeniť meno a priezvisko",
-    "Files decrypted successfully" : "Súbory sú úspešne dešifrované",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nemožno dešifrovať vaše súbory, skontrolujte svoj owncloud.log alebo požiadajte o pomoc adminstrátora",
-    "Couldn't decrypt your files, check your password and try again" : "Nemožno dešifrovať vaše súbory, skontrolujte svoje heslo a skúste to znova",
-    "Encryption keys deleted permanently" : "Šifrovacie kľúče sú trvale vymazané",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebolo možné natrvalo vymazať vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
     "Couldn't remove app." : "Nemožno odstrániť aplikáciu.",
-    "Backups restored successfully" : "Zálohy boli úspešne obnovené",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebolo možné obnoviť vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
     "Language changed" : "Jazyk zmenený",
     "Invalid request" : "Neplatná požiadavka",
     "Admins can't remove themself from the admin group" : "Administrátori nesmú odstrániť sami seba zo skupiny admin",
@@ -30,7 +23,6 @@
     "Unable to change password" : "Zmena hesla sa nepodarila",
     "Enabled" : "Povolené",
     "Not enabled" : "Zakázané",
-    "Recommended" : "Odporúčané",
     "Group already exists." : "Skupina už existuje.",
     "Unable to add group." : "Nie je možné pridať skupinu.",
     "Unable to delete group." : "Nie je možné zmazať skupinu.",
@@ -70,9 +62,6 @@
     "Strong password" : "Silné heslo",
     "Valid until {date}" : "Platný do {date}",
     "Delete" : "Zmazať",
-    "Decrypting files... Please wait, this can take some time." : "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
-    "Delete encryption keys permanently." : "Natrvalo vymazať šifrovacie kľúče.",
-    "Restore encryption keys." : "Obnoviť šifrovacie kľúče.",
     "Groups" : "Skupiny",
     "Unable to delete {objName}" : "Nemožno vymazať {objName}",
     "Error creating group" : "Chyba pri vytváraní skupiny",
@@ -90,7 +79,6 @@
     "A valid email must be provided" : "Musíte zadať platnú emailovú adresu",
     "__language_name__" : "Slovensky",
     "SSL root certificates" : "Koreňové SSL certifikáty",
-    "Encryption" : "Šifrovanie",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Všetko (fatálne problémy, chyby, upozornenia, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, upozornenia, chyby a fatálne problémy",
     "Warnings, errors and fatal issues" : "Upozornenia, chyby a fatálne problémy",
@@ -132,6 +120,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Použiť systémovú službu cron na spúšťanie súboru cron.php každých 15 minút.",
     "This is used for sending out notifications." : "Používa sa na odosielanie upozornení.",
     "Send mode" : "Mód odosielania",
+    "Encryption" : "Šifrovanie",
     "From address" : "Z adresy",
     "mail" : "email",
     "Authentication method" : "Autentifikačná metóda",
@@ -166,11 +155,7 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Dobrý deň,<br><br>toto je oznámenie o novo vytvorenom účte %s.<br><br>Vaše používateľské meno: %s<br>Prihlásiť sa môžete tu: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Pekný deň!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Ahoj,\n\ntoto je oznámenie o novo vytvorenom účte %s.\n\nVaše používateľské meno: %s\nPrihlásiť sa môžete tu: %s\n\n",
-    "Administrator Documentation" : "Príručka administrátora",
-    "Online Documentation" : "Online príručka",
     "Forum" : "Fórum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Komerčná podpora",
     "Get the apps to sync your files" : "Získať aplikácie na synchronizáciu vašich súborov",
     "Desktop client" : "Desktopový klient",
     "Android app" : "Android aplikácia",
@@ -203,12 +188,6 @@
     "Valid until" : "Platný do",
     "Issued By" : "Vydal",
     "Valid until %s" : "Platný do %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Šifrovacia aplikácia už nie je spustená, dešifrujte všetky svoje súbory.",
-    "Log-in password" : "Prihlasovacie heslo",
-    "Decrypt all Files" : "Dešifrovať všetky súbory",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaše šifrovacie kľúče boli zazálohované. Ak by sa niečo nepodarilo, dajú sa znovu obnoviť. Natrvalo ich vymažte len ak ste si istí, že sú všetky súbory bezchybne dešifrované.",
-    "Restore Encryption Keys" : "Obnoviť šifrovacie kľúče",
-    "Delete Encryption Keys" : "Vymazať šifrovacie kľúče",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Vyvinula {communityopen}komunita ownCloud{linkclose}. {githubopen}Zdrojový kód{linkclose} je dostupný za podmienok licencie {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Zobraziť umiestnenie úložiska",
     "Show last log in" : "Zobraziť posledné prihlásenie",
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index ac99d1f0505..b7d8c8550a7 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Sharing" : "Souporaba",
     "External Storage" : "Zunanja podatkovna shramba",
+    "Server Side Encryption" : "Strežniško šifriranje",
     "Cron" : "Periodično opravilo",
     "Email Server" : "Poštni strežnik",
     "Log" : "Dnevnik",
@@ -10,14 +11,7 @@ OC.L10N.register(
     "Authentication error" : "Napaka med overjanjem",
     "Your full name has been changed." : "Vaše polno ime je spremenjeno.",
     "Unable to change full name" : "Ni mogoče spremeniti polnega imena",
-    "Files decrypted successfully" : "Datoteke so uspešno odšifrirane",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Datotek ni mogoče odšifrirati. Preverite dnevnik owncloud.log ali pa se posvetujte s skrbnikom.",
-    "Couldn't decrypt your files, check your password and try again" : "Datotek ni mogoče odšifrirati. Preverite geslo in poskusite znova.",
-    "Encryption keys deleted permanently" : "Šifrirni ključi so trajno izbrisani",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ni mogoče trajno izbrisati šifrirnih ključev. Preverite dnevnik owncloud.log ali pa stopite v stik s skrbnikom sistema.",
     "Couldn't remove app." : "Ni mogoče odstraniti programa.",
-    "Backups restored successfully" : "Varnostne kopije so uspešno obnovljene.",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ni mogoče obnoviti šifrirnih ključev. Preverite dnevnik owncloud.log ali pa stopite v stik s skrbnikom sistema.",
     "Language changed" : "Jezik je spremenjen",
     "Invalid request" : "Neveljavna zahteva",
     "Admins can't remove themself from the admin group" : "Skrbnikov ni mogoče odstraniti iz skupine skrbnikov (admin)",
@@ -31,7 +25,6 @@ OC.L10N.register(
     "Unable to change password" : "Ni mogoče spremeniti gesla",
     "Enabled" : "Omogočeno",
     "Not enabled" : "Ni omogočeno",
-    "Recommended" : "Priporočljivo",
     "Group already exists." : "Skupina že obstaja.",
     "Unable to add group." : "Ni mogoče dodati skupine",
     "Unable to delete group." : "Ni mogoče izbrisati skupine.",
@@ -70,9 +63,6 @@ OC.L10N.register(
     "Strong password" : "Odlično geslo",
     "Valid until {date}" : "Veljavno do {date}",
     "Delete" : "Izbriši",
-    "Decrypting files... Please wait, this can take some time." : "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno.",
-    "Delete encryption keys permanently." : "Trajno izbriše šifrirne ključe",
-    "Restore encryption keys." : "Obnovi šifrirne ključe.",
     "Groups" : "Skupine",
     "Unable to delete {objName}" : "Ni mogoče izbrisati {objName}",
     "Error creating group" : "Napaka ustvarjanja skupine",
@@ -91,7 +81,6 @@ OC.L10N.register(
     "Sync clients" : "Uskladi odjemalce",
     "Personal info" : "Osebni podatki",
     "SSL root certificates" : "Korenska potrdila SSL",
-    "Encryption" : "Šifriranje",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
     "Info, warnings, errors and fatal issues" : "Podrobnosti, opozorila, napake in usodne dogodke",
     "Warnings, errors and fatal issues" : "Opozorila, napake in usodne dogodke",
@@ -123,9 +112,9 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
-    "Server Side Encryption" : "Strežniško šifriranje",
     "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
     "Send mode" : "Način pošiljanja",
+    "Encryption" : "Šifriranje",
     "From address" : "Naslov pošiljatelja",
     "Authentication method" : "Način overitve",
     "Authentication required" : "Zahtevana je overitev",
@@ -152,11 +141,7 @@ OC.L10N.register(
     "Enable only for specific groups" : "Omogoči le za posamezne skupine",
     "Uninstall App" : "Odstrani program",
     "Cheers!" : "Na zdravje!",
-    "Administrator Documentation" : "Skrbniška dokumentacija",
-    "Online Documentation" : "Spletna dokumentacija",
     "Forum" : "Forum",
-    "Bugtracker" : "Sledilnik hroščev",
-    "Commercial Support" : "Podpora strankam",
     "Get the apps to sync your files" : "Pridobi programe za usklajevanje datotek",
     "Desktop client" : "Namizni odjemalec",
     "Android app" : "Program za Android",
@@ -184,11 +169,6 @@ OC.L10N.register(
     "Valid until" : "Veljavno do",
     "Issued By" : "Izdajatelj",
     "Valid until %s" : "Veljavno do %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Program za šifriranje ni več omogočen. Odšifrirati je treba vse datoteke.",
-    "Log-in password" : "Prijavno geslo",
-    "Decrypt all Files" : "Odšifriraj vse datoteke",
-    "Restore Encryption Keys" : "Obnovi šifrirne ključe",
-    "Delete Encryption Keys" : "Izbriši šifrirne ključe",
     "Show storage location" : "Pokaži mesto shrambe",
     "Show last log in" : "Pokaži podatke zadnje prijave",
     "Show email address" : "Pokaži naslov elektronske pošte",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index a09faa741eb..b8ad39d592b 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Sharing" : "Souporaba",
     "External Storage" : "Zunanja podatkovna shramba",
+    "Server Side Encryption" : "Strežniško šifriranje",
     "Cron" : "Periodično opravilo",
     "Email Server" : "Poštni strežnik",
     "Log" : "Dnevnik",
@@ -8,14 +9,7 @@
     "Authentication error" : "Napaka med overjanjem",
     "Your full name has been changed." : "Vaše polno ime je spremenjeno.",
     "Unable to change full name" : "Ni mogoče spremeniti polnega imena",
-    "Files decrypted successfully" : "Datoteke so uspešno odšifrirane",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Datotek ni mogoče odšifrirati. Preverite dnevnik owncloud.log ali pa se posvetujte s skrbnikom.",
-    "Couldn't decrypt your files, check your password and try again" : "Datotek ni mogoče odšifrirati. Preverite geslo in poskusite znova.",
-    "Encryption keys deleted permanently" : "Šifrirni ključi so trajno izbrisani",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ni mogoče trajno izbrisati šifrirnih ključev. Preverite dnevnik owncloud.log ali pa stopite v stik s skrbnikom sistema.",
     "Couldn't remove app." : "Ni mogoče odstraniti programa.",
-    "Backups restored successfully" : "Varnostne kopije so uspešno obnovljene.",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ni mogoče obnoviti šifrirnih ključev. Preverite dnevnik owncloud.log ali pa stopite v stik s skrbnikom sistema.",
     "Language changed" : "Jezik je spremenjen",
     "Invalid request" : "Neveljavna zahteva",
     "Admins can't remove themself from the admin group" : "Skrbnikov ni mogoče odstraniti iz skupine skrbnikov (admin)",
@@ -29,7 +23,6 @@
     "Unable to change password" : "Ni mogoče spremeniti gesla",
     "Enabled" : "Omogočeno",
     "Not enabled" : "Ni omogočeno",
-    "Recommended" : "Priporočljivo",
     "Group already exists." : "Skupina že obstaja.",
     "Unable to add group." : "Ni mogoče dodati skupine",
     "Unable to delete group." : "Ni mogoče izbrisati skupine.",
@@ -68,9 +61,6 @@
     "Strong password" : "Odlično geslo",
     "Valid until {date}" : "Veljavno do {date}",
     "Delete" : "Izbriši",
-    "Decrypting files... Please wait, this can take some time." : "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno.",
-    "Delete encryption keys permanently." : "Trajno izbriše šifrirne ključe",
-    "Restore encryption keys." : "Obnovi šifrirne ključe.",
     "Groups" : "Skupine",
     "Unable to delete {objName}" : "Ni mogoče izbrisati {objName}",
     "Error creating group" : "Napaka ustvarjanja skupine",
@@ -89,7 +79,6 @@
     "Sync clients" : "Uskladi odjemalce",
     "Personal info" : "Osebni podatki",
     "SSL root certificates" : "Korenska potrdila SSL",
-    "Encryption" : "Šifriranje",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
     "Info, warnings, errors and fatal issues" : "Podrobnosti, opozorila, napake in usodne dogodke",
     "Warnings, errors and fatal issues" : "Opozorila, napake in usodne dogodke",
@@ -121,9 +110,9 @@
     "Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
-    "Server Side Encryption" : "Strežniško šifriranje",
     "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
     "Send mode" : "Način pošiljanja",
+    "Encryption" : "Šifriranje",
     "From address" : "Naslov pošiljatelja",
     "Authentication method" : "Način overitve",
     "Authentication required" : "Zahtevana je overitev",
@@ -150,11 +139,7 @@
     "Enable only for specific groups" : "Omogoči le za posamezne skupine",
     "Uninstall App" : "Odstrani program",
     "Cheers!" : "Na zdravje!",
-    "Administrator Documentation" : "Skrbniška dokumentacija",
-    "Online Documentation" : "Spletna dokumentacija",
     "Forum" : "Forum",
-    "Bugtracker" : "Sledilnik hroščev",
-    "Commercial Support" : "Podpora strankam",
     "Get the apps to sync your files" : "Pridobi programe za usklajevanje datotek",
     "Desktop client" : "Namizni odjemalec",
     "Android app" : "Program za Android",
@@ -182,11 +167,6 @@
     "Valid until" : "Veljavno do",
     "Issued By" : "Izdajatelj",
     "Valid until %s" : "Veljavno do %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Program za šifriranje ni več omogočen. Odšifrirati je treba vse datoteke.",
-    "Log-in password" : "Prijavno geslo",
-    "Decrypt all Files" : "Odšifriraj vse datoteke",
-    "Restore Encryption Keys" : "Obnovi šifrirne ključe",
-    "Delete Encryption Keys" : "Izbriši šifrirne ključe",
     "Show storage location" : "Pokaži mesto shrambe",
     "Show last log in" : "Pokaži podatke zadnje prijave",
     "Show email address" : "Pokaži naslov elektronske pošte",
diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js
index 5a55ae8aed7..23110ad2006 100644
--- a/settings/l10n/sq.js
+++ b/settings/l10n/sq.js
@@ -8,14 +8,7 @@ OC.L10N.register(
     "Authentication error" : "Gabim autentifikimi",
     "Your full name has been changed." : "Emri juaj i plotë ka ndryshuar.",
     "Unable to change full name" : "Nuk mund të ndryshohet emri i plotë",
-    "Files decrypted successfully" : "Skedarët janë dëshifruar me sukses",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nuk mund të dëshifrohen skedarët tuaj, ju lutem kontrolloni owncloud.log ose pyesni administratorin tuaj.",
-    "Couldn't decrypt your files, check your password and try again" : "Nuk mund të dëshifrohen skedarët tuaj, ju lutem kontrolloni fjalëkalimin tuaj dhe provoni përsëri.",
-    "Encryption keys deleted permanently" : "Çelësat e shifrimit u fshinë përfundimisht",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nuk mund të fshihen përfundimisht çelësat tuaj të shifrimit, ju lutem kontrolloni owncloud.log ose pyesni administratorin tuaj.",
     "Couldn't remove app." : "Nuk mund të hiqet aplikacioni.",
-    "Backups restored successfully" : "Kopjet rezervë u restauruan me sukses",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nuk mund të restaurohen çelësat tuaj të shifrimit, ju lutem kontrolloni owncloud.log ose pyesni administratorin tuaj.",
     "Language changed" : "Gjuha u ndryshua",
     "Invalid request" : "Kërkesë e pavlefshme",
     "Admins can't remove themself from the admin group" : "Administratorët nuk mund të heqin vehten prej grupit admin",
@@ -29,7 +22,6 @@ OC.L10N.register(
     "Unable to change password" : "Fjalëkalimi nuk mund të ndryshohet",
     "Enabled" : "Aktivizuar",
     "Not enabled" : "Jo aktive",
-    "Recommended" : "E rekomanduar",
     "Saved" : "U ruajt",
     "test email settings" : "parametra test për email",
     "Email sent" : "Email-i u dërgua",
@@ -59,7 +51,6 @@ OC.L10N.register(
     "Error creating user" : "Gabim gjatë krijimit të përdoruesit",
     "A valid password must be provided" : "Duhet të jepni një fjalëkalim te vlefshëm",
     "__language_name__" : "Shqip",
-    "Encryption" : "Kodifikimi",
     "None" : "Asgjë",
     "Login" : "Hyr",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Moduli PHP 'fileinfo' mungon. Ju këshillojmë me këmbngulje të aktivizoni këtë modul për të arritur rezultate më të mirame identifikimin e tipeve te ndryshme MIME.",
@@ -70,6 +61,7 @@ OC.L10N.register(
     "Allow resharing" : "Lejo ri-ndarjen",
     "Execute one task with each page loaded" : "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara",
     "Send mode" : "Mënyra e dërgimit",
+    "Encryption" : "Kodifikimi",
     "From address" : "Nga adresa",
     "mail" : "postë",
     "Server address" : "Adresa e serverit",
@@ -84,11 +76,7 @@ OC.L10N.register(
     "Documentation:" : "Dokumentacioni:",
     "User Documentation" : "Dokumentacion përdoruesi",
     "Cheers!" : "Gjithë të mirat",
-    "Administrator Documentation" : "Dokumentacion administratori",
-    "Online Documentation" : "Dokumentacion online",
     "Forum" : "Forumi",
-    "Bugtracker" : "Bugtracker - ndjekja e problemeve",
-    "Commercial Support" : "Suport komercial",
     "Get the apps to sync your files" : "Bëni që aplikacionet të sinkronizojnë skedarët tuaj",
     "Show First Run Wizard again" : "Rishfaq përsëri fazat për hapjen e herës së parë",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ju keni përdorur <strong>%s</strong> nga <strong>%s</strong> të mundshme ",
@@ -105,7 +93,6 @@ OC.L10N.register(
     "Choose as profile image" : "Vendos si foto profili",
     "Language" : "Gjuha",
     "Help translate" : "Ndihmoni në përkthim",
-    "Log-in password" : "Fjalëkalimi i hyrjes",
     "Username" : "Përdoruesi",
     "Create" : "Krijo",
     "Admin Recovery Password" : "Rigjetja e fjalëkalimit të Admin",
diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json
index 60c082997bc..57af50a4bc0 100644
--- a/settings/l10n/sq.json
+++ b/settings/l10n/sq.json
@@ -6,14 +6,7 @@
     "Authentication error" : "Gabim autentifikimi",
     "Your full name has been changed." : "Emri juaj i plotë ka ndryshuar.",
     "Unable to change full name" : "Nuk mund të ndryshohet emri i plotë",
-    "Files decrypted successfully" : "Skedarët janë dëshifruar me sukses",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nuk mund të dëshifrohen skedarët tuaj, ju lutem kontrolloni owncloud.log ose pyesni administratorin tuaj.",
-    "Couldn't decrypt your files, check your password and try again" : "Nuk mund të dëshifrohen skedarët tuaj, ju lutem kontrolloni fjalëkalimin tuaj dhe provoni përsëri.",
-    "Encryption keys deleted permanently" : "Çelësat e shifrimit u fshinë përfundimisht",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nuk mund të fshihen përfundimisht çelësat tuaj të shifrimit, ju lutem kontrolloni owncloud.log ose pyesni administratorin tuaj.",
     "Couldn't remove app." : "Nuk mund të hiqet aplikacioni.",
-    "Backups restored successfully" : "Kopjet rezervë u restauruan me sukses",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nuk mund të restaurohen çelësat tuaj të shifrimit, ju lutem kontrolloni owncloud.log ose pyesni administratorin tuaj.",
     "Language changed" : "Gjuha u ndryshua",
     "Invalid request" : "Kërkesë e pavlefshme",
     "Admins can't remove themself from the admin group" : "Administratorët nuk mund të heqin vehten prej grupit admin",
@@ -27,7 +20,6 @@
     "Unable to change password" : "Fjalëkalimi nuk mund të ndryshohet",
     "Enabled" : "Aktivizuar",
     "Not enabled" : "Jo aktive",
-    "Recommended" : "E rekomanduar",
     "Saved" : "U ruajt",
     "test email settings" : "parametra test për email",
     "Email sent" : "Email-i u dërgua",
@@ -57,7 +49,6 @@
     "Error creating user" : "Gabim gjatë krijimit të përdoruesit",
     "A valid password must be provided" : "Duhet të jepni një fjalëkalim te vlefshëm",
     "__language_name__" : "Shqip",
-    "Encryption" : "Kodifikimi",
     "None" : "Asgjë",
     "Login" : "Hyr",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Moduli PHP 'fileinfo' mungon. Ju këshillojmë me këmbngulje të aktivizoni këtë modul për të arritur rezultate më të mirame identifikimin e tipeve te ndryshme MIME.",
@@ -68,6 +59,7 @@
     "Allow resharing" : "Lejo ri-ndarjen",
     "Execute one task with each page loaded" : "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara",
     "Send mode" : "Mënyra e dërgimit",
+    "Encryption" : "Kodifikimi",
     "From address" : "Nga adresa",
     "mail" : "postë",
     "Server address" : "Adresa e serverit",
@@ -82,11 +74,7 @@
     "Documentation:" : "Dokumentacioni:",
     "User Documentation" : "Dokumentacion përdoruesi",
     "Cheers!" : "Gjithë të mirat",
-    "Administrator Documentation" : "Dokumentacion administratori",
-    "Online Documentation" : "Dokumentacion online",
     "Forum" : "Forumi",
-    "Bugtracker" : "Bugtracker - ndjekja e problemeve",
-    "Commercial Support" : "Suport komercial",
     "Get the apps to sync your files" : "Bëni që aplikacionet të sinkronizojnë skedarët tuaj",
     "Show First Run Wizard again" : "Rishfaq përsëri fazat për hapjen e herës së parë",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ju keni përdorur <strong>%s</strong> nga <strong>%s</strong> të mundshme ",
@@ -103,7 +91,6 @@
     "Choose as profile image" : "Vendos si foto profili",
     "Language" : "Gjuha",
     "Help translate" : "Ndihmoni në përkthim",
-    "Log-in password" : "Fjalëkalimi i hyrjes",
     "Username" : "Përdoruesi",
     "Create" : "Krijo",
     "Admin Recovery Password" : "Rigjetja e fjalëkalimit të Admin",
diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js
index d32e25a9bc1..253069bedff 100644
--- a/settings/l10n/sr.js
+++ b/settings/l10n/sr.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Безбедносна и упозорења поставе",
     "Sharing" : "Дељење",
     "External Storage" : "Спољашње складиште",
+    "Server Side Encryption" : "Шифровање на страни сервера",
     "Cron" : "Крон",
     "Email Server" : "Сервер е-поште",
     "Log" : "Бележење",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Грешка при провери идентитета",
     "Your full name has been changed." : "Ваше пуно име је промењено.",
     "Unable to change full name" : "Не могу да променим пуно име",
-    "Files decrypted successfully" : "Фајлови успешно дешифровани",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Не могу да дешифрујем ваше фајлове. Погледајте owncloud.log или питајте администратора.",
-    "Couldn't decrypt your files, check your password and try again" : "Не могу да дешифрујем ваше фајлове. Проверите лозинку и покушајте поново.",
-    "Encryption keys deleted permanently" : "Шифрарски кључеви су заувек обрисани",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Не могу да обришем ваше шифрарске кључеве. Погледајте owncloud.log или питајте администратора.",
     "Couldn't remove app." : "Не могу да уклоним апликацију.",
-    "Backups restored successfully" : "Резерва успешно враћена",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Не могу да вратим ваше шифрарске кључеве. Погледајте owncloud.log или питајте администратора.",
     "Language changed" : "Језик је промењен",
     "Invalid request" : "Неисправан захтев",
     "Admins can't remove themself from the admin group" : "Администратор не може себе да уклони из admin групе",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Не могу да променим лозинку",
     "Enabled" : "Укључено",
     "Not enabled" : "Искључено",
-    "Recommended" : "Препоручено",
     "Group already exists." : "Група већ постоји.",
     "Unable to add group." : "Није могуће додати групу.",
     "Unable to delete group." : "Није могуће обрисати групу.",
@@ -76,9 +69,6 @@ OC.L10N.register(
     "Strong password" : "Јака лозинка",
     "Valid until {date}" : "Важи до {date}",
     "Delete" : "Обриши",
-    "Decrypting files... Please wait, this can take some time." : "Дешифрујем фајлове... Молим сачекајте. Ово може потрајати.",
-    "Delete encryption keys permanently." : "Обриши шифрарске кључеве заувек.",
-    "Restore encryption keys." : "Врати шифрарске кључеве.",
     "Groups" : "Групе",
     "Unable to delete {objName}" : "Не могу да обришем {objName}",
     "Error creating group" : "Грешка при прављењу групе",
@@ -98,7 +88,6 @@ OC.L10N.register(
     "Sync clients" : "Синхронизовање клијената",
     "Personal info" : "Лични подаци",
     "SSL root certificates" : "ССЛ корени сертификати",
-    "Encryption" : "Шифровање",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Све (фаталне проблеме, грешке, упозорења, информације, отклањање грешака)",
     "Info, warnings, errors and fatal issues" : "Информације, упозорења, грешке и фатални проблеми",
     "Warnings, errors and fatal issues" : "Упозорења, грешке и фатални проблеми",
@@ -139,13 +128,14 @@ OC.L10N.register(
     "Last cron job execution: %s." : "Последњи извршени крон задатак: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Последњи извршени крон задатак: %s. Нешто изгледа није у реду.",
     "Cron was not executed yet!" : "Крон задатак још увек није извршен!",
+    "Open documentation" : "Отвори документацију",
     "Execute one task with each page loaded" : "Изврши један задатак са сваком учитаном страницом",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php је регистрован код  вебкрон сервиса за позивање cron.php сваких 15 минута преко протокола http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Користите системски крон сервис за позивање cron.php фајла сваких 15 минута.",
-    "Server Side Encryption" : "Шифровање на страни сервера",
     "Enable Server-Side-Encryption" : "Укључи шифровање на страни сервера",
     "This is used for sending out notifications." : "Ово се користи за слање обавештења.",
     "Send mode" : "Режим слања",
+    "Encryption" : "Шифровање",
     "From address" : "Са адресе",
     "mail" : "пошта",
     "Authentication method" : "Начин аутентификације",
@@ -175,6 +165,8 @@ OC.L10N.register(
     "Version" : "Верзија",
     "More apps" : "Још апликација",
     "Developer documentation" : "Програмерска документација",
+    "Experimental applications ahead" : "Експериментална апликација",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Експерименталне апликације се непроверене што се тиче безбедности и могу бити нестабилне и недовршене. Инсталирање може довести до губитка података или нарушавања безбедности.",
     "by" : "од",
     "licensed" : "лиценцирано",
     "Documentation:" : "Документација:",
@@ -186,15 +178,17 @@ OC.L10N.register(
     "Update to %s" : "Ажурирај на %s",
     "Enable only for specific groups" : "Укључи само за одређене групе",
     "Uninstall App" : "Деинсталирај апликацију",
+    "Enable experimental apps" : "Укључи експерименталне апликације",
     "No apps found for your version" : "Нема апликација за вашу верзију",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Поздрав,<br><br>само вас обавештавам да сад имате %s налог.<br><br>Ваше корисничко име: %s<br>Приступите му на: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Здраво!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Добродошли,\n\nСамо да знате да сада имате %s налог.\n\nВаше корисничко име: %s\nПриступите: %s\n",
-    "Administrator Documentation" : "Администраторска документација",
-    "Online Documentation" : "Мрежна документација",
+    "User documentation" : "Корисничка документација",
+    "Administrator documentation" : "Администраторска документација",
+    "Online documentation" : "Документација на мрежи",
     "Forum" : "Форум",
-    "Bugtracker" : "Праћење грешака",
-    "Commercial Support" : "Комерцијална подршка",
+    "Issue tracker" : "Пратилац проблема",
+    "Commercial support" : "Комерцијална подршка",
     "Get the apps to sync your files" : "Преузмите апликације ради синхронизовања ваших фајлова",
     "Desktop client" : "Клијент за рачунар",
     "Android app" : "Андроид апликација",
@@ -229,12 +223,6 @@ OC.L10N.register(
     "Issued By" : "Издавач",
     "Valid until %s" : "Важи до %s",
     "Import root certificate" : "Увоз кореног сертификата",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Апликација за шифровање више није укључена. Дешифрујте све ваше фајлове",
-    "Log-in password" : "Лозинка за пријаву",
-    "Decrypt all Files" : "Дешифруј све фајлове",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ваши шифрарски кључеви су премештени на резервну локацију. Ако нешто крене наопако, можете их повратити. Избришите их заувек само ако сте сигурни да су сви фајлови исправно дешифровани.",
-    "Restore Encryption Keys" : "Врати шифрарске кључеве",
-    "Delete Encryption Keys" : "Обриши шифрарске кључеве",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Развијено од {communityopen}заједнице сопственогОблака{linkclose}, {githubopen}изворни код{linkclose} је лиценциран под {licenseopen}<abbr title=\"Affero General Public License\">АГПЛ</abbr>{linkclose}.",
     "Show storage location" : "Прикажи локацију складишта",
     "Show last log in" : "Прикажи последњу пријаву",
diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json
index 14369ecf782..a063579c2ef 100644
--- a/settings/l10n/sr.json
+++ b/settings/l10n/sr.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Безбедносна и упозорења поставе",
     "Sharing" : "Дељење",
     "External Storage" : "Спољашње складиште",
+    "Server Side Encryption" : "Шифровање на страни сервера",
     "Cron" : "Крон",
     "Email Server" : "Сервер е-поште",
     "Log" : "Бележење",
@@ -10,14 +11,7 @@
     "Authentication error" : "Грешка при провери идентитета",
     "Your full name has been changed." : "Ваше пуно име је промењено.",
     "Unable to change full name" : "Не могу да променим пуно име",
-    "Files decrypted successfully" : "Фајлови успешно дешифровани",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Не могу да дешифрујем ваше фајлове. Погледајте owncloud.log или питајте администратора.",
-    "Couldn't decrypt your files, check your password and try again" : "Не могу да дешифрујем ваше фајлове. Проверите лозинку и покушајте поново.",
-    "Encryption keys deleted permanently" : "Шифрарски кључеви су заувек обрисани",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Не могу да обришем ваше шифрарске кључеве. Погледајте owncloud.log или питајте администратора.",
     "Couldn't remove app." : "Не могу да уклоним апликацију.",
-    "Backups restored successfully" : "Резерва успешно враћена",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Не могу да вратим ваше шифрарске кључеве. Погледајте owncloud.log или питајте администратора.",
     "Language changed" : "Језик је промењен",
     "Invalid request" : "Неисправан захтев",
     "Admins can't remove themself from the admin group" : "Администратор не може себе да уклони из admin групе",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Не могу да променим лозинку",
     "Enabled" : "Укључено",
     "Not enabled" : "Искључено",
-    "Recommended" : "Препоручено",
     "Group already exists." : "Група већ постоји.",
     "Unable to add group." : "Није могуће додати групу.",
     "Unable to delete group." : "Није могуће обрисати групу.",
@@ -74,9 +67,6 @@
     "Strong password" : "Јака лозинка",
     "Valid until {date}" : "Важи до {date}",
     "Delete" : "Обриши",
-    "Decrypting files... Please wait, this can take some time." : "Дешифрујем фајлове... Молим сачекајте. Ово може потрајати.",
-    "Delete encryption keys permanently." : "Обриши шифрарске кључеве заувек.",
-    "Restore encryption keys." : "Врати шифрарске кључеве.",
     "Groups" : "Групе",
     "Unable to delete {objName}" : "Не могу да обришем {objName}",
     "Error creating group" : "Грешка при прављењу групе",
@@ -96,7 +86,6 @@
     "Sync clients" : "Синхронизовање клијената",
     "Personal info" : "Лични подаци",
     "SSL root certificates" : "ССЛ корени сертификати",
-    "Encryption" : "Шифровање",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Све (фаталне проблеме, грешке, упозорења, информације, отклањање грешака)",
     "Info, warnings, errors and fatal issues" : "Информације, упозорења, грешке и фатални проблеми",
     "Warnings, errors and fatal issues" : "Упозорења, грешке и фатални проблеми",
@@ -137,13 +126,14 @@
     "Last cron job execution: %s." : "Последњи извршени крон задатак: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Последњи извршени крон задатак: %s. Нешто изгледа није у реду.",
     "Cron was not executed yet!" : "Крон задатак још увек није извршен!",
+    "Open documentation" : "Отвори документацију",
     "Execute one task with each page loaded" : "Изврши један задатак са сваком учитаном страницом",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php је регистрован код  вебкрон сервиса за позивање cron.php сваких 15 минута преко протокола http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Користите системски крон сервис за позивање cron.php фајла сваких 15 минута.",
-    "Server Side Encryption" : "Шифровање на страни сервера",
     "Enable Server-Side-Encryption" : "Укључи шифровање на страни сервера",
     "This is used for sending out notifications." : "Ово се користи за слање обавештења.",
     "Send mode" : "Режим слања",
+    "Encryption" : "Шифровање",
     "From address" : "Са адресе",
     "mail" : "пошта",
     "Authentication method" : "Начин аутентификације",
@@ -173,6 +163,8 @@
     "Version" : "Верзија",
     "More apps" : "Још апликација",
     "Developer documentation" : "Програмерска документација",
+    "Experimental applications ahead" : "Експериментална апликација",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Експерименталне апликације се непроверене што се тиче безбедности и могу бити нестабилне и недовршене. Инсталирање може довести до губитка података или нарушавања безбедности.",
     "by" : "од",
     "licensed" : "лиценцирано",
     "Documentation:" : "Документација:",
@@ -184,15 +176,17 @@
     "Update to %s" : "Ажурирај на %s",
     "Enable only for specific groups" : "Укључи само за одређене групе",
     "Uninstall App" : "Деинсталирај апликацију",
+    "Enable experimental apps" : "Укључи експерименталне апликације",
     "No apps found for your version" : "Нема апликација за вашу верзију",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Поздрав,<br><br>само вас обавештавам да сад имате %s налог.<br><br>Ваше корисничко име: %s<br>Приступите му на: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Здраво!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Добродошли,\n\nСамо да знате да сада имате %s налог.\n\nВаше корисничко име: %s\nПриступите: %s\n",
-    "Administrator Documentation" : "Администраторска документација",
-    "Online Documentation" : "Мрежна документација",
+    "User documentation" : "Корисничка документација",
+    "Administrator documentation" : "Администраторска документација",
+    "Online documentation" : "Документација на мрежи",
     "Forum" : "Форум",
-    "Bugtracker" : "Праћење грешака",
-    "Commercial Support" : "Комерцијална подршка",
+    "Issue tracker" : "Пратилац проблема",
+    "Commercial support" : "Комерцијална подршка",
     "Get the apps to sync your files" : "Преузмите апликације ради синхронизовања ваших фајлова",
     "Desktop client" : "Клијент за рачунар",
     "Android app" : "Андроид апликација",
@@ -227,12 +221,6 @@
     "Issued By" : "Издавач",
     "Valid until %s" : "Важи до %s",
     "Import root certificate" : "Увоз кореног сертификата",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Апликација за шифровање више није укључена. Дешифрујте све ваше фајлове",
-    "Log-in password" : "Лозинка за пријаву",
-    "Decrypt all Files" : "Дешифруј све фајлове",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ваши шифрарски кључеви су премештени на резервну локацију. Ако нешто крене наопако, можете их повратити. Избришите их заувек само ако сте сигурни да су сви фајлови исправно дешифровани.",
-    "Restore Encryption Keys" : "Врати шифрарске кључеве",
-    "Delete Encryption Keys" : "Обриши шифрарске кључеве",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Развијено од {communityopen}заједнице сопственогОблака{linkclose}, {githubopen}изворни код{linkclose} је лиценциран под {licenseopen}<abbr title=\"Affero General Public License\">АГПЛ</abbr>{linkclose}.",
     "Show storage location" : "Прикажи локацију складишта",
     "Show last log in" : "Прикажи последњу пријаву",
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
index f102b3135b1..3a714b4c626 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -10,14 +10,7 @@ OC.L10N.register(
     "Authentication error" : "Fel vid autentisering",
     "Your full name has been changed." : "Hela ditt namn har ändrats",
     "Unable to change full name" : "Kunde inte ändra hela namnet",
-    "Files decrypted successfully" : "Filerna dekrypterades utan fel",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log eller fråga administratören",
-    "Couldn't decrypt your files, check your password and try again" : "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen",
-    "Encryption keys deleted permanently" : "Krypteringsnycklar raderades permanent",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Det gick inte att permanent ta bort dina krypteringsnycklar, kontrollera din owncloud.log eller fråga din administratör",
     "Couldn't remove app." : "Kunde inte ta bort applikationen.",
-    "Backups restored successfully" : "Återställning av säkerhetskopior lyckades",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kan inte återställa dina krypteringsnycklar, vänligen kontrollera din owncloud.log eller fråga din administratör.",
     "Language changed" : "Språk ändrades",
     "Invalid request" : "Ogiltig begäran",
     "Admins can't remove themself from the admin group" : "Administratörer kan inte ta bort sig själva från admingruppen",
@@ -31,7 +24,6 @@ OC.L10N.register(
     "Unable to change password" : "Kunde inte ändra lösenord",
     "Enabled" : "Aktiverad",
     "Not enabled" : "Inte aktiverad",
-    "Recommended" : "Rekomenderad",
     "Group already exists." : "Gruppen finns redan.",
     "Unable to add group." : "Lyckades inte lägga till grupp.",
     "Unable to delete group." : "Lyckades inte radera grupp.",
@@ -71,9 +63,6 @@ OC.L10N.register(
     "Strong password" : "Starkt lösenord",
     "Valid until {date}" : "Giltig t.o.m. {date}",
     "Delete" : "Radera",
-    "Decrypting files... Please wait, this can take some time." : "Dekrypterar filer ... Vänligen vänta, detta kan ta en stund.",
-    "Delete encryption keys permanently." : "Radera krypteringsnycklar permanent",
-    "Restore encryption keys." : "Återställ krypteringsnycklar",
     "Groups" : "Grupper",
     "Unable to delete {objName}" : "Kunde inte radera {objName}",
     "Error creating group" : "Fel vid skapande av grupp",
@@ -90,7 +79,6 @@ OC.L10N.register(
     "A valid email must be provided" : "En giltig e-postadress måste anges",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "SSL rotcertifikat",
-    "Encryption" : "Kryptering",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Allting (allvarliga fel, fel, varningar, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, varningar och allvarliga fel",
     "Warnings, errors and fatal issues" : "Varningar, fel och allvarliga fel",
@@ -131,6 +119,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Använd systemets cron-tjänst för att anropa cron.php var 15:e minut.",
     "This is used for sending out notifications." : "Detta används för att skicka ut notifieringar.",
     "Send mode" : "Sändningsläge",
+    "Encryption" : "Kryptering",
     "From address" : "Från adress",
     "mail" : "mail",
     "Authentication method" : "Autentiseringsmetod",
@@ -161,11 +150,7 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hej där,<br><br>vill bara informera dig om att du nu har ett %s konto.<br><br>Ditt användarnamn: %s<br>Accessa det genom: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Ha de fint!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hej där,\n\nvill bara informera dig om att du nu har ett %s konto.\n\nDitt användarnamn: %s\nAccessa det genom: %s\n",
-    "Administrator Documentation" : "Administratörsdokumentation",
-    "Online Documentation" : "Onlinedokumentation",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Kommersiell support",
     "Get the apps to sync your files" : "Skaffa apparna för att synkronisera dina filer",
     "Desktop client" : "Skrivbordsklient",
     "Android app" : "Android-app",
@@ -196,12 +181,6 @@ OC.L10N.register(
     "Valid until" : "Giltigt till",
     "Issued By" : "Utfärdat av",
     "Valid until %s" : "Giltigt till %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer",
-    "Log-in password" : "Inloggningslösenord",
-    "Decrypt all Files" : "Dekryptera alla filer",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Dina krypteringsnycklar flyttas till en backup. Om något gick fel kan du återställa nycklarna. Bara ta bort dem permanent om du är säker på att alla filer dekrypteras korrekt.",
-    "Restore Encryption Keys" : "Återställ krypteringsnycklar",
-    "Delete Encryption Keys" : "Radera krypteringsnycklar",
     "Show storage location" : "Visa lagringsplats",
     "Show last log in" : "Visa senaste inloggning",
     "Show user backend" : "Visa användar-back-end",
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index cb477affb73..3c4460fd086 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -8,14 +8,7 @@
     "Authentication error" : "Fel vid autentisering",
     "Your full name has been changed." : "Hela ditt namn har ändrats",
     "Unable to change full name" : "Kunde inte ändra hela namnet",
-    "Files decrypted successfully" : "Filerna dekrypterades utan fel",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log eller fråga administratören",
-    "Couldn't decrypt your files, check your password and try again" : "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen",
-    "Encryption keys deleted permanently" : "Krypteringsnycklar raderades permanent",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Det gick inte att permanent ta bort dina krypteringsnycklar, kontrollera din owncloud.log eller fråga din administratör",
     "Couldn't remove app." : "Kunde inte ta bort applikationen.",
-    "Backups restored successfully" : "Återställning av säkerhetskopior lyckades",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kan inte återställa dina krypteringsnycklar, vänligen kontrollera din owncloud.log eller fråga din administratör.",
     "Language changed" : "Språk ändrades",
     "Invalid request" : "Ogiltig begäran",
     "Admins can't remove themself from the admin group" : "Administratörer kan inte ta bort sig själva från admingruppen",
@@ -29,7 +22,6 @@
     "Unable to change password" : "Kunde inte ändra lösenord",
     "Enabled" : "Aktiverad",
     "Not enabled" : "Inte aktiverad",
-    "Recommended" : "Rekomenderad",
     "Group already exists." : "Gruppen finns redan.",
     "Unable to add group." : "Lyckades inte lägga till grupp.",
     "Unable to delete group." : "Lyckades inte radera grupp.",
@@ -69,9 +61,6 @@
     "Strong password" : "Starkt lösenord",
     "Valid until {date}" : "Giltig t.o.m. {date}",
     "Delete" : "Radera",
-    "Decrypting files... Please wait, this can take some time." : "Dekrypterar filer ... Vänligen vänta, detta kan ta en stund.",
-    "Delete encryption keys permanently." : "Radera krypteringsnycklar permanent",
-    "Restore encryption keys." : "Återställ krypteringsnycklar",
     "Groups" : "Grupper",
     "Unable to delete {objName}" : "Kunde inte radera {objName}",
     "Error creating group" : "Fel vid skapande av grupp",
@@ -88,7 +77,6 @@
     "A valid email must be provided" : "En giltig e-postadress måste anges",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "SSL rotcertifikat",
-    "Encryption" : "Kryptering",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Allting (allvarliga fel, fel, varningar, info, debug)",
     "Info, warnings, errors and fatal issues" : "Info, varningar och allvarliga fel",
     "Warnings, errors and fatal issues" : "Varningar, fel och allvarliga fel",
@@ -129,6 +117,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Använd systemets cron-tjänst för att anropa cron.php var 15:e minut.",
     "This is used for sending out notifications." : "Detta används för att skicka ut notifieringar.",
     "Send mode" : "Sändningsläge",
+    "Encryption" : "Kryptering",
     "From address" : "Från adress",
     "mail" : "mail",
     "Authentication method" : "Autentiseringsmetod",
@@ -159,11 +148,7 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hej där,<br><br>vill bara informera dig om att du nu har ett %s konto.<br><br>Ditt användarnamn: %s<br>Accessa det genom: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Ha de fint!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hej där,\n\nvill bara informera dig om att du nu har ett %s konto.\n\nDitt användarnamn: %s\nAccessa det genom: %s\n",
-    "Administrator Documentation" : "Administratörsdokumentation",
-    "Online Documentation" : "Onlinedokumentation",
     "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Kommersiell support",
     "Get the apps to sync your files" : "Skaffa apparna för att synkronisera dina filer",
     "Desktop client" : "Skrivbordsklient",
     "Android app" : "Android-app",
@@ -194,12 +179,6 @@
     "Valid until" : "Giltigt till",
     "Issued By" : "Utfärdat av",
     "Valid until %s" : "Giltigt till %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer",
-    "Log-in password" : "Inloggningslösenord",
-    "Decrypt all Files" : "Dekryptera alla filer",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Dina krypteringsnycklar flyttas till en backup. Om något gick fel kan du återställa nycklarna. Bara ta bort dem permanent om du är säker på att alla filer dekrypteras korrekt.",
-    "Restore Encryption Keys" : "Återställ krypteringsnycklar",
-    "Delete Encryption Keys" : "Radera krypteringsnycklar",
     "Show storage location" : "Visa lagringsplats",
     "Show last log in" : "Visa senaste inloggning",
     "Show user backend" : "Visa användar-back-end",
diff --git a/settings/l10n/ta_LK.js b/settings/l10n/ta_LK.js
index fc6dde15389..f611af9eb14 100644
--- a/settings/l10n/ta_LK.js
+++ b/settings/l10n/ta_LK.js
@@ -17,9 +17,9 @@ OC.L10N.register(
     "never" : "ஒருபோதும்",
     "__language_name__" : "_மொழி_பெயர்_",
     "SSL root certificates" : "SSL வேர் சான்றிதழ்கள்",
-    "Encryption" : "மறைக்குறியீடு",
     "None" : "ஒன்றுமில்லை",
     "Login" : "புகுபதிகை",
+    "Encryption" : "மறைக்குறியீடு",
     "Server address" : "சேவையக முகவரி",
     "Port" : "துறை ",
     "Credentials" : "சான்று ஆவணங்கள்",
diff --git a/settings/l10n/ta_LK.json b/settings/l10n/ta_LK.json
index 6cf956b905b..1a16f5f7b3e 100644
--- a/settings/l10n/ta_LK.json
+++ b/settings/l10n/ta_LK.json
@@ -15,9 +15,9 @@
     "never" : "ஒருபோதும்",
     "__language_name__" : "_மொழி_பெயர்_",
     "SSL root certificates" : "SSL வேர் சான்றிதழ்கள்",
-    "Encryption" : "மறைக்குறியீடு",
     "None" : "ஒன்றுமில்லை",
     "Login" : "புகுபதிகை",
+    "Encryption" : "மறைக்குறியீடு",
     "Server address" : "சேவையக முகவரி",
     "Port" : "துறை ",
     "Credentials" : "சான்று ஆவணங்கள்",
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index 47dfa3ab93f..d17362b1b3c 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -27,12 +27,12 @@ OC.L10N.register(
     "never" : "ไม่ต้องเลย",
     "__language_name__" : "ภาษาไทย",
     "SSL root certificates" : "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
-    "Encryption" : "การเข้ารหัส",
     "None" : "ไม่มี",
     "Login" : "เข้าสู่ระบบ",
     "Allow apps to use the Share API" : "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
     "Allow resharing" : "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้",
     "Execute one task with each page loaded" : "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
+    "Encryption" : "การเข้ารหัส",
     "Server address" : "ที่อยู่เซิร์ฟเวอร์",
     "Port" : "พอร์ต",
     "Credentials" : "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
@@ -42,11 +42,7 @@ OC.L10N.register(
     "Version" : "รุ่น",
     "by" : "โดย",
     "User Documentation" : "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
-    "Administrator Documentation" : "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
-    "Online Documentation" : "เอกสารคู่มือการใช้งานออนไลน์",
     "Forum" : "กระดานสนทนา",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "บริการลูกค้าแบบเสียค่าใช้จ่าย",
     "Show First Run Wizard again" : "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>",
     "Password" : "รหัสผ่าน",
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index f97afd82dbf..7519442d4fe 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -25,12 +25,12 @@
     "never" : "ไม่ต้องเลย",
     "__language_name__" : "ภาษาไทย",
     "SSL root certificates" : "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
-    "Encryption" : "การเข้ารหัส",
     "None" : "ไม่มี",
     "Login" : "เข้าสู่ระบบ",
     "Allow apps to use the Share API" : "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
     "Allow resharing" : "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้",
     "Execute one task with each page loaded" : "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
+    "Encryption" : "การเข้ารหัส",
     "Server address" : "ที่อยู่เซิร์ฟเวอร์",
     "Port" : "พอร์ต",
     "Credentials" : "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
@@ -40,11 +40,7 @@
     "Version" : "รุ่น",
     "by" : "โดย",
     "User Documentation" : "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
-    "Administrator Documentation" : "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
-    "Online Documentation" : "เอกสารคู่มือการใช้งานออนไลน์",
     "Forum" : "กระดานสนทนา",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "บริการลูกค้าแบบเสียค่าใช้จ่าย",
     "Show First Run Wizard again" : "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>",
     "Password" : "รหัสผ่าน",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 992e8211e8c..38d029b037b 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Güvenlik ve kurulum uyarıları",
     "Sharing" : "Paylaşım",
     "External Storage" : "Harici Depolama",
+    "Server Side Encryption" : "Sunucu Taraflı Şifreleme",
     "Cron" : "Cron",
     "Email Server" : "E-Posta Sunucusu",
     "Log" : "Günlük",
@@ -12,14 +13,7 @@ OC.L10N.register(
     "Authentication error" : "Kimlik doğrulama hatası",
     "Your full name has been changed." : "Tam adınız değiştirildi.",
     "Unable to change full name" : "Tam adınız değiştirilirken hata",
-    "Files decrypted successfully" : "Dosyaların şifrelemesi başarıyla kaldırıldı",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dosyalarınızın şifrelemesi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin",
-    "Couldn't decrypt your files, check your password and try again" : "Dosyalarınızın şifrelemesi kaldırılamadı, parolanızı denetleyip yeniden deneyin",
-    "Encryption keys deleted permanently" : "Şifreleme anahtarları kalıcı olarak silindi",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Şifreleme anahtarlarınız kalıcı olarak silinemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
     "Couldn't remove app." : "Uygulama kaldırılamadı.",
-    "Backups restored successfully" : "Yedekler başarıyla geri yüklendi",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Şifreleme anahtarlarınız geri yüklenemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
     "Language changed" : "Dil değiştirildi",
     "Invalid request" : "Geçersiz istek",
     "Admins can't remove themself from the admin group" : "Yöneticiler kendilerini admin grubundan kaldıramaz",
@@ -34,7 +28,6 @@ OC.L10N.register(
     "Unable to change password" : "Parola değiştirilemiyor",
     "Enabled" : "Etkin",
     "Not enabled" : "Etkin değil",
-    "Recommended" : "Önerilen",
     "Group already exists." : "Grup zaten mevcut.",
     "Unable to add group." : "Grup ekleme başarısız.",
     "Unable to delete group." : "Grubu silme başarısız.",
@@ -76,9 +69,6 @@ OC.L10N.register(
     "Strong password" : "Güçlü parola",
     "Valid until {date}" : "{date} tarihine kadar geçerli",
     "Delete" : "Sil",
-    "Decrypting files... Please wait, this can take some time." : "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir.",
-    "Delete encryption keys permanently." : "Şifreleme anahtarlarını kalıcı olarak sil.",
-    "Restore encryption keys." : "Şifreleme anahtarlarını geri yükle.",
     "Groups" : "Gruplar",
     "Unable to delete {objName}" : "{objName} silinemiyor",
     "Error creating group" : "Grup oluşturulurken hata",
@@ -98,7 +88,6 @@ OC.L10N.register(
     "Sync clients" : "Eşitleme istemcileri",
     "Personal info" : "Kişisel bilgi",
     "SSL root certificates" : "SSL kök sertifikaları",
-    "Encryption" : "Şifreleme",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
     "Info, warnings, errors and fatal issues" : "Bilgi, uyarılar, hatalar ve ciddi sorunlar",
     "Warnings, errors and fatal issues" : "Uyarılar, hatalar ve ciddi sorunlar",
@@ -142,10 +131,10 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
-    "Server Side Encryption" : "Sunucu Taraflı Şifreleme",
     "Enable Server-Side-Encryption" : "Sunucu Taraflı Şifrelemeyi Etkinleştir",
     "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
     "Send mode" : "Gönderme kipi",
+    "Encryption" : "Şifreleme",
     "From address" : "Kimden adresi",
     "mail" : "posta",
     "Authentication method" : "Kimlik doğrulama yöntemi",
@@ -190,11 +179,7 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Merhaba,<br><br>Sadece artık bir %s hesabınızın olduğunu söylemek istedim.<br><br>Kullanıcı adınız: %s<br>Şuradan erişin: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Hoşçakalın!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Merhaba,\n\nSadece, artık bir %s hesabınızın olduğunu söylemek istedim.\n\nKullanıcı adınız: %s\nErişim: %s\n\n",
-    "Administrator Documentation" : "Yönetici Belgelendirmesi",
-    "Online Documentation" : "Çevrimiçi Belgelendirme",
     "Forum" : "Forum",
-    "Bugtracker" : "Hata Takip Sistemi",
-    "Commercial Support" : "Ticari Destek",
     "Get the apps to sync your files" : "Dosyalarınızı eşitlemek için uygulamaları indirin",
     "Desktop client" : "Masaüstü istemcisi",
     "Android app" : "Android uygulaması",
@@ -229,12 +214,6 @@ OC.L10N.register(
     "Issued By" : "Veren",
     "Valid until %s" : "%s tarihine kadar geçerli",
     "Import root certificate" : "Kök sertifikalarını içe aktar",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Şifreleme uygulaması artık etkin değil, lütfen tüm dosyalarınızın şifrelemesini kaldırın",
-    "Log-in password" : "Oturum açma parolası",
-    "Decrypt all Files" : "Tüm Dosyaların Şifrelemesini Kaldır",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın şifrelemelerinin düzgün bir şekilde kaldırıldığından eminseniz kalıcı olarak silin.",
-    "Restore Encryption Keys" : "Şifreleme Anahtarlarını Geri Yükle",
-    "Delete Encryption Keys" : "Şifreleme Anahtarlarını Sil",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud topluluğu tarafından{linkclose} geliştirildi. {githubopen}Kaynak kodu{linkclose}, {licenseopen}<abbr title=\"Affero Genel Kamu Lisansı\">AGPL</abbr>{linkclose} ile lisanslanmıştır.",
     "Show storage location" : "Depolama konumunu göster",
     "Show last log in" : "Son oturum açılma zamanını göster",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 9accebc4094..162af10663f 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -2,6 +2,7 @@
     "Security & setup warnings" : "Güvenlik ve kurulum uyarıları",
     "Sharing" : "Paylaşım",
     "External Storage" : "Harici Depolama",
+    "Server Side Encryption" : "Sunucu Taraflı Şifreleme",
     "Cron" : "Cron",
     "Email Server" : "E-Posta Sunucusu",
     "Log" : "Günlük",
@@ -10,14 +11,7 @@
     "Authentication error" : "Kimlik doğrulama hatası",
     "Your full name has been changed." : "Tam adınız değiştirildi.",
     "Unable to change full name" : "Tam adınız değiştirilirken hata",
-    "Files decrypted successfully" : "Dosyaların şifrelemesi başarıyla kaldırıldı",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dosyalarınızın şifrelemesi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin",
-    "Couldn't decrypt your files, check your password and try again" : "Dosyalarınızın şifrelemesi kaldırılamadı, parolanızı denetleyip yeniden deneyin",
-    "Encryption keys deleted permanently" : "Şifreleme anahtarları kalıcı olarak silindi",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Şifreleme anahtarlarınız kalıcı olarak silinemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
     "Couldn't remove app." : "Uygulama kaldırılamadı.",
-    "Backups restored successfully" : "Yedekler başarıyla geri yüklendi",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Şifreleme anahtarlarınız geri yüklenemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
     "Language changed" : "Dil değiştirildi",
     "Invalid request" : "Geçersiz istek",
     "Admins can't remove themself from the admin group" : "Yöneticiler kendilerini admin grubundan kaldıramaz",
@@ -32,7 +26,6 @@
     "Unable to change password" : "Parola değiştirilemiyor",
     "Enabled" : "Etkin",
     "Not enabled" : "Etkin değil",
-    "Recommended" : "Önerilen",
     "Group already exists." : "Grup zaten mevcut.",
     "Unable to add group." : "Grup ekleme başarısız.",
     "Unable to delete group." : "Grubu silme başarısız.",
@@ -74,9 +67,6 @@
     "Strong password" : "Güçlü parola",
     "Valid until {date}" : "{date} tarihine kadar geçerli",
     "Delete" : "Sil",
-    "Decrypting files... Please wait, this can take some time." : "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir.",
-    "Delete encryption keys permanently." : "Şifreleme anahtarlarını kalıcı olarak sil.",
-    "Restore encryption keys." : "Şifreleme anahtarlarını geri yükle.",
     "Groups" : "Gruplar",
     "Unable to delete {objName}" : "{objName} silinemiyor",
     "Error creating group" : "Grup oluşturulurken hata",
@@ -96,7 +86,6 @@
     "Sync clients" : "Eşitleme istemcileri",
     "Personal info" : "Kişisel bilgi",
     "SSL root certificates" : "SSL kök sertifikaları",
-    "Encryption" : "Şifreleme",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
     "Info, warnings, errors and fatal issues" : "Bilgi, uyarılar, hatalar ve ciddi sorunlar",
     "Warnings, errors and fatal issues" : "Uyarılar, hatalar ve ciddi sorunlar",
@@ -140,10 +129,10 @@
     "Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
-    "Server Side Encryption" : "Sunucu Taraflı Şifreleme",
     "Enable Server-Side-Encryption" : "Sunucu Taraflı Şifrelemeyi Etkinleştir",
     "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
     "Send mode" : "Gönderme kipi",
+    "Encryption" : "Şifreleme",
     "From address" : "Kimden adresi",
     "mail" : "posta",
     "Authentication method" : "Kimlik doğrulama yöntemi",
@@ -188,11 +177,7 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Merhaba,<br><br>Sadece artık bir %s hesabınızın olduğunu söylemek istedim.<br><br>Kullanıcı adınız: %s<br>Şuradan erişin: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Hoşçakalın!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Merhaba,\n\nSadece, artık bir %s hesabınızın olduğunu söylemek istedim.\n\nKullanıcı adınız: %s\nErişim: %s\n\n",
-    "Administrator Documentation" : "Yönetici Belgelendirmesi",
-    "Online Documentation" : "Çevrimiçi Belgelendirme",
     "Forum" : "Forum",
-    "Bugtracker" : "Hata Takip Sistemi",
-    "Commercial Support" : "Ticari Destek",
     "Get the apps to sync your files" : "Dosyalarınızı eşitlemek için uygulamaları indirin",
     "Desktop client" : "Masaüstü istemcisi",
     "Android app" : "Android uygulaması",
@@ -227,12 +212,6 @@
     "Issued By" : "Veren",
     "Valid until %s" : "%s tarihine kadar geçerli",
     "Import root certificate" : "Kök sertifikalarını içe aktar",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Şifreleme uygulaması artık etkin değil, lütfen tüm dosyalarınızın şifrelemesini kaldırın",
-    "Log-in password" : "Oturum açma parolası",
-    "Decrypt all Files" : "Tüm Dosyaların Şifrelemesini Kaldır",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın şifrelemelerinin düzgün bir şekilde kaldırıldığından eminseniz kalıcı olarak silin.",
-    "Restore Encryption Keys" : "Şifreleme Anahtarlarını Geri Yükle",
-    "Delete Encryption Keys" : "Şifreleme Anahtarlarını Sil",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud topluluğu tarafından{linkclose} geliştirildi. {githubopen}Kaynak kodu{linkclose}, {licenseopen}<abbr title=\"Affero Genel Kamu Lisansı\">AGPL</abbr>{linkclose} ile lisanslanmıştır.",
     "Show storage location" : "Depolama konumunu göster",
     "Show last log in" : "Son oturum açılma zamanını göster",
diff --git a/settings/l10n/ug.js b/settings/l10n/ug.js
index f1247a78ff7..10aabf2ef3f 100644
--- a/settings/l10n/ug.js
+++ b/settings/l10n/ug.js
@@ -27,9 +27,9 @@ OC.L10N.register(
     "Error creating user" : "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
     "A valid password must be provided" : "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك",
     "__language_name__" : "ئۇيغۇرچە",
-    "Encryption" : "شىفىرلاش",
     "None" : "يوق",
     "Login" : "تىزىمغا كىرىڭ",
+    "Encryption" : "شىفىرلاش",
     "Server address" : "مۇلازىمېتىر ئادرىسى",
     "Port" : "ئېغىز",
     "Log level" : "خاتىرە دەرىجىسى",
@@ -38,8 +38,6 @@ OC.L10N.register(
     "Version" : "نەشرى",
     "by" : "سەنئەتكار",
     "User Documentation" : "ئىشلەتكۈچى قوللانمىسى",
-    "Administrator Documentation" : "باشقۇرغۇچى قوللانمىسى",
-    "Online Documentation" : "توردىكى قوللانما",
     "Forum" : "مۇنبەر",
     "Password" : "ئىم",
     "Unable to change your password" : "ئىمنى ئۆزگەرتكىلى بولمايدۇ.",
diff --git a/settings/l10n/ug.json b/settings/l10n/ug.json
index 64750146781..e0aee364036 100644
--- a/settings/l10n/ug.json
+++ b/settings/l10n/ug.json
@@ -25,9 +25,9 @@
     "Error creating user" : "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
     "A valid password must be provided" : "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك",
     "__language_name__" : "ئۇيغۇرچە",
-    "Encryption" : "شىفىرلاش",
     "None" : "يوق",
     "Login" : "تىزىمغا كىرىڭ",
+    "Encryption" : "شىفىرلاش",
     "Server address" : "مۇلازىمېتىر ئادرىسى",
     "Port" : "ئېغىز",
     "Log level" : "خاتىرە دەرىجىسى",
@@ -36,8 +36,6 @@
     "Version" : "نەشرى",
     "by" : "سەنئەتكار",
     "User Documentation" : "ئىشلەتكۈچى قوللانمىسى",
-    "Administrator Documentation" : "باشقۇرغۇچى قوللانمىسى",
-    "Online Documentation" : "توردىكى قوللانما",
     "Forum" : "مۇنبەر",
     "Password" : "ئىم",
     "Unable to change your password" : "ئىمنى ئۆزگەرتكىلى بولمايدۇ.",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index 0f4fd184b76..e4d4dedb3f4 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -10,14 +10,7 @@ OC.L10N.register(
     "Authentication error" : "Помилка автентифікації",
     "Your full name has been changed." : "Ваше ім'я було змінене",
     "Unable to change full name" : "Неможливо змінити ім'я",
-    "Files decrypted successfully" : "Файли розшифровані успішно",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Помилка розшифровки файлів, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
-    "Couldn't decrypt your files, check your password and try again" : "Помилка розшифровки файлів, перевірте пароль та спробуйте ще раз",
-    "Encryption keys deleted permanently" : "Ключі шифрування видалені назавжди",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Неможливо видалити назавжди ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
     "Couldn't remove app." : "Неможливо видалити додаток.",
-    "Backups restored successfully" : "Резервна копія успішно відновлена",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Неможливо відновити ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
     "Language changed" : "Мова змінена",
     "Invalid request" : "Некоректний запит",
     "Admins can't remove themself from the admin group" : "Адміністратор не може видалити себе з групи адмінів",
@@ -32,7 +25,6 @@ OC.L10N.register(
     "Unable to change password" : "Неможливо змінити пароль",
     "Enabled" : "Увімкнено",
     "Not enabled" : "Вимкнено",
-    "Recommended" : "Рекомендуємо",
     "Group already exists." : "Група вже існує.",
     "Unable to add group." : "Неможливо додати групу.",
     "Unable to delete group." : "Неможливо видалити групу.",
@@ -74,9 +66,6 @@ OC.L10N.register(
     "Strong password" : "Надійний пароль",
     "Valid until {date}" : "Дійсно до {date}",
     "Delete" : "Видалити",
-    "Decrypting files... Please wait, this can take some time." : "Розшифровка файлів... Будь ласка, зачекайте, це може зайняти деякий час.",
-    "Delete encryption keys permanently." : "Видалити ключі шифрування назавжди.",
-    "Restore encryption keys." : "Відновити ключі шифрування.",
     "Groups" : "Групи",
     "Unable to delete {objName}" : "Не вдалося видалити {objName}",
     "Error creating group" : "Помилка створення групи",
@@ -94,7 +83,6 @@ OC.L10N.register(
     "A valid email must be provided" : "Вкажіть дійсний e-mail",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "SSL корневі сертифікати",
-    "Encryption" : "Шифрування",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Усі (критичні проблеми, помилки, попередження, інформаційні, налагодження)",
     "Info, warnings, errors and fatal issues" : "Інформаційні, попередження, помилки та критичні проблеми",
     "Warnings, errors and fatal issues" : "Попередження, помилки та критичні проблеми",
@@ -139,6 +127,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Використовувати системний cron для виклику cron.php кожні 15 хвилин.",
     "This is used for sending out notifications." : "Використовується для відсилання повідомлень.",
     "Send mode" : "Надіслати повідомлення",
+    "Encryption" : "Шифрування",
     "From address" : "Адреса відправника",
     "mail" : "пошта",
     "Authentication method" : "Метод перевірки автентифікації",
@@ -175,11 +164,7 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Агов,<br><br>просто щоб ви знали, у вас є аккаунт %s.<br><br>Ваше ім'я користувача: %s<br>Перейдіть сюди: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Будьмо!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Агов,\n\nпросто щоб ви знали, у вас є аккаунт %s.\n\nВаше ім'я користувача: %s\nПерейдіть сюди: %s\n\n",
-    "Administrator Documentation" : "Документація Адміністратора",
-    "Online Documentation" : "Он-Лайн Документація",
     "Forum" : "Форум",
-    "Bugtracker" : "БагТрекер",
-    "Commercial Support" : "Комерційна підтримка",
     "Get the apps to sync your files" : "Отримати додатки для синхронізації ваших файлів",
     "Desktop client" : "Клієнт для ПК",
     "Android app" : "Android-додаток",
@@ -212,12 +197,6 @@ OC.L10N.register(
     "Valid until" : "Дійсно до",
     "Issued By" : "Виданий",
     "Valid until %s" : "Дійсно до %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Додаток для шифрування вимкнено, будь ласка, розшифруйте ваші файли",
-    "Log-in password" : "Пароль входу",
-    "Decrypt all Files" : "Розшифрувати всі файли",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ваші ключі шифрування переміщено до теки резервного копіювання. Якщо щось піде не так, ви зможете відновити їх. Видаляйте ключі лише в тому випадку, коли всі файли розшифровані.",
-    "Restore Encryption Keys" : "Відновити ключі шифрування",
-    "Delete Encryption Keys" : "Видалити ключі шифрування",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Розроблено {communityopen} спільнотою ownCloud {linkclose}, {githubopen} вихідний код {linkclose} ліцензується відповідно до {licenseopen} <abbr title = \"Публічної ліцензії Affero General\"> AGPL </ abbr> {linkclose}.",
     "Show storage location" : "Показати місцезнаходження сховища",
     "Show last log in" : "Показати останній вхід в систему",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index 484a164f0ee..f36feec3a67 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -8,14 +8,7 @@
     "Authentication error" : "Помилка автентифікації",
     "Your full name has been changed." : "Ваше ім'я було змінене",
     "Unable to change full name" : "Неможливо змінити ім'я",
-    "Files decrypted successfully" : "Файли розшифровані успішно",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Помилка розшифровки файлів, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
-    "Couldn't decrypt your files, check your password and try again" : "Помилка розшифровки файлів, перевірте пароль та спробуйте ще раз",
-    "Encryption keys deleted permanently" : "Ключі шифрування видалені назавжди",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Неможливо видалити назавжди ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
     "Couldn't remove app." : "Неможливо видалити додаток.",
-    "Backups restored successfully" : "Резервна копія успішно відновлена",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Неможливо відновити ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
     "Language changed" : "Мова змінена",
     "Invalid request" : "Некоректний запит",
     "Admins can't remove themself from the admin group" : "Адміністратор не може видалити себе з групи адмінів",
@@ -30,7 +23,6 @@
     "Unable to change password" : "Неможливо змінити пароль",
     "Enabled" : "Увімкнено",
     "Not enabled" : "Вимкнено",
-    "Recommended" : "Рекомендуємо",
     "Group already exists." : "Група вже існує.",
     "Unable to add group." : "Неможливо додати групу.",
     "Unable to delete group." : "Неможливо видалити групу.",
@@ -72,9 +64,6 @@
     "Strong password" : "Надійний пароль",
     "Valid until {date}" : "Дійсно до {date}",
     "Delete" : "Видалити",
-    "Decrypting files... Please wait, this can take some time." : "Розшифровка файлів... Будь ласка, зачекайте, це може зайняти деякий час.",
-    "Delete encryption keys permanently." : "Видалити ключі шифрування назавжди.",
-    "Restore encryption keys." : "Відновити ключі шифрування.",
     "Groups" : "Групи",
     "Unable to delete {objName}" : "Не вдалося видалити {objName}",
     "Error creating group" : "Помилка створення групи",
@@ -92,7 +81,6 @@
     "A valid email must be provided" : "Вкажіть дійсний e-mail",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "SSL корневі сертифікати",
-    "Encryption" : "Шифрування",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Усі (критичні проблеми, помилки, попередження, інформаційні, налагодження)",
     "Info, warnings, errors and fatal issues" : "Інформаційні, попередження, помилки та критичні проблеми",
     "Warnings, errors and fatal issues" : "Попередження, помилки та критичні проблеми",
@@ -137,6 +125,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Використовувати системний cron для виклику cron.php кожні 15 хвилин.",
     "This is used for sending out notifications." : "Використовується для відсилання повідомлень.",
     "Send mode" : "Надіслати повідомлення",
+    "Encryption" : "Шифрування",
     "From address" : "Адреса відправника",
     "mail" : "пошта",
     "Authentication method" : "Метод перевірки автентифікації",
@@ -173,11 +162,7 @@
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Агов,<br><br>просто щоб ви знали, у вас є аккаунт %s.<br><br>Ваше ім'я користувача: %s<br>Перейдіть сюди: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Будьмо!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Агов,\n\nпросто щоб ви знали, у вас є аккаунт %s.\n\nВаше ім'я користувача: %s\nПерейдіть сюди: %s\n\n",
-    "Administrator Documentation" : "Документація Адміністратора",
-    "Online Documentation" : "Он-Лайн Документація",
     "Forum" : "Форум",
-    "Bugtracker" : "БагТрекер",
-    "Commercial Support" : "Комерційна підтримка",
     "Get the apps to sync your files" : "Отримати додатки для синхронізації ваших файлів",
     "Desktop client" : "Клієнт для ПК",
     "Android app" : "Android-додаток",
@@ -210,12 +195,6 @@
     "Valid until" : "Дійсно до",
     "Issued By" : "Виданий",
     "Valid until %s" : "Дійсно до %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "Додаток для шифрування вимкнено, будь ласка, розшифруйте ваші файли",
-    "Log-in password" : "Пароль входу",
-    "Decrypt all Files" : "Розшифрувати всі файли",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ваші ключі шифрування переміщено до теки резервного копіювання. Якщо щось піде не так, ви зможете відновити їх. Видаляйте ключі лише в тому випадку, коли всі файли розшифровані.",
-    "Restore Encryption Keys" : "Відновити ключі шифрування",
-    "Delete Encryption Keys" : "Видалити ключі шифрування",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Розроблено {communityopen} спільнотою ownCloud {linkclose}, {githubopen} вихідний код {linkclose} ліцензується відповідно до {licenseopen} <abbr title = \"Публічної ліцензії Affero General\"> AGPL </ abbr> {linkclose}.",
     "Show storage location" : "Показати місцезнаходження сховища",
     "Show last log in" : "Показати останній вхід в систему",
diff --git a/settings/l10n/vi.js b/settings/l10n/vi.js
index 20425649788..cb3bd6c6670 100644
--- a/settings/l10n/vi.js
+++ b/settings/l10n/vi.js
@@ -30,12 +30,12 @@ OC.L10N.register(
     "never" : "không thay đổi",
     "__language_name__" : "__Ngôn ngữ___",
     "SSL root certificates" : "Chứng chỉ SSL root",
-    "Encryption" : "Mã hóa",
     "None" : "Không gì cả",
     "Login" : "Đăng nhập",
     "Allow apps to use the Share API" : "Cho phép các ứng dụng sử dụng chia sẻ API",
     "Allow resharing" : "Cho phép chia sẻ lại",
     "Execute one task with each page loaded" : "Thực thi tác vụ mỗi khi trang được tải",
+    "Encryption" : "Mã hóa",
     "Server address" : "Địa chỉ máy chủ",
     "Port" : "Cổng",
     "Credentials" : "Giấy chứng nhận",
@@ -45,11 +45,7 @@ OC.L10N.register(
     "by" : "bởi",
     "User Documentation" : "Tài liệu người sử dụng",
     "Cheers!" : "Chúc mừng!",
-    "Administrator Documentation" : "Tài liệu quản trị",
-    "Online Documentation" : "Tài liệu trực tuyến",
     "Forum" : "Diễn đàn",
-    "Bugtracker" : "Hệ ghi nhận lỗi",
-    "Commercial Support" : "Hỗ trợ có phí",
     "Get the apps to sync your files" : "Nhận ứng dụng để đồng bộ file của bạn",
     "Show First Run Wizard again" : "Hiện lại việc chạy đồ thuật khởi đầu",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>",
diff --git a/settings/l10n/vi.json b/settings/l10n/vi.json
index b5f5c564e10..f6ffc475ee2 100644
--- a/settings/l10n/vi.json
+++ b/settings/l10n/vi.json
@@ -28,12 +28,12 @@
     "never" : "không thay đổi",
     "__language_name__" : "__Ngôn ngữ___",
     "SSL root certificates" : "Chứng chỉ SSL root",
-    "Encryption" : "Mã hóa",
     "None" : "Không gì cả",
     "Login" : "Đăng nhập",
     "Allow apps to use the Share API" : "Cho phép các ứng dụng sử dụng chia sẻ API",
     "Allow resharing" : "Cho phép chia sẻ lại",
     "Execute one task with each page loaded" : "Thực thi tác vụ mỗi khi trang được tải",
+    "Encryption" : "Mã hóa",
     "Server address" : "Địa chỉ máy chủ",
     "Port" : "Cổng",
     "Credentials" : "Giấy chứng nhận",
@@ -43,11 +43,7 @@
     "by" : "bởi",
     "User Documentation" : "Tài liệu người sử dụng",
     "Cheers!" : "Chúc mừng!",
-    "Administrator Documentation" : "Tài liệu quản trị",
-    "Online Documentation" : "Tài liệu trực tuyến",
     "Forum" : "Diễn đàn",
-    "Bugtracker" : "Hệ ghi nhận lỗi",
-    "Commercial Support" : "Hỗ trợ có phí",
     "Get the apps to sync your files" : "Nhận ứng dụng để đồng bộ file của bạn",
     "Show First Run Wizard again" : "Hiện lại việc chạy đồ thuật khởi đầu",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index b0a808fb353..f8b40607816 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -10,14 +10,7 @@ OC.L10N.register(
     "Authentication error" : "认证错误",
     "Your full name has been changed." : "您的全名已修改。",
     "Unable to change full name" : "无法修改全名",
-    "Files decrypted successfully" : "文件解密成功",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "无法解密您的文件，请检查您的 owncloud.log 或询问管理员",
-    "Couldn't decrypt your files, check your password and try again" : "无法解密您的文件，请检查密码并重试。",
-    "Encryption keys deleted permanently" : "加密密钥已经永久删除",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "无法永久删除您的加密密钥，请检查 owncloud.log 或联系管理员",
     "Couldn't remove app." : "无法删除应用。",
-    "Backups restored successfully" : "恢复备份成功",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "无法恢复加密密钥，请检查 owncloud.log 或联系管理员",
     "Language changed" : "语言已修改",
     "Invalid request" : "无效请求",
     "Admins can't remove themself from the admin group" : "管理员不能将自己移出管理组。",
@@ -58,9 +51,6 @@ OC.L10N.register(
     "Strong password" : "强密码",
     "Valid until {date}" : "有效期至 {date}",
     "Delete" : "删除",
-    "Decrypting files... Please wait, this can take some time." : "正在解密文件... 请稍等，可能需要一些时间。",
-    "Delete encryption keys permanently." : "永久删除加密密钥。",
-    "Restore encryption keys." : "恢复加密密钥。",
     "Groups" : "组",
     "Unable to delete {objName}" : "无法删除 {objName}",
     "Error creating group" : "创建组时出错",
@@ -75,7 +65,6 @@ OC.L10N.register(
     "A valid password must be provided" : "必须提供合法的密码",
     "__language_name__" : "简体中文",
     "SSL root certificates" : "SSL根证书",
-    "Encryption" : "加密",
     "Everything (fatal issues, errors, warnings, info, debug)" : "所有（灾难性问题，错误，警告，信息，调试）",
     "Info, warnings, errors and fatal issues" : "信息，警告，错误和灾难性问题",
     "Warnings, errors and fatal issues" : "警告，错误和灾难性问题",
@@ -111,6 +100,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
     "This is used for sending out notifications." : "这被用于发送通知。",
     "Send mode" : "发送模式",
+    "Encryption" : "加密",
     "From address" : "来自地址",
     "mail" : "邮件",
     "Authentication method" : "认证方法",
@@ -135,11 +125,7 @@ OC.L10N.register(
     "Enable only for specific groups" : "仅对特定的组开放",
     "Uninstall App" : "下载应用",
     "Cheers!" : "干杯！",
-    "Administrator Documentation" : "管理员文档",
-    "Online Documentation" : "在线文档",
     "Forum" : "论坛",
-    "Bugtracker" : "问题跟踪器",
-    "Commercial Support" : "商业支持",
     "Get the apps to sync your files" : "安装应用进行文件同步",
     "Show First Run Wizard again" : "再次显示首次运行向导",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>",
@@ -165,12 +151,6 @@ OC.L10N.register(
     "Valid until" : "有效期至",
     "Issued By" : "授权由",
     "Valid until %s" : "有效期至 %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "加密 app 不再被启用，请解密您所有的文件",
-    "Log-in password" : "登录密码",
-    "Decrypt all Files" : "解密所有文件",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "您的加密密钥已经移动到一个备份位置。如果发生了错误您可以恢复密钥，当确认所有文件已经正确解密时才可永久删除密钥。",
-    "Restore Encryption Keys" : "恢复加密密钥",
-    "Delete Encryption Keys" : "删除加密密钥",
     "Show storage location" : "显示存储位置",
     "Show last log in" : "显示最后登录",
     "Username" : "用户名",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index 3b544e93396..f6394c2437a 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -8,14 +8,7 @@
     "Authentication error" : "认证错误",
     "Your full name has been changed." : "您的全名已修改。",
     "Unable to change full name" : "无法修改全名",
-    "Files decrypted successfully" : "文件解密成功",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "无法解密您的文件，请检查您的 owncloud.log 或询问管理员",
-    "Couldn't decrypt your files, check your password and try again" : "无法解密您的文件，请检查密码并重试。",
-    "Encryption keys deleted permanently" : "加密密钥已经永久删除",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "无法永久删除您的加密密钥，请检查 owncloud.log 或联系管理员",
     "Couldn't remove app." : "无法删除应用。",
-    "Backups restored successfully" : "恢复备份成功",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "无法恢复加密密钥，请检查 owncloud.log 或联系管理员",
     "Language changed" : "语言已修改",
     "Invalid request" : "无效请求",
     "Admins can't remove themself from the admin group" : "管理员不能将自己移出管理组。",
@@ -56,9 +49,6 @@
     "Strong password" : "强密码",
     "Valid until {date}" : "有效期至 {date}",
     "Delete" : "删除",
-    "Decrypting files... Please wait, this can take some time." : "正在解密文件... 请稍等，可能需要一些时间。",
-    "Delete encryption keys permanently." : "永久删除加密密钥。",
-    "Restore encryption keys." : "恢复加密密钥。",
     "Groups" : "组",
     "Unable to delete {objName}" : "无法删除 {objName}",
     "Error creating group" : "创建组时出错",
@@ -73,7 +63,6 @@
     "A valid password must be provided" : "必须提供合法的密码",
     "__language_name__" : "简体中文",
     "SSL root certificates" : "SSL根证书",
-    "Encryption" : "加密",
     "Everything (fatal issues, errors, warnings, info, debug)" : "所有（灾难性问题，错误，警告，信息，调试）",
     "Info, warnings, errors and fatal issues" : "信息，警告，错误和灾难性问题",
     "Warnings, errors and fatal issues" : "警告，错误和灾难性问题",
@@ -109,6 +98,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
     "This is used for sending out notifications." : "这被用于发送通知。",
     "Send mode" : "发送模式",
+    "Encryption" : "加密",
     "From address" : "来自地址",
     "mail" : "邮件",
     "Authentication method" : "认证方法",
@@ -133,11 +123,7 @@
     "Enable only for specific groups" : "仅对特定的组开放",
     "Uninstall App" : "下载应用",
     "Cheers!" : "干杯！",
-    "Administrator Documentation" : "管理员文档",
-    "Online Documentation" : "在线文档",
     "Forum" : "论坛",
-    "Bugtracker" : "问题跟踪器",
-    "Commercial Support" : "商业支持",
     "Get the apps to sync your files" : "安装应用进行文件同步",
     "Show First Run Wizard again" : "再次显示首次运行向导",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>",
@@ -163,12 +149,6 @@
     "Valid until" : "有效期至",
     "Issued By" : "授权由",
     "Valid until %s" : "有效期至 %s",
-    "The encryption app is no longer enabled, please decrypt all your files" : "加密 app 不再被启用，请解密您所有的文件",
-    "Log-in password" : "登录密码",
-    "Decrypt all Files" : "解密所有文件",
-    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "您的加密密钥已经移动到一个备份位置。如果发生了错误您可以恢复密钥，当确认所有文件已经正确解密时才可永久删除密钥。",
-    "Restore Encryption Keys" : "恢复加密密钥",
-    "Delete Encryption Keys" : "删除加密密钥",
     "Show storage location" : "显示存储位置",
     "Show last log in" : "显示最后登录",
     "Username" : "用户名",
diff --git a/settings/l10n/zh_HK.js b/settings/l10n/zh_HK.js
index 44d3e759b76..3211c4dc26d 100644
--- a/settings/l10n/zh_HK.js
+++ b/settings/l10n/zh_HK.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Wrong password" : "密碼錯誤",
     "Enabled" : "啟用",
     "Not enabled" : "未啟用",
-    "Recommended" : "建議",
     "Saved" : "已儲存",
     "test email settings" : "測試電子郵件設定",
     "Email sent" : "郵件已傳",
@@ -24,12 +23,12 @@ OC.L10N.register(
     "Delete" : "刪除",
     "Groups" : "群組",
     "undo" : "復原",
-    "Encryption" : "加密",
     "None" : "空",
     "Login" : "登入",
     "SSL" : "SSL",
     "TLS" : "TLS",
     "days" : "天",
+    "Encryption" : "加密",
     "Server address" : "伺服器地址",
     "Port" : "連接埠",
     "SMTP Username" : "SMTP 使用者名稱",
@@ -50,7 +49,6 @@ OC.L10N.register(
     "Cancel" : "取消",
     "Language" : "語言",
     "Help translate" : "幫忙翻譯",
-    "Log-in password" : "登入密碼",
     "Username" : "用戶名稱",
     "Create" : "新增",
     "Group" : "群組",
diff --git a/settings/l10n/zh_HK.json b/settings/l10n/zh_HK.json
index f860a6c82c6..9b76d35b796 100644
--- a/settings/l10n/zh_HK.json
+++ b/settings/l10n/zh_HK.json
@@ -6,7 +6,6 @@
     "Wrong password" : "密碼錯誤",
     "Enabled" : "啟用",
     "Not enabled" : "未啟用",
-    "Recommended" : "建議",
     "Saved" : "已儲存",
     "test email settings" : "測試電子郵件設定",
     "Email sent" : "郵件已傳",
@@ -22,12 +21,12 @@
     "Delete" : "刪除",
     "Groups" : "群組",
     "undo" : "復原",
-    "Encryption" : "加密",
     "None" : "空",
     "Login" : "登入",
     "SSL" : "SSL",
     "TLS" : "TLS",
     "days" : "天",
+    "Encryption" : "加密",
     "Server address" : "伺服器地址",
     "Port" : "連接埠",
     "SMTP Username" : "SMTP 使用者名稱",
@@ -48,7 +47,6 @@
     "Cancel" : "取消",
     "Language" : "語言",
     "Help translate" : "幫忙翻譯",
-    "Log-in password" : "登入密碼",
     "Username" : "用戶名稱",
     "Create" : "新增",
     "Group" : "群組",
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
index 8e9104c0c19..639b6f12617 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -10,12 +10,7 @@ OC.L10N.register(
     "Authentication error" : "認證錯誤",
     "Your full name has been changed." : "您的全名已變更。",
     "Unable to change full name" : "無法變更全名",
-    "Files decrypted successfully" : "檔案解密成功",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "無法解密您的檔案，請檢查您的 owncloud.log 或是詢問您的管理者",
-    "Couldn't decrypt your files, check your password and try again" : "無法解密您的檔案，確認您的密碼並再重試一次",
-    "Encryption keys deleted permanently" : "加密密鑰已永久刪除",
     "Couldn't remove app." : "無法移除應用程式",
-    "Backups restored successfully" : "備份檔回復成功",
     "Language changed" : "語言已變更",
     "Invalid request" : "無效請求",
     "Admins can't remove themself from the admin group" : "管理者帳號無法從管理者群組中移除",
@@ -29,7 +24,6 @@ OC.L10N.register(
     "Unable to change password" : "無法修改密碼",
     "Enabled" : "已啓用",
     "Not enabled" : "無啟動",
-    "Recommended" : "建議",
     "Group already exists." : "群組已存在",
     "Saved" : "已儲存",
     "test email settings" : "測試郵件設定",
@@ -53,7 +47,6 @@ OC.L10N.register(
     "Good password" : "好的密碼",
     "Strong password" : "很強的密碼",
     "Delete" : "刪除",
-    "Decrypting files... Please wait, this can take some time." : "檔案解密中，請稍候。",
     "Groups" : "群組",
     "undo" : "復原",
     "never" : "永不",
@@ -63,7 +56,6 @@ OC.L10N.register(
     "A valid password must be provided" : "一定要提供一個有效的密碼",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "SSL 根憑證",
-    "Encryption" : "加密",
     "Everything (fatal issues, errors, warnings, info, debug)" : "全部(嚴重問題,錯誤,警告,資訊,除錯)",
     "Info, warnings, errors and fatal issues" : "資訊,警告,錯誤和嚴重問題",
     "Warnings, errors and fatal issues" : "警告,錯誤和嚴重問題",
@@ -88,6 +80,7 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
     "This is used for sending out notifications." : "這是使用於寄送通知。",
     "Send mode" : "寄送模式",
+    "Encryption" : "加密",
     "From address" : "寄件地址",
     "Authentication method" : "驗證方式",
     "Authentication required" : "必須驗證",
@@ -108,11 +101,7 @@ OC.L10N.register(
     "User Documentation" : "用戶說明文件",
     "Admin Documentation" : "管理者文件",
     "Cheers!" : "太棒了！",
-    "Administrator Documentation" : "管理者說明文件",
-    "Online Documentation" : "線上說明文件",
     "Forum" : "論壇",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "商用支援",
     "Get the apps to sync your files" : "下載應用程式來同步您的檔案",
     "Show First Run Wizard again" : "再次顯示首次使用精靈",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>",
@@ -134,9 +123,6 @@ OC.L10N.register(
     "Choose as profile image" : "設定為大頭貼",
     "Language" : "語言",
     "Help translate" : "幫助翻譯",
-    "The encryption app is no longer enabled, please decrypt all your files" : "加密的軟體不能長時間啟用，請解密所有您的檔案",
-    "Log-in password" : "登入密碼",
-    "Decrypt all Files" : "解密所有檔案",
     "Username" : "使用者名稱",
     "Create" : "建立",
     "Admin Recovery Password" : "管理者復原密碼",
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index b836f990975..a22d8c37518 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -8,12 +8,7 @@
     "Authentication error" : "認證錯誤",
     "Your full name has been changed." : "您的全名已變更。",
     "Unable to change full name" : "無法變更全名",
-    "Files decrypted successfully" : "檔案解密成功",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "無法解密您的檔案，請檢查您的 owncloud.log 或是詢問您的管理者",
-    "Couldn't decrypt your files, check your password and try again" : "無法解密您的檔案，確認您的密碼並再重試一次",
-    "Encryption keys deleted permanently" : "加密密鑰已永久刪除",
     "Couldn't remove app." : "無法移除應用程式",
-    "Backups restored successfully" : "備份檔回復成功",
     "Language changed" : "語言已變更",
     "Invalid request" : "無效請求",
     "Admins can't remove themself from the admin group" : "管理者帳號無法從管理者群組中移除",
@@ -27,7 +22,6 @@
     "Unable to change password" : "無法修改密碼",
     "Enabled" : "已啓用",
     "Not enabled" : "無啟動",
-    "Recommended" : "建議",
     "Group already exists." : "群組已存在",
     "Saved" : "已儲存",
     "test email settings" : "測試郵件設定",
@@ -51,7 +45,6 @@
     "Good password" : "好的密碼",
     "Strong password" : "很強的密碼",
     "Delete" : "刪除",
-    "Decrypting files... Please wait, this can take some time." : "檔案解密中，請稍候。",
     "Groups" : "群組",
     "undo" : "復原",
     "never" : "永不",
@@ -61,7 +54,6 @@
     "A valid password must be provided" : "一定要提供一個有效的密碼",
     "__language_name__" : "__language_name__",
     "SSL root certificates" : "SSL 根憑證",
-    "Encryption" : "加密",
     "Everything (fatal issues, errors, warnings, info, debug)" : "全部(嚴重問題,錯誤,警告,資訊,除錯)",
     "Info, warnings, errors and fatal issues" : "資訊,警告,錯誤和嚴重問題",
     "Warnings, errors and fatal issues" : "警告,錯誤和嚴重問題",
@@ -86,6 +78,7 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
     "This is used for sending out notifications." : "這是使用於寄送通知。",
     "Send mode" : "寄送模式",
+    "Encryption" : "加密",
     "From address" : "寄件地址",
     "Authentication method" : "驗證方式",
     "Authentication required" : "必須驗證",
@@ -106,11 +99,7 @@
     "User Documentation" : "用戶說明文件",
     "Admin Documentation" : "管理者文件",
     "Cheers!" : "太棒了！",
-    "Administrator Documentation" : "管理者說明文件",
-    "Online Documentation" : "線上說明文件",
     "Forum" : "論壇",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "商用支援",
     "Get the apps to sync your files" : "下載應用程式來同步您的檔案",
     "Show First Run Wizard again" : "再次顯示首次使用精靈",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>",
@@ -132,9 +121,6 @@
     "Choose as profile image" : "設定為大頭貼",
     "Language" : "語言",
     "Help translate" : "幫助翻譯",
-    "The encryption app is no longer enabled, please decrypt all your files" : "加密的軟體不能長時間啟用，請解密所有您的檔案",
-    "Log-in password" : "登入密碼",
-    "Decrypt all Files" : "解密所有檔案",
     "Username" : "使用者名稱",
     "Create" : "建立",
     "Admin Recovery Password" : "管理者復原密碼",