[tx-robot] updated from transifex

696 files changed, 4852 insertions, 5646 deletions

diff --git a/apps/encryption/l10n/ar.js b/apps/encryption/l10n/ar.js
new file mode 100644
index 00000000000..e4f0499f9f1
--- /dev/null
+++ b/apps/encryption/l10n/ar.js
@@ -0,0 +1,28 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Recovery key successfully enabled" : "تم بنجاح تفعيل مفتاح الاستعادة",
+    "Could not enable recovery key. Please check your recovery key password!" : "لا يمكن تفعيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
+    "Recovery key successfully disabled" : "تم تعطيل مفتاح الاستعادة بنجاح",
+    "Could not disable recovery key. Please check your recovery key password!" : "لا يمكن تعطيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
+    "Password successfully changed." : "تم تغيير كلمة المرور بنجاح.",
+    "Could not change the password. Maybe the old password was not correct." : "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "تفعيل استعادة المفتاح (سوف يمكنك من استعادة ملفات المستخدمين في حال فقدان كلمة المرور):",
+    "Recovery key password" : "استعادة كلمة مرور المفتاح",
+    "Repeat Recovery key password" : "كرر كلمة المرور لـ استعادة المفتاح",
+    "Enabled" : "مفعلة",
+    "Disabled" : "معطلة",
+    "Change recovery key password:" : "تعديل كلمة المرور استعادة المفتاح:",
+    "Old Recovery key password" : "كلمة المرور القديمة لـ استعامة المفتاح",
+    "New Recovery key password" : "تعيين كلمة مرور جديدة لـ استعادة المفتاح",
+    "Repeat New Recovery key password" : "كرر كلمة المرور لـ استعادة المفتاح من جديد",
+    "Change Password" : "عدل كلمة السر",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "اذا كنت لاتتذكر كلمة السر تستطيع ان تطلب من المدير ان يستعيد ملفاتك.",
+    "Old log-in password" : "كلمة المرور القديمة الخاصة بالدخول",
+    "Current log-in password" : "كلمة المرور الحالية الخاصة بالدخول",
+    "Update Private Key Password" : "تحديث كلمة المرور لـ المفتاح الخاص",
+    "Enable password recovery:" : "تفعيل استعادة كلمة المرور:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "تفعيل هذا الخيار يمكنك من اعادة الوصول الى ملفاتك المشفرة عند فقدان كلمة المرور"
+},
+"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/apps/encryption/l10n/ar.json b/apps/encryption/l10n/ar.json
new file mode 100644
index 00000000000..dfb2066e42c
--- /dev/null
+++ b/apps/encryption/l10n/ar.json
@@ -0,0 +1,26 @@
+{ "translations": {
+    "Recovery key successfully enabled" : "تم بنجاح تفعيل مفتاح الاستعادة",
+    "Could not enable recovery key. Please check your recovery key password!" : "لا يمكن تفعيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
+    "Recovery key successfully disabled" : "تم تعطيل مفتاح الاستعادة بنجاح",
+    "Could not disable recovery key. Please check your recovery key password!" : "لا يمكن تعطيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
+    "Password successfully changed." : "تم تغيير كلمة المرور بنجاح.",
+    "Could not change the password. Maybe the old password was not correct." : "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "تفعيل استعادة المفتاح (سوف يمكنك من استعادة ملفات المستخدمين في حال فقدان كلمة المرور):",
+    "Recovery key password" : "استعادة كلمة مرور المفتاح",
+    "Repeat Recovery key password" : "كرر كلمة المرور لـ استعادة المفتاح",
+    "Enabled" : "مفعلة",
+    "Disabled" : "معطلة",
+    "Change recovery key password:" : "تعديل كلمة المرور استعادة المفتاح:",
+    "Old Recovery key password" : "كلمة المرور القديمة لـ استعامة المفتاح",
+    "New Recovery key password" : "تعيين كلمة مرور جديدة لـ استعادة المفتاح",
+    "Repeat New Recovery key password" : "كرر كلمة المرور لـ استعادة المفتاح من جديد",
+    "Change Password" : "عدل كلمة السر",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "اذا كنت لاتتذكر كلمة السر تستطيع ان تطلب من المدير ان يستعيد ملفاتك.",
+    "Old log-in password" : "كلمة المرور القديمة الخاصة بالدخول",
+    "Current log-in password" : "كلمة المرور الحالية الخاصة بالدخول",
+    "Update Private Key Password" : "تحديث كلمة المرور لـ المفتاح الخاص",
+    "Enable password recovery:" : "تفعيل استعادة كلمة المرور:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "تفعيل هذا الخيار يمكنك من اعادة الوصول الى ملفاتك المشفرة عند فقدان كلمة المرور"
+},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/ast.js b/apps/encryption/l10n/ast.js
new file mode 100644
index 00000000000..d8d07eeef0e
--- /dev/null
+++ b/apps/encryption/l10n/ast.js
@@ -0,0 +1,29 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Recovery key successfully enabled" : "Habilitóse la recuperación de ficheros",
+    "Could not enable recovery key. Please check your recovery key password!" : "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña.",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
+    "Password successfully changed." : "Camudóse la contraseña",
+    "Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los ficheros del usuariu en casu de perda de la contraseña);",
+    "Recovery key password" : "Contraseña de clave de recuperación",
+    "Repeat Recovery key password" : "Repeti la contraseña de clave de recuperación",
+    "Enabled" : "Habilitar",
+    "Disabled" : "Deshabilitáu",
+    "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
+    "Old Recovery key password" : "Clave de recuperación vieya",
+    "New Recovery key password" : "Clave de recuperación nueva",
+    "Repeat New Recovery key password" : "Repetir la clave de recuperación nueva",
+    "Change Password" : "Camudar contraseña",
+    "Set your old private key password to your current log-in password:" : "Afita la contraseña de clave privada vieya pa la to contraseña d'aniciu de sesión actual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.",
+    "Old log-in password" : "Contraseña d'accesu vieya",
+    "Current log-in password" : "Contraseña d'accesu actual",
+    "Update Private Key Password" : "Anovar Contraseña de Clave Privada",
+    "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/ast.json b/apps/encryption/l10n/ast.json
new file mode 100644
index 00000000000..094184150bb
--- /dev/null
+++ b/apps/encryption/l10n/ast.json
@@ -0,0 +1,27 @@
+{ "translations": {
+    "Recovery key successfully enabled" : "Habilitóse la recuperación de ficheros",
+    "Could not enable recovery key. Please check your recovery key password!" : "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña.",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
+    "Password successfully changed." : "Camudóse la contraseña",
+    "Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los ficheros del usuariu en casu de perda de la contraseña);",
+    "Recovery key password" : "Contraseña de clave de recuperación",
+    "Repeat Recovery key password" : "Repeti la contraseña de clave de recuperación",
+    "Enabled" : "Habilitar",
+    "Disabled" : "Deshabilitáu",
+    "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
+    "Old Recovery key password" : "Clave de recuperación vieya",
+    "New Recovery key password" : "Clave de recuperación nueva",
+    "Repeat New Recovery key password" : "Repetir la clave de recuperación nueva",
+    "Change Password" : "Camudar contraseña",
+    "Set your old private key password to your current log-in password:" : "Afita la contraseña de clave privada vieya pa la to contraseña d'aniciu de sesión actual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.",
+    "Old log-in password" : "Contraseña d'accesu vieya",
+    "Current log-in password" : "Contraseña d'accesu actual",
+    "Update Private Key Password" : "Anovar Contraseña de Clave Privada",
+    "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/az.js b/apps/encryption/l10n/az.js
new file mode 100644
index 00000000000..8b81de3e86d
--- /dev/null
+++ b/apps/encryption/l10n/az.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Bərpa açarının şifrəsi çatışmır",
+    "Please repeat the recovery key password" : "Xahiş olunur bərpa açarı şifrəsini təkrarlayasınız",
+    "Repeated recovery key password does not match the provided recovery key password" : "Təkrar daxil edilən bərpa açarı şifrəsi, öncə daxil edilən bərpa açarı ilə üst-üstə düşmür ",
+    "Recovery key successfully enabled" : "Bərpa açarı uğurla aktivləşdi",
+    "Could not enable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarının aktivləşdirilməsi mümkün olmadı. Xahiş olunur geriqaytarılma açarı üçün tələb edilən şifrəni yoxlayasınız.",
+    "Recovery key successfully disabled" : "Bərpa açarı uğurla söndürüldü",
+    "Could not disable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarını sondürmək olmur. Xahiş edirik geriqaytarılma key açarınızı yoxlayın.",
+    "Please provide the old recovery password" : "Xahiş olunur köhnə bərpa açarını daxil edəsiniz",
+    "Please provide a new recovery password" : "Xahiş olunur yeni bərpa açarı şifrəsini daxil esəsiniz",
+    "Please repeat the new recovery password" : "Xahiş olunur yeni bərpa açarını təkrarlayasınız",
+    "Password successfully changed." : "Şifrə uğurla dəyişdirildi.",
+    "Could not change the password. Maybe the old password was not correct." : "Şifrəni dəyişmək olmur, ola bilər ki, köhnə şifrə düzgün olmayıb.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Proqram şifrələnməsi işə salınıb ancaq, sizin açarlar inisializasiya edilməyib. Xahiş edilir çıxıb yenidən daxil olasınız",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Bərpa açarını aktivləşdir(şifrə itirilməsi hadısələrində, istifadəçi fayllarının bərpasına izin verir)",
+    "Recovery key password" : "Açar şifrənin bərpa edilməsi",
+    "Repeat Recovery key password" : "Bərpa açarın şifrəsini təkrar edin",
+    "Enabled" : "İşə salınıb",
+    "Disabled" : "Dayandırılıb",
+    "Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
+    "Old Recovery key password" : "Köhnə bərpa açarı şifrəsi",
+    "New Recovery key password" : "Yeni bərpa açarı şifrəsi",
+    "Repeat New Recovery key password" : "Yeni bərpa açarı şifrəsini təkrar edin",
+    "Change Password" : "Şifrəni dəyişdir",
+    "Your private key password no longer matches your log-in password." : "Sizin gizli açar şifrəsi, artıq giriş adınızla uyğun gəlmir.",
+    "Set your old private key password to your current log-in password:" : "Köhnə açar şifrənizi, sizin hal-hazırki giriş şifrənizə təyin edin: ",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Əgər siz köhnə şifrənizi xatırlamırsınızsa, öz inzibatçınızdan fayllarınızın bərpasını istəyə bilərsiniz.",
+    "Old log-in password" : "Köhnə giriş şifrəsi",
+    "Current log-in password" : "Hal-hazırki giriş şifrəsi",
+    "Update Private Key Password" : "Gizli açar şifrəsini yenilə",
+    "Enable password recovery:" : "Şifrə bərpasını işə sal:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu opsiyanın aktiv edilməsi sizə, şifrənin itdiyi hallarda bütün şifrələnmiş fayllarınıza yetkinin yenidən əldə edilməsinə şərait yaradacaq"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/az.json b/apps/encryption/l10n/az.json
new file mode 100644
index 00000000000..204ada9af50
--- /dev/null
+++ b/apps/encryption/l10n/az.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Bərpa açarının şifrəsi çatışmır",
+    "Please repeat the recovery key password" : "Xahiş olunur bərpa açarı şifrəsini təkrarlayasınız",
+    "Repeated recovery key password does not match the provided recovery key password" : "Təkrar daxil edilən bərpa açarı şifrəsi, öncə daxil edilən bərpa açarı ilə üst-üstə düşmür ",
+    "Recovery key successfully enabled" : "Bərpa açarı uğurla aktivləşdi",
+    "Could not enable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarının aktivləşdirilməsi mümkün olmadı. Xahiş olunur geriqaytarılma açarı üçün tələb edilən şifrəni yoxlayasınız.",
+    "Recovery key successfully disabled" : "Bərpa açarı uğurla söndürüldü",
+    "Could not disable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarını sondürmək olmur. Xahiş edirik geriqaytarılma key açarınızı yoxlayın.",
+    "Please provide the old recovery password" : "Xahiş olunur köhnə bərpa açarını daxil edəsiniz",
+    "Please provide a new recovery password" : "Xahiş olunur yeni bərpa açarı şifrəsini daxil esəsiniz",
+    "Please repeat the new recovery password" : "Xahiş olunur yeni bərpa açarını təkrarlayasınız",
+    "Password successfully changed." : "Şifrə uğurla dəyişdirildi.",
+    "Could not change the password. Maybe the old password was not correct." : "Şifrəni dəyişmək olmur, ola bilər ki, köhnə şifrə düzgün olmayıb.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Proqram şifrələnməsi işə salınıb ancaq, sizin açarlar inisializasiya edilməyib. Xahiş edilir çıxıb yenidən daxil olasınız",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Bərpa açarını aktivləşdir(şifrə itirilməsi hadısələrində, istifadəçi fayllarının bərpasına izin verir)",
+    "Recovery key password" : "Açar şifrənin bərpa edilməsi",
+    "Repeat Recovery key password" : "Bərpa açarın şifrəsini təkrar edin",
+    "Enabled" : "İşə salınıb",
+    "Disabled" : "Dayandırılıb",
+    "Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
+    "Old Recovery key password" : "Köhnə bərpa açarı şifrəsi",
+    "New Recovery key password" : "Yeni bərpa açarı şifrəsi",
+    "Repeat New Recovery key password" : "Yeni bərpa açarı şifrəsini təkrar edin",
+    "Change Password" : "Şifrəni dəyişdir",
+    "Your private key password no longer matches your log-in password." : "Sizin gizli açar şifrəsi, artıq giriş adınızla uyğun gəlmir.",
+    "Set your old private key password to your current log-in password:" : "Köhnə açar şifrənizi, sizin hal-hazırki giriş şifrənizə təyin edin: ",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Əgər siz köhnə şifrənizi xatırlamırsınızsa, öz inzibatçınızdan fayllarınızın bərpasını istəyə bilərsiniz.",
+    "Old log-in password" : "Köhnə giriş şifrəsi",
+    "Current log-in password" : "Hal-hazırki giriş şifrəsi",
+    "Update Private Key Password" : "Gizli açar şifrəsini yenilə",
+    "Enable password recovery:" : "Şifrə bərpasını işə sal:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu opsiyanın aktiv edilməsi sizə, şifrənin itdiyi hallarda bütün şifrələnmiş fayllarınıza yetkinin yenidən əldə edilməsinə şərait yaradacaq"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/bg_BG.js b/apps/encryption/l10n/bg_BG.js
new file mode 100644
index 00000000000..c450f36ae4d
--- /dev/null
+++ b/apps/encryption/l10n/bg_BG.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Липсва парола за възстановяване",
+    "Please repeat the recovery key password" : "Повтори новата парола за възстановяване",
+    "Repeated recovery key password does not match the provided recovery key password" : "Повторената парола за възстановяване не съвпада със зададената парола за възстановяване",
+    "Recovery key successfully enabled" : "Успешно включване на опцията ключ за възстановяване.",
+    "Could not enable recovery key. Please check your recovery key password!" : "Неуспешно включване на опцията ключ за възстановяване. Моля, провери паролата за ключа за възстановяване.",
+    "Recovery key successfully disabled" : "Успешно изключване на ключа за възстановяване.",
+    "Could not disable recovery key. Please check your recovery key password!" : "Неуспешно изключване на ключа за възстановяване. Моля, провери паролата за ключа за възстановяване!",
+    "Please provide the old recovery password" : "Моля, въведи старата парола за възстановяване",
+    "Please provide a new recovery password" : "Моля, задай нова парола за възстановяване",
+    "Please repeat the new recovery password" : "Моля, въведи повторна новата парола за възстановяване",
+    "Password successfully changed." : "Паролата е успешно променена.",
+    "Could not change the password. Maybe the old password was not correct." : "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Включи опцията възстановяване на ключ (разрешава да възстанови файловете на потребителите в случай на загубена парола):",
+    "Recovery key password" : "Парола за възстановяане на ключа",
+    "Repeat Recovery key password" : "Повтори паролата за възстановяване на ключа",
+    "Enabled" : "Включено",
+    "Disabled" : "Изключено",
+    "Change recovery key password:" : "Промени паролата за въстановяване на ключа:",
+    "Old Recovery key password" : "Старата парола за въстановяване на ключа",
+    "New Recovery key password" : "Новата парола за възстановяване на ключа",
+    "Repeat New Recovery key password" : "Повтори новата паролза за възстановяване на ключа",
+    "Change Password" : "Промени Паролата",
+    "Your private key password no longer matches your log-in password." : "Личният ти ключ не съвпада с паролата за вписване.",
+    "Set your old private key password to your current log-in password:" : "Промени паролата за тайния ти включ на паролата за вписване:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ако не помниш старата парола помоли администратора да възстанови файловете ти.",
+    "Old log-in password" : "Стара парола за вписване",
+    "Current log-in password" : "Текуща парола за вписване",
+    "Update Private Key Password" : "Промени Тайната Парола за Ключа",
+    "Enable password recovery:" : "Включи опцията възстановяване на паролата:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Избирането на тази опция ще ти позволи да възстановиш достъпа си до файловете в случай на изгубена парола."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/bg_BG.json b/apps/encryption/l10n/bg_BG.json
new file mode 100644
index 00000000000..1f81c3b5dfe
--- /dev/null
+++ b/apps/encryption/l10n/bg_BG.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Липсва парола за възстановяване",
+    "Please repeat the recovery key password" : "Повтори новата парола за възстановяване",
+    "Repeated recovery key password does not match the provided recovery key password" : "Повторената парола за възстановяване не съвпада със зададената парола за възстановяване",
+    "Recovery key successfully enabled" : "Успешно включване на опцията ключ за възстановяване.",
+    "Could not enable recovery key. Please check your recovery key password!" : "Неуспешно включване на опцията ключ за възстановяване. Моля, провери паролата за ключа за възстановяване.",
+    "Recovery key successfully disabled" : "Успешно изключване на ключа за възстановяване.",
+    "Could not disable recovery key. Please check your recovery key password!" : "Неуспешно изключване на ключа за възстановяване. Моля, провери паролата за ключа за възстановяване!",
+    "Please provide the old recovery password" : "Моля, въведи старата парола за възстановяване",
+    "Please provide a new recovery password" : "Моля, задай нова парола за възстановяване",
+    "Please repeat the new recovery password" : "Моля, въведи повторна новата парола за възстановяване",
+    "Password successfully changed." : "Паролата е успешно променена.",
+    "Could not change the password. Maybe the old password was not correct." : "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Включи опцията възстановяване на ключ (разрешава да възстанови файловете на потребителите в случай на загубена парола):",
+    "Recovery key password" : "Парола за възстановяане на ключа",
+    "Repeat Recovery key password" : "Повтори паролата за възстановяване на ключа",
+    "Enabled" : "Включено",
+    "Disabled" : "Изключено",
+    "Change recovery key password:" : "Промени паролата за въстановяване на ключа:",
+    "Old Recovery key password" : "Старата парола за въстановяване на ключа",
+    "New Recovery key password" : "Новата парола за възстановяване на ключа",
+    "Repeat New Recovery key password" : "Повтори новата паролза за възстановяване на ключа",
+    "Change Password" : "Промени Паролата",
+    "Your private key password no longer matches your log-in password." : "Личният ти ключ не съвпада с паролата за вписване.",
+    "Set your old private key password to your current log-in password:" : "Промени паролата за тайния ти включ на паролата за вписване:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ако не помниш старата парола помоли администратора да възстанови файловете ти.",
+    "Old log-in password" : "Стара парола за вписване",
+    "Current log-in password" : "Текуща парола за вписване",
+    "Update Private Key Password" : "Промени Тайната Парола за Ключа",
+    "Enable password recovery:" : "Включи опцията възстановяване на паролата:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Избирането на тази опция ще ти позволи да възстановиш достъпа си до файловете в случай на изгубена парола."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/bn_BD.js b/apps/encryption/l10n/bn_BD.js
new file mode 100644
index 00000000000..be81f44796f
--- /dev/null
+++ b/apps/encryption/l10n/bn_BD.js
@@ -0,0 +1,16 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
+    "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
+    "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
+    "Repeat Recovery key password" : "পূণরূদ্ধার কি এর  কুটশব্দ পূণরায় দিন",
+    "Enabled" : "কার্যকর",
+    "Disabled" : "অকার্যকর",
+    "Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
+    "Old Recovery key password" : "পূণরূদ্ধার কি এর  পুরাতন কুটশব্দ",
+    "New Recovery key password" : "পূণরূদ্ধার কি এর  নতুন কুটশব্দ",
+    "Repeat New Recovery key password" : "পূণরূদ্ধার কি এর  নতুন কুটশব্দ পূণরায় দিন",
+    "Change Password" : "কূটশব্দ পরিবর্তন করুন"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/bn_BD.json b/apps/encryption/l10n/bn_BD.json
new file mode 100644
index 00000000000..2b4de7e4e66
--- /dev/null
+++ b/apps/encryption/l10n/bn_BD.json
@@ -0,0 +1,14 @@
+{ "translations": {
+    "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
+    "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
+    "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
+    "Repeat Recovery key password" : "পূণরূদ্ধার কি এর  কুটশব্দ পূণরায় দিন",
+    "Enabled" : "কার্যকর",
+    "Disabled" : "অকার্যকর",
+    "Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
+    "Old Recovery key password" : "পূণরূদ্ধার কি এর  পুরাতন কুটশব্দ",
+    "New Recovery key password" : "পূণরূদ্ধার কি এর  নতুন কুটশব্দ",
+    "Repeat New Recovery key password" : "পূণরূদ্ধার কি এর  নতুন কুটশব্দ পূণরায় দিন",
+    "Change Password" : "কূটশব্দ পরিবর্তন করুন"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/bs.js b/apps/encryption/l10n/bs.js
new file mode 100644
index 00000000000..ce2ac3f7d3a
--- /dev/null
+++ b/apps/encryption/l10n/bs.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite",
+    "Enabled" : "Aktivirano",
+    "Disabled" : "Onemogućeno"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/encryption/l10n/bs.json b/apps/encryption/l10n/bs.json
new file mode 100644
index 00000000000..fea356ccfe1
--- /dev/null
+++ b/apps/encryption/l10n/bs.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite",
+    "Enabled" : "Aktivirano",
+    "Disabled" : "Onemogućeno"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/ca.js b/apps/encryption/l10n/ca.js
new file mode 100644
index 00000000000..13c838f40a4
--- /dev/null
+++ b/apps/encryption/l10n/ca.js
@@ -0,0 +1,30 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Recovery key successfully enabled" : "La clau de recuperació s'ha activat",
+    "Could not enable recovery key. Please check your recovery key password!" : "No s'ha pogut activar la clau de recuperació. Comproveu contrasenya de la clau de recuperació!",
+    "Recovery key successfully disabled" : "La clau de recuperació s'ha descativat",
+    "Could not disable recovery key. Please check your recovery key password!" : "No s'ha pogut desactivar la calu de recuperació. Comproveu la contrasenya de la clau de recuperació!",
+    "Password successfully changed." : "La contrasenya s'ha canviat.",
+    "Could not change the password. Maybe the old password was not correct." : "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):",
+    "Recovery key password" : "Clau de recuperació de la contrasenya",
+    "Repeat Recovery key password" : "Repetiu la clau de recuperació de contrasenya",
+    "Enabled" : "Activat",
+    "Disabled" : "Desactivat",
+    "Change recovery key password:" : "Canvia la clau de recuperació de contrasenya:",
+    "Old Recovery key password" : "Antiga clau de recuperació de contrasenya",
+    "New Recovery key password" : "Nova clau de recuperació de contrasenya",
+    "Repeat New Recovery key password" : "Repetiu la nova clau de recuperació de contrasenya",
+    "Change Password" : "Canvia la contrasenya",
+    "Your private key password no longer matches your log-in password." : "La clau privada ja no es correspon amb la contrasenya d'accés:",
+    "Set your old private key password to your current log-in password:" : "Establiu la vostra antiga clau privada a l'actual contrasenya d'accés:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers.",
+    "Old log-in password" : "Contrasenya anterior d'accés",
+    "Current log-in password" : "Contrasenya d'accés actual",
+    "Update Private Key Password" : "Actualitza la contrasenya de clau privada",
+    "Enable password recovery:" : "Habilita la recuperació de contrasenya:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activar aquesta opció us permetrà obtenir de nou accés als vostres fitxers encriptats en cas de perdre la contrasenya"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/ca.json b/apps/encryption/l10n/ca.json
new file mode 100644
index 00000000000..0452f1b4d27
--- /dev/null
+++ b/apps/encryption/l10n/ca.json
@@ -0,0 +1,28 @@
+{ "translations": {
+    "Recovery key successfully enabled" : "La clau de recuperació s'ha activat",
+    "Could not enable recovery key. Please check your recovery key password!" : "No s'ha pogut activar la clau de recuperació. Comproveu contrasenya de la clau de recuperació!",
+    "Recovery key successfully disabled" : "La clau de recuperació s'ha descativat",
+    "Could not disable recovery key. Please check your recovery key password!" : "No s'ha pogut desactivar la calu de recuperació. Comproveu la contrasenya de la clau de recuperació!",
+    "Password successfully changed." : "La contrasenya s'ha canviat.",
+    "Could not change the password. Maybe the old password was not correct." : "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):",
+    "Recovery key password" : "Clau de recuperació de la contrasenya",
+    "Repeat Recovery key password" : "Repetiu la clau de recuperació de contrasenya",
+    "Enabled" : "Activat",
+    "Disabled" : "Desactivat",
+    "Change recovery key password:" : "Canvia la clau de recuperació de contrasenya:",
+    "Old Recovery key password" : "Antiga clau de recuperació de contrasenya",
+    "New Recovery key password" : "Nova clau de recuperació de contrasenya",
+    "Repeat New Recovery key password" : "Repetiu la nova clau de recuperació de contrasenya",
+    "Change Password" : "Canvia la contrasenya",
+    "Your private key password no longer matches your log-in password." : "La clau privada ja no es correspon amb la contrasenya d'accés:",
+    "Set your old private key password to your current log-in password:" : "Establiu la vostra antiga clau privada a l'actual contrasenya d'accés:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers.",
+    "Old log-in password" : "Contrasenya anterior d'accés",
+    "Current log-in password" : "Contrasenya d'accés actual",
+    "Update Private Key Password" : "Actualitza la contrasenya de clau privada",
+    "Enable password recovery:" : "Habilita la recuperació de contrasenya:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activar aquesta opció us permetrà obtenir de nou accés als vostres fitxers encriptats en cas de perdre la contrasenya"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/cs_CZ.js b/apps/encryption/l10n/cs_CZ.js
new file mode 100644
index 00000000000..b1f765a0e10
--- /dev/null
+++ b/apps/encryption/l10n/cs_CZ.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Chybí heslo klíče pro obnovu",
+    "Please repeat the recovery key password" : "Zopakujte prosím heslo klíče pro obnovu",
+    "Repeated recovery key password does not match the provided recovery key password" : "Opakované heslo pro obnovu nesouhlasí se zadaným heslem",
+    "Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen",
+    "Could not enable recovery key. Please check your recovery key password!" : "Nepodařilo se povolit záchranný klíč. Zkontrolujte prosím vaše heslo záchranného klíče!",
+    "Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo svého záchranného klíče!",
+    "Please provide the old recovery password" : "Zadejte prosím staré heslo pro obnovu",
+    "Please provide a new recovery password" : "Zadejte prosím nové heslo pro obnovu",
+    "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pro obnovu",
+    "Password successfully changed." : "Heslo bylo úspěšně změněno.",
+    "Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)",
+    "Recovery key password" : "Heslo klíče pro obnovu",
+    "Repeat Recovery key password" : "Zopakujte heslo klíče pro obnovu",
+    "Enabled" : "Povoleno",
+    "Disabled" : "Zakázáno",
+    "Change recovery key password:" : "Změna hesla klíče pro obnovu:",
+    "Old Recovery key password" : "Původní heslo klíče pro obnovu",
+    "New Recovery key password" : "Nové heslo klíče pro obnovu",
+    "Repeat New Recovery key password" : "Zopakujte nové heslo klíče pro obnovu",
+    "Change Password" : "Změnit heslo",
+    "Your private key password no longer matches your log-in password." : "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem.",
+    "Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
+    "Old log-in password" : "Původní přihlašovací heslo",
+    "Current log-in password" : "Aktuální přihlašovací heslo",
+    "Update Private Key Password" : "Změnit heslo soukromého klíče",
+    "Enable password recovery:" : "Povolit obnovu hesla:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/encryption/l10n/cs_CZ.json b/apps/encryption/l10n/cs_CZ.json
new file mode 100644
index 00000000000..8dc366486e8
--- /dev/null
+++ b/apps/encryption/l10n/cs_CZ.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Chybí heslo klíče pro obnovu",
+    "Please repeat the recovery key password" : "Zopakujte prosím heslo klíče pro obnovu",
+    "Repeated recovery key password does not match the provided recovery key password" : "Opakované heslo pro obnovu nesouhlasí se zadaným heslem",
+    "Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen",
+    "Could not enable recovery key. Please check your recovery key password!" : "Nepodařilo se povolit záchranný klíč. Zkontrolujte prosím vaše heslo záchranného klíče!",
+    "Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo svého záchranného klíče!",
+    "Please provide the old recovery password" : "Zadejte prosím staré heslo pro obnovu",
+    "Please provide a new recovery password" : "Zadejte prosím nové heslo pro obnovu",
+    "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pro obnovu",
+    "Password successfully changed." : "Heslo bylo úspěšně změněno.",
+    "Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)",
+    "Recovery key password" : "Heslo klíče pro obnovu",
+    "Repeat Recovery key password" : "Zopakujte heslo klíče pro obnovu",
+    "Enabled" : "Povoleno",
+    "Disabled" : "Zakázáno",
+    "Change recovery key password:" : "Změna hesla klíče pro obnovu:",
+    "Old Recovery key password" : "Původní heslo klíče pro obnovu",
+    "New Recovery key password" : "Nové heslo klíče pro obnovu",
+    "Repeat New Recovery key password" : "Zopakujte nové heslo klíče pro obnovu",
+    "Change Password" : "Změnit heslo",
+    "Your private key password no longer matches your log-in password." : "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem.",
+    "Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
+    "Old log-in password" : "Původní přihlašovací heslo",
+    "Current log-in password" : "Aktuální přihlašovací heslo",
+    "Update Private Key Password" : "Změnit heslo soukromého klíče",
+    "Enable password recovery:" : "Povolit obnovu hesla:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/da.js b/apps/encryption/l10n/da.js
new file mode 100644
index 00000000000..1310627a174
--- /dev/null
+++ b/apps/encryption/l10n/da.js
@@ -0,0 +1,39 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Der mangler kodeord for gendannelsesnøgle",
+    "Please repeat the recovery key password" : "Gentag venligst kodeordet for gendannelsesnøglen",
+    "Repeated recovery key password does not match the provided recovery key password" : "Det gentagne kodeord for gendannelsesnøglen stemmer ikke med det angivne kodeord for gendannelsesnøglen",
+    "Recovery key successfully enabled" : "Gendannelsesnøgle aktiveret med succes",
+    "Could not enable recovery key. Please check your recovery key password!" : "Kunne ikke aktivere gendannelsesnøgle. Kontroller venligst dit gendannelsesnøgle kodeord!",
+    "Recovery key successfully disabled" : "Gendannelsesnøgle deaktiveret succesfuldt",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kunne ikke deaktivere gendannelsesnøgle. Kontroller din gendannelsesnøgle kodeord!",
+    "Please provide the old recovery password" : "Angiv venligst det gamle kodeord for gendannelsesnøglen",
+    "Please provide a new recovery password" : "Angiv venligst et nyt kodeord til gendannelse",
+    "Please repeat the new recovery password" : "Gentag venligst det nye kodeord til gendannelse",
+    "Password successfully changed." : "Kodeordet blev ændret succesfuldt",
+    "Could not change the password. Maybe the old password was not correct." : "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
+    "Recovery Key enabled" : "Gendannalsesnøgle aktiv",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Kunne ikke aktivere gendannelsesnøglen, venligst prøv igen eller kontakt din administrator",
+    "ownCloud basic encryption module" : "ownCloud basis krypteringsmodul",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):",
+    "Recovery key password" : "Gendannelsesnøgle kodeord",
+    "Repeat Recovery key password" : "Gentag gendannelse af nøglekoden",
+    "Enabled" : "Aktiveret",
+    "Disabled" : "Deaktiveret",
+    "Change recovery key password:" : "Skift gendannelsesnøgle kodeord:",
+    "Old Recovery key password" : "Gammel Gendannelsesnøgle kodeord",
+    "New Recovery key password" : "Ny Gendannelsesnøgle kodeord",
+    "Repeat New Recovery key password" : "Gentag det nye gendannaleses nøglekodeord",
+    "Change Password" : "Skift Kodeord",
+    "Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
+    "Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
+    "Old log-in password" : "Gammelt login kodeord",
+    "Current log-in password" : "Nuvrende login kodeord",
+    "Update Private Key Password" : "Opdater Privat Nøgle Kodeord",
+    "Enable password recovery:" : "Aktiver kodeord gendannelse:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/da.json b/apps/encryption/l10n/da.json
new file mode 100644
index 00000000000..64a619d067b
--- /dev/null
+++ b/apps/encryption/l10n/da.json
@@ -0,0 +1,37 @@
+{ "translations": {
+    "Missing recovery key password" : "Der mangler kodeord for gendannelsesnøgle",
+    "Please repeat the recovery key password" : "Gentag venligst kodeordet for gendannelsesnøglen",
+    "Repeated recovery key password does not match the provided recovery key password" : "Det gentagne kodeord for gendannelsesnøglen stemmer ikke med det angivne kodeord for gendannelsesnøglen",
+    "Recovery key successfully enabled" : "Gendannelsesnøgle aktiveret med succes",
+    "Could not enable recovery key. Please check your recovery key password!" : "Kunne ikke aktivere gendannelsesnøgle. Kontroller venligst dit gendannelsesnøgle kodeord!",
+    "Recovery key successfully disabled" : "Gendannelsesnøgle deaktiveret succesfuldt",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kunne ikke deaktivere gendannelsesnøgle. Kontroller din gendannelsesnøgle kodeord!",
+    "Please provide the old recovery password" : "Angiv venligst det gamle kodeord for gendannelsesnøglen",
+    "Please provide a new recovery password" : "Angiv venligst et nyt kodeord til gendannelse",
+    "Please repeat the new recovery password" : "Gentag venligst det nye kodeord til gendannelse",
+    "Password successfully changed." : "Kodeordet blev ændret succesfuldt",
+    "Could not change the password. Maybe the old password was not correct." : "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
+    "Recovery Key enabled" : "Gendannalsesnøgle aktiv",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Kunne ikke aktivere gendannelsesnøglen, venligst prøv igen eller kontakt din administrator",
+    "ownCloud basic encryption module" : "ownCloud basis krypteringsmodul",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):",
+    "Recovery key password" : "Gendannelsesnøgle kodeord",
+    "Repeat Recovery key password" : "Gentag gendannelse af nøglekoden",
+    "Enabled" : "Aktiveret",
+    "Disabled" : "Deaktiveret",
+    "Change recovery key password:" : "Skift gendannelsesnøgle kodeord:",
+    "Old Recovery key password" : "Gammel Gendannelsesnøgle kodeord",
+    "New Recovery key password" : "Ny Gendannelsesnøgle kodeord",
+    "Repeat New Recovery key password" : "Gentag det nye gendannaleses nøglekodeord",
+    "Change Password" : "Skift Kodeord",
+    "Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
+    "Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
+    "Old log-in password" : "Gammelt login kodeord",
+    "Current log-in password" : "Nuvrende login kodeord",
+    "Update Private Key Password" : "Opdater Privat Nøgle Kodeord",
+    "Enable password recovery:" : "Aktiver kodeord gendannelse:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/de.js b/apps/encryption/l10n/de.js
new file mode 100644
index 00000000000..f184c27a687
--- /dev/null
+++ b/apps/encryption/l10n/de.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
+    "Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
+    "Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
+    "Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
+    "Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
+    "Recovery key successfully disabled" : "Wiederherstellungsschlüssel deaktiviert.",
+    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
+    "Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+    "Please provide a new recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+    "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
+    "Password successfully changed." : "Dein Passwort wurde geändert.",
+    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melde Dich nochmals ab und wieder an.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):",
+    "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
+    "Repeat Recovery key password" : "Schlüssel-Passwort zur Wiederherstellung wiederholen",
+    "Enabled" : "Aktiviert",
+    "Disabled" : "Deaktiviert",
+    "Change recovery key password:" : "Wiederherstellungsschlüssel-Passwort ändern:",
+    "Old Recovery key password" : "Altes Wiederherstellungsschlüssel-Passwort",
+    "New Recovery key password" : "Neues Wiederherstellungsschlüssel-Passwort",
+    "Repeat New Recovery key password" : "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
+    "Change Password" : "Passwort ändern",
+    "Your private key password no longer matches your log-in password." : "Dein Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Loginpasswort überein.",
+    "Set your old private key password to your current log-in password:" : "Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Anmeldepasswort einstellen:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.",
+    "Old log-in password" : "Altes Login Passwort",
+    "Current log-in password" : "Aktuelles Passwort",
+    "Update Private Key Password" : "Passwort für den privaten Schlüssel aktualisieren",
+    "Enable password recovery:" : "Passwortwiederherstellung aktivieren:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json
new file mode 100644
index 00000000000..aeccd11c28e
--- /dev/null
+++ b/apps/encryption/l10n/de.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
+    "Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
+    "Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
+    "Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
+    "Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
+    "Recovery key successfully disabled" : "Wiederherstellungsschlüssel deaktiviert.",
+    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
+    "Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+    "Please provide a new recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+    "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
+    "Password successfully changed." : "Dein Passwort wurde geändert.",
+    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melde Dich nochmals ab und wieder an.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):",
+    "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
+    "Repeat Recovery key password" : "Schlüssel-Passwort zur Wiederherstellung wiederholen",
+    "Enabled" : "Aktiviert",
+    "Disabled" : "Deaktiviert",
+    "Change recovery key password:" : "Wiederherstellungsschlüssel-Passwort ändern:",
+    "Old Recovery key password" : "Altes Wiederherstellungsschlüssel-Passwort",
+    "New Recovery key password" : "Neues Wiederherstellungsschlüssel-Passwort",
+    "Repeat New Recovery key password" : "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
+    "Change Password" : "Passwort ändern",
+    "Your private key password no longer matches your log-in password." : "Dein Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Loginpasswort überein.",
+    "Set your old private key password to your current log-in password:" : "Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Anmeldepasswort einstellen:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.",
+    "Old log-in password" : "Altes Login Passwort",
+    "Current log-in password" : "Aktuelles Passwort",
+    "Update Private Key Password" : "Passwort für den privaten Schlüssel aktualisieren",
+    "Enable password recovery:" : "Passwortwiederherstellung aktivieren:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js
new file mode 100644
index 00000000000..b92dadd9921
--- /dev/null
+++ b/apps/encryption/l10n/de_DE.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
+    "Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
+    "Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
+    "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+    "Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+    "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+    "Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+    "Please provide a new recovery password" : "Bitte das neue Passwort zur Wiederherstellung eingeben",
+    "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
+    "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
+    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht):",
+    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
+    "Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen",
+    "Enabled" : "Aktiviert",
+    "Disabled" : "Deaktiviert",
+    "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
+    "Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort",
+    "New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ",
+    "Repeat New Recovery key password" : "Neues Schlüsselpasswort zur Wiederherstellung wiederholen",
+    "Change Password" : "Passwort ändern",
+    "Your private key password no longer matches your log-in password." : "Das Privatschlüsselpasswort stimmt nicht länger mit dem Anmeldepasswort überein.",
+    "Set your old private key password to your current log-in password:" : "Ihr altes Privatschlüsselpasswort auf Ihr aktuelles Anmeldepasswort stellen:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+    "Old log-in password" : "Altes Anmeldepasswort",
+    "Current log-in password" : "Aktuelles Anmeldepasswort",
+    "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
+    "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json
new file mode 100644
index 00000000000..db96a2a731a
--- /dev/null
+++ b/apps/encryption/l10n/de_DE.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
+    "Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
+    "Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
+    "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+    "Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+    "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+    "Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+    "Please provide a new recovery password" : "Bitte das neue Passwort zur Wiederherstellung eingeben",
+    "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
+    "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
+    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht):",
+    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
+    "Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen",
+    "Enabled" : "Aktiviert",
+    "Disabled" : "Deaktiviert",
+    "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
+    "Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort",
+    "New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ",
+    "Repeat New Recovery key password" : "Neues Schlüsselpasswort zur Wiederherstellung wiederholen",
+    "Change Password" : "Passwort ändern",
+    "Your private key password no longer matches your log-in password." : "Das Privatschlüsselpasswort stimmt nicht länger mit dem Anmeldepasswort überein.",
+    "Set your old private key password to your current log-in password:" : "Ihr altes Privatschlüsselpasswort auf Ihr aktuelles Anmeldepasswort stellen:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+    "Old log-in password" : "Altes Anmeldepasswort",
+    "Current log-in password" : "Aktuelles Anmeldepasswort",
+    "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
+    "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/el.js b/apps/encryption/l10n/el.js
new file mode 100644
index 00000000000..40ec43e1f85
--- /dev/null
+++ b/apps/encryption/l10n/el.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Λείπει το κλειδί επαναφοράς κωδικού",
+    "Please repeat the recovery key password" : "Παρακαλώ επαναλάβετε το κλειδί επαναφοράς κωδικού",
+    "Repeated recovery key password does not match the provided recovery key password" : "Η επανάληψη του κλειδιού επαναφοράς κωδικού δεν ταιριάζει με το δοσμένο κλειδί επαναφοράς κωδικού",
+    "Recovery key successfully enabled" : "Επιτυχής ενεργοποίηση κλειδιού ανάκτησης",
+    "Could not enable recovery key. Please check your recovery key password!" : "Αποτυχία ενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
+    "Recovery key successfully disabled" : "Επιτυχής απενεργοποίηση κλειδιού ανάκτησης",
+    "Could not disable recovery key. Please check your recovery key password!" : "Αποτυχία απενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
+    "Please provide the old recovery password" : "Παρακαλώ παρέχετε τον παλιό κωδικό επαναφοράς",
+    "Please provide a new recovery password" : "Παρακαλώ παρέχετε ένα νέο κωδικό επαναφοράς",
+    "Please repeat the new recovery password" : "Παρακαλώ επαναλάβετε το νέο κωδικό επαναφοράς",
+    "Password successfully changed." : "Ο κωδικός αλλάχτηκε επιτυχώς.",
+    "Could not change the password. Maybe the old password was not correct." : "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Ενεργοποίηση κλειδιού ανάκτησης (επιτρέψτε την ανάκτηση αρχείων χρηστών σε περίπτωση απώλειας κωδικού):",
+    "Recovery key password" : "Επαναφορά κωδικού κλειδιού",
+    "Repeat Recovery key password" : "Επαναλάβετε το κλειδί επαναφοράς κωδικού",
+    "Enabled" : "Ενεργοποιημένο",
+    "Disabled" : "Απενεργοποιημένο",
+    "Change recovery key password:" : "Αλλαγή κλειδιού επαναφοράς κωδικού:",
+    "Old Recovery key password" : "Παλιό κλειδί επαναφοράς κωδικού",
+    "New Recovery key password" : "Νέο κλειδί επαναφοράς κωδικού",
+    "Repeat New Recovery key password" : "Επαναλάβετε νέο κλειδί επαναφοράς κωδικού",
+    "Change Password" : "Αλλαγή Κωδικού Πρόσβασης",
+    "Your private key password no longer matches your log-in password." : "Ο κωδικός του ιδιωτικού κλειδιού σας δεν ταιριάζει πλέον με τον κωδικό σύνδεσής σας.",
+    "Set your old private key password to your current log-in password:" : "Ορίστε τον παλιό σας κωδικό ιδιωτικού κλειδιού στον τρέχοντα κωδικό σύνδεσης.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Εάν δεν θυμάστε τον παλιό σας κωδικό μπορείτε να ζητήσετε από τον διαχειριστή σας να επανακτήσει τα αρχεία σας.",
+    "Old log-in password" : "Παλαιό συνθηματικό εισόδου",
+    "Current log-in password" : "Τρέχον συνθηματικό πρόσβασης",
+    "Update Private Key Password" : "Ενημέρωση Προσωπικού Κλειδού Πρόσβασης",
+    "Enable password recovery:" : "Ενεργοποιήστε την ανάκτηση κωδικού πρόσβασης",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Η ενεργοποίηση αυτής της επιλογής θα σας επιτρέψει να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία σε περίπτωση απώλειας του κωδικού σας"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/el.json b/apps/encryption/l10n/el.json
new file mode 100644
index 00000000000..d8d985c7773
--- /dev/null
+++ b/apps/encryption/l10n/el.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Λείπει το κλειδί επαναφοράς κωδικού",
+    "Please repeat the recovery key password" : "Παρακαλώ επαναλάβετε το κλειδί επαναφοράς κωδικού",
+    "Repeated recovery key password does not match the provided recovery key password" : "Η επανάληψη του κλειδιού επαναφοράς κωδικού δεν ταιριάζει με το δοσμένο κλειδί επαναφοράς κωδικού",
+    "Recovery key successfully enabled" : "Επιτυχής ενεργοποίηση κλειδιού ανάκτησης",
+    "Could not enable recovery key. Please check your recovery key password!" : "Αποτυχία ενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
+    "Recovery key successfully disabled" : "Επιτυχής απενεργοποίηση κλειδιού ανάκτησης",
+    "Could not disable recovery key. Please check your recovery key password!" : "Αποτυχία απενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
+    "Please provide the old recovery password" : "Παρακαλώ παρέχετε τον παλιό κωδικό επαναφοράς",
+    "Please provide a new recovery password" : "Παρακαλώ παρέχετε ένα νέο κωδικό επαναφοράς",
+    "Please repeat the new recovery password" : "Παρακαλώ επαναλάβετε το νέο κωδικό επαναφοράς",
+    "Password successfully changed." : "Ο κωδικός αλλάχτηκε επιτυχώς.",
+    "Could not change the password. Maybe the old password was not correct." : "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Ενεργοποίηση κλειδιού ανάκτησης (επιτρέψτε την ανάκτηση αρχείων χρηστών σε περίπτωση απώλειας κωδικού):",
+    "Recovery key password" : "Επαναφορά κωδικού κλειδιού",
+    "Repeat Recovery key password" : "Επαναλάβετε το κλειδί επαναφοράς κωδικού",
+    "Enabled" : "Ενεργοποιημένο",
+    "Disabled" : "Απενεργοποιημένο",
+    "Change recovery key password:" : "Αλλαγή κλειδιού επαναφοράς κωδικού:",
+    "Old Recovery key password" : "Παλιό κλειδί επαναφοράς κωδικού",
+    "New Recovery key password" : "Νέο κλειδί επαναφοράς κωδικού",
+    "Repeat New Recovery key password" : "Επαναλάβετε νέο κλειδί επαναφοράς κωδικού",
+    "Change Password" : "Αλλαγή Κωδικού Πρόσβασης",
+    "Your private key password no longer matches your log-in password." : "Ο κωδικός του ιδιωτικού κλειδιού σας δεν ταιριάζει πλέον με τον κωδικό σύνδεσής σας.",
+    "Set your old private key password to your current log-in password:" : "Ορίστε τον παλιό σας κωδικό ιδιωτικού κλειδιού στον τρέχοντα κωδικό σύνδεσης.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Εάν δεν θυμάστε τον παλιό σας κωδικό μπορείτε να ζητήσετε από τον διαχειριστή σας να επανακτήσει τα αρχεία σας.",
+    "Old log-in password" : "Παλαιό συνθηματικό εισόδου",
+    "Current log-in password" : "Τρέχον συνθηματικό πρόσβασης",
+    "Update Private Key Password" : "Ενημέρωση Προσωπικού Κλειδού Πρόσβασης",
+    "Enable password recovery:" : "Ενεργοποιήστε την ανάκτηση κωδικού πρόσβασης",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Η ενεργοποίηση αυτής της επιλογής θα σας επιτρέψει να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία σε περίπτωση απώλειας του κωδικού σας"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/en_GB.js b/apps/encryption/l10n/en_GB.js
new file mode 100644
index 00000000000..5478182c2de
--- /dev/null
+++ b/apps/encryption/l10n/en_GB.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Missing recovery key password",
+    "Please repeat the recovery key password" : "Please repeat the recovery key password",
+    "Repeated recovery key password does not match the provided recovery key password" : "Repeated recovery key password does not match the provided recovery key password",
+    "Recovery key successfully enabled" : "Recovery key enabled successfully",
+    "Could not enable recovery key. Please check your recovery key password!" : "Could not enable recovery key. Please check your recovery key password!",
+    "Recovery key successfully disabled" : "Recovery key disabled successfully",
+    "Could not disable recovery key. Please check your recovery key password!" : "Could not disable recovery key. Please check your recovery key password!",
+    "Please provide the old recovery password" : "Please provide the old recovery password",
+    "Please provide a new recovery password" : "Please provide a new recovery password",
+    "Please repeat the new recovery password" : "Please repeat the new recovery password",
+    "Password successfully changed." : "Password changed successfully.",
+    "Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was incorrect.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Enable recovery key (allow to recover users files in case of password loss):",
+    "Recovery key password" : "Recovery key password",
+    "Repeat Recovery key password" : "Repeat recovery key password",
+    "Enabled" : "Enabled",
+    "Disabled" : "Disabled",
+    "Change recovery key password:" : "Change recovery key password:",
+    "Old Recovery key password" : "Old recovery key password",
+    "New Recovery key password" : "New recovery key password",
+    "Repeat New Recovery key password" : "Repeat new recovery key password",
+    "Change Password" : "Change Password",
+    "Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
+    "Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
+    "Old log-in password" : "Old login password",
+    "Current log-in password" : "Current login password",
+    "Update Private Key Password" : "Update Private Key Password",
+    "Enable password recovery:" : "Enable password recovery:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/en_GB.json b/apps/encryption/l10n/en_GB.json
new file mode 100644
index 00000000000..f2b2cad62dd
--- /dev/null
+++ b/apps/encryption/l10n/en_GB.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Missing recovery key password",
+    "Please repeat the recovery key password" : "Please repeat the recovery key password",
+    "Repeated recovery key password does not match the provided recovery key password" : "Repeated recovery key password does not match the provided recovery key password",
+    "Recovery key successfully enabled" : "Recovery key enabled successfully",
+    "Could not enable recovery key. Please check your recovery key password!" : "Could not enable recovery key. Please check your recovery key password!",
+    "Recovery key successfully disabled" : "Recovery key disabled successfully",
+    "Could not disable recovery key. Please check your recovery key password!" : "Could not disable recovery key. Please check your recovery key password!",
+    "Please provide the old recovery password" : "Please provide the old recovery password",
+    "Please provide a new recovery password" : "Please provide a new recovery password",
+    "Please repeat the new recovery password" : "Please repeat the new recovery password",
+    "Password successfully changed." : "Password changed successfully.",
+    "Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was incorrect.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Enable recovery key (allow to recover users files in case of password loss):",
+    "Recovery key password" : "Recovery key password",
+    "Repeat Recovery key password" : "Repeat recovery key password",
+    "Enabled" : "Enabled",
+    "Disabled" : "Disabled",
+    "Change recovery key password:" : "Change recovery key password:",
+    "Old Recovery key password" : "Old recovery key password",
+    "New Recovery key password" : "New recovery key password",
+    "Repeat New Recovery key password" : "Repeat new recovery key password",
+    "Change Password" : "Change Password",
+    "Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
+    "Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
+    "Old log-in password" : "Old login password",
+    "Current log-in password" : "Current login password",
+    "Update Private Key Password" : "Update Private Key Password",
+    "Enable password recovery:" : "Enable password recovery:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/eo.js b/apps/encryption/l10n/eo.js
new file mode 100644
index 00000000000..de3e4e2ea40
--- /dev/null
+++ b/apps/encryption/l10n/eo.js
@@ -0,0 +1,14 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Password successfully changed." : "La pasvorto sukcese ŝanĝiĝis.",
+    "Could not change the password. Maybe the old password was not correct." : "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
+    "Enabled" : "Kapabligita",
+    "Disabled" : "Malkapabligita",
+    "Change Password" : "Ŝarĝi pasvorton",
+    "Old log-in password" : "Malnova ensaluta pasvorto",
+    "Current log-in password" : "Nuna ensaluta pasvorto",
+    "Update Private Key Password" : "Ĝisdatigi la pasvorton de la malpublika klavo",
+    "Enable password recovery:" : "Kapabligi restaŭron de pasvorto:"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/eo.json b/apps/encryption/l10n/eo.json
new file mode 100644
index 00000000000..60560f163a5
--- /dev/null
+++ b/apps/encryption/l10n/eo.json
@@ -0,0 +1,12 @@
+{ "translations": {
+    "Password successfully changed." : "La pasvorto sukcese ŝanĝiĝis.",
+    "Could not change the password. Maybe the old password was not correct." : "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
+    "Enabled" : "Kapabligita",
+    "Disabled" : "Malkapabligita",
+    "Change Password" : "Ŝarĝi pasvorton",
+    "Old log-in password" : "Malnova ensaluta pasvorto",
+    "Current log-in password" : "Nuna ensaluta pasvorto",
+    "Update Private Key Password" : "Ĝisdatigi la pasvorton de la malpublika klavo",
+    "Enable password recovery:" : "Kapabligi restaŭron de pasvorto:"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
new file mode 100644
index 00000000000..33a1f95ee61
--- /dev/null
+++ b/apps/encryption/l10n/es.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Falta contraseña de recuperación.",
+    "Please repeat the recovery key password" : "Por favor, repita la contraseña de recuperación",
+    "Repeated recovery key password does not match the provided recovery key password" : "La contraseña de recuperación reintroducida no coincide con la contraseña de recuperación proporcionada.",
+    "Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos",
+    "Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña.",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor, ¡compruebe su contraseña!",
+    "Please provide the old recovery password" : "Por favor, ingrese su antigua contraseña de recuperación",
+    "Please provide a new recovery password" : "Por favor, ingrese una nueva contraseña de recuperación",
+    "Please repeat the new recovery password" : "Por favor, repita su nueva contraseña de recuperación",
+    "Password successfully changed." : "Su contraseña ha sido cambiada",
+    "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);",
+    "Recovery key password" : "Contraseña de clave de recuperación",
+    "Repeat Recovery key password" : "Repite la contraseña de clave de recuperación",
+    "Enabled" : "Habilitar",
+    "Disabled" : "Deshabilitado",
+    "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
+    "Old Recovery key password" : "Antigua clave de recuperación",
+    "New Recovery key password" : "Nueva clave de recuperación",
+    "Repeat New Recovery key password" : "Repetir la nueva clave de recuperación",
+    "Change Password" : "Cambiar contraseña",
+    "Your private key password no longer matches your log-in password." : "Su contraseña de clave privada ya no coincide con su contraseña de acceso.",
+    "Set your old private key password to your current log-in password:" : "Establezca la contraseña de clave privada antigua para su contraseña de inicio de sesión actual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros.",
+    "Old log-in password" : "Contraseña de acceso antigua",
+    "Current log-in password" : "Contraseña de acceso actual",
+    "Update Private Key Password" : "Actualizar contraseña de clave privada",
+    "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
new file mode 100644
index 00000000000..501d6318752
--- /dev/null
+++ b/apps/encryption/l10n/es.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Falta contraseña de recuperación.",
+    "Please repeat the recovery key password" : "Por favor, repita la contraseña de recuperación",
+    "Repeated recovery key password does not match the provided recovery key password" : "La contraseña de recuperación reintroducida no coincide con la contraseña de recuperación proporcionada.",
+    "Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos",
+    "Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña.",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor, ¡compruebe su contraseña!",
+    "Please provide the old recovery password" : "Por favor, ingrese su antigua contraseña de recuperación",
+    "Please provide a new recovery password" : "Por favor, ingrese una nueva contraseña de recuperación",
+    "Please repeat the new recovery password" : "Por favor, repita su nueva contraseña de recuperación",
+    "Password successfully changed." : "Su contraseña ha sido cambiada",
+    "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);",
+    "Recovery key password" : "Contraseña de clave de recuperación",
+    "Repeat Recovery key password" : "Repite la contraseña de clave de recuperación",
+    "Enabled" : "Habilitar",
+    "Disabled" : "Deshabilitado",
+    "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
+    "Old Recovery key password" : "Antigua clave de recuperación",
+    "New Recovery key password" : "Nueva clave de recuperación",
+    "Repeat New Recovery key password" : "Repetir la nueva clave de recuperación",
+    "Change Password" : "Cambiar contraseña",
+    "Your private key password no longer matches your log-in password." : "Su contraseña de clave privada ya no coincide con su contraseña de acceso.",
+    "Set your old private key password to your current log-in password:" : "Establezca la contraseña de clave privada antigua para su contraseña de inicio de sesión actual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros.",
+    "Old log-in password" : "Contraseña de acceso antigua",
+    "Current log-in password" : "Contraseña de acceso actual",
+    "Update Private Key Password" : "Actualizar contraseña de clave privada",
+    "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/es_AR.js b/apps/encryption/l10n/es_AR.js
new file mode 100644
index 00000000000..917ba2547d5
--- /dev/null
+++ b/apps/encryption/l10n/es_AR.js
@@ -0,0 +1,28 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Recovery key successfully enabled" : "Se habilitó la recuperación de archivos",
+    "Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la clave de recuperación. Por favor, comprobá tu contraseña.",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Could not disable recovery key. Please check your recovery key password!" : "No fue posible deshabilitar la clave de recuperación.  Por favor, comprobá tu contraseña.",
+    "Password successfully changed." : "Tu contraseña fue cambiada",
+    "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso que pierdas la contraseña):",
+    "Recovery key password" : "Contraseña de recuperación de clave",
+    "Repeat Recovery key password" : "Repetir la contraseña de la clave de recuperación",
+    "Enabled" : "Habilitado",
+    "Disabled" : "Deshabilitado",
+    "Change recovery key password:" : "Cambiar contraseña para recuperar la clave:",
+    "Old Recovery key password" : "Contraseña antigua de recuperación de clave",
+    "New Recovery key password" : "Nueva contraseña de recuperación de clave",
+    "Repeat New Recovery key password" : "Repetir Nueva contraseña para la clave de recuperación",
+    "Change Password" : "Cambiar contraseña",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos",
+    "Old log-in password" : "Contraseña anterior",
+    "Current log-in password" : "Contraseña actual",
+    "Update Private Key Password" : "Actualizar contraseña de la clave privada",
+    "Enable password recovery:" : "Habilitar recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitando esta opción, vas a tener acceso a tus archivos encriptados, incluso si perdés la contraseña"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/es_AR.json b/apps/encryption/l10n/es_AR.json
new file mode 100644
index 00000000000..ad5d1af33ac
--- /dev/null
+++ b/apps/encryption/l10n/es_AR.json
@@ -0,0 +1,26 @@
+{ "translations": {
+    "Recovery key successfully enabled" : "Se habilitó la recuperación de archivos",
+    "Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la clave de recuperación. Por favor, comprobá tu contraseña.",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Could not disable recovery key. Please check your recovery key password!" : "No fue posible deshabilitar la clave de recuperación.  Por favor, comprobá tu contraseña.",
+    "Password successfully changed." : "Tu contraseña fue cambiada",
+    "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso que pierdas la contraseña):",
+    "Recovery key password" : "Contraseña de recuperación de clave",
+    "Repeat Recovery key password" : "Repetir la contraseña de la clave de recuperación",
+    "Enabled" : "Habilitado",
+    "Disabled" : "Deshabilitado",
+    "Change recovery key password:" : "Cambiar contraseña para recuperar la clave:",
+    "Old Recovery key password" : "Contraseña antigua de recuperación de clave",
+    "New Recovery key password" : "Nueva contraseña de recuperación de clave",
+    "Repeat New Recovery key password" : "Repetir Nueva contraseña para la clave de recuperación",
+    "Change Password" : "Cambiar contraseña",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos",
+    "Old log-in password" : "Contraseña anterior",
+    "Current log-in password" : "Contraseña actual",
+    "Update Private Key Password" : "Actualizar contraseña de la clave privada",
+    "Enable password recovery:" : "Habilitar recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitando esta opción, vas a tener acceso a tus archivos encriptados, incluso si perdés la contraseña"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/es_MX.js b/apps/encryption/l10n/es_MX.js
new file mode 100644
index 00000000000..f3e4c44e385
--- /dev/null
+++ b/apps/encryption/l10n/es_MX.js
@@ -0,0 +1,28 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos",
+    "Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña.",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
+    "Password successfully changed." : "Su contraseña ha sido cambiada",
+    "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los archivos del usuario en caso de pérdida de la contraseña);",
+    "Recovery key password" : "Contraseña de clave de recuperación",
+    "Repeat Recovery key password" : "Repite la contraseña de clave de recuperación",
+    "Enabled" : "Habilitar",
+    "Disabled" : "Deshabilitado",
+    "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
+    "Old Recovery key password" : "Antigua clave de recuperación",
+    "New Recovery key password" : "Nueva clave de recuperación",
+    "Repeat New Recovery key password" : "Repetir la nueva clave de recuperación",
+    "Change Password" : "Cambiar contraseña",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus archivos.",
+    "Old log-in password" : "Contraseña de acceso antigua",
+    "Current log-in password" : "Contraseña de acceso actual",
+    "Update Private Key Password" : "Actualizar Contraseña de Clave Privada",
+    "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/es_MX.json b/apps/encryption/l10n/es_MX.json
new file mode 100644
index 00000000000..0bc5526d172
--- /dev/null
+++ b/apps/encryption/l10n/es_MX.json
@@ -0,0 +1,26 @@
+{ "translations": {
+    "Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos",
+    "Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña.",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
+    "Password successfully changed." : "Su contraseña ha sido cambiada",
+    "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los archivos del usuario en caso de pérdida de la contraseña);",
+    "Recovery key password" : "Contraseña de clave de recuperación",
+    "Repeat Recovery key password" : "Repite la contraseña de clave de recuperación",
+    "Enabled" : "Habilitar",
+    "Disabled" : "Deshabilitado",
+    "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
+    "Old Recovery key password" : "Antigua clave de recuperación",
+    "New Recovery key password" : "Nueva clave de recuperación",
+    "Repeat New Recovery key password" : "Repetir la nueva clave de recuperación",
+    "Change Password" : "Cambiar contraseña",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus archivos.",
+    "Old log-in password" : "Contraseña de acceso antigua",
+    "Current log-in password" : "Contraseña de acceso actual",
+    "Update Private Key Password" : "Actualizar Contraseña de Clave Privada",
+    "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/et_EE.js b/apps/encryption/l10n/et_EE.js
new file mode 100644
index 00000000000..8e60b9028ec
--- /dev/null
+++ b/apps/encryption/l10n/et_EE.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Muuda taastevõtme parool",
+    "Please repeat the recovery key password" : "Palun korda uut taastevõtme parooli",
+    "Repeated recovery key password does not match the provided recovery key password" : "Lahtritesse sisestatud taastevõtme paroolid ei kattu",
+    "Recovery key successfully enabled" : "Taastevõtme lubamine õnnestus",
+    "Could not enable recovery key. Please check your recovery key password!" : "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!",
+    "Recovery key successfully disabled" : "Taastevõtme keelamine õnnestus",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
+    "Please provide the old recovery password" : "Palun sisesta vana taastevõtme parool",
+    "Please provide a new recovery password" : "Palun sisesta uus taastevõtme parool",
+    "Please repeat the new recovery password" : "Palun korda uut taastevõtme parooli",
+    "Password successfully changed." : "Parool edukalt vahetatud.",
+    "Could not change the password. Maybe the old password was not correct." : "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Luba taastevõti (võimalda kasutaja failide taastamine parooli kaotuse puhul):",
+    "Recovery key password" : "Taastevõtme parool",
+    "Repeat Recovery key password" : "Korda taastevõtme parooli",
+    "Enabled" : "Sisse lülitatud",
+    "Disabled" : "Väljalülitatud",
+    "Change recovery key password:" : "Muuda taastevõtme parooli:",
+    "Old Recovery key password" : "Vana taastevõtme parool",
+    "New Recovery key password" : "Uus taastevõtme parool",
+    "Repeat New Recovery key password" : "Korda uut taastevõtme parooli",
+    "Change Password" : "Muuda parooli",
+    "Your private key password no longer matches your log-in password." : "Sinu provaatvõtme parool ei kattu enam sinu sisselogimise parooliga.",
+    "Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Kui sa ei mäleta oma vana parooli, siis palu oma süsteemihalduril taastada ligipääs failidele.",
+    "Old log-in password" : "Vana sisselogimise parool",
+    "Current log-in password" : "Praegune sisselogimise parool",
+    "Update Private Key Password" : "Uuenda privaatse võtme parooli",
+    "Enable password recovery:" : "Luba parooli taaste:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/et_EE.json b/apps/encryption/l10n/et_EE.json
new file mode 100644
index 00000000000..a977ba75e88
--- /dev/null
+++ b/apps/encryption/l10n/et_EE.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Muuda taastevõtme parool",
+    "Please repeat the recovery key password" : "Palun korda uut taastevõtme parooli",
+    "Repeated recovery key password does not match the provided recovery key password" : "Lahtritesse sisestatud taastevõtme paroolid ei kattu",
+    "Recovery key successfully enabled" : "Taastevõtme lubamine õnnestus",
+    "Could not enable recovery key. Please check your recovery key password!" : "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!",
+    "Recovery key successfully disabled" : "Taastevõtme keelamine õnnestus",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
+    "Please provide the old recovery password" : "Palun sisesta vana taastevõtme parool",
+    "Please provide a new recovery password" : "Palun sisesta uus taastevõtme parool",
+    "Please repeat the new recovery password" : "Palun korda uut taastevõtme parooli",
+    "Password successfully changed." : "Parool edukalt vahetatud.",
+    "Could not change the password. Maybe the old password was not correct." : "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Luba taastevõti (võimalda kasutaja failide taastamine parooli kaotuse puhul):",
+    "Recovery key password" : "Taastevõtme parool",
+    "Repeat Recovery key password" : "Korda taastevõtme parooli",
+    "Enabled" : "Sisse lülitatud",
+    "Disabled" : "Väljalülitatud",
+    "Change recovery key password:" : "Muuda taastevõtme parooli:",
+    "Old Recovery key password" : "Vana taastevõtme parool",
+    "New Recovery key password" : "Uus taastevõtme parool",
+    "Repeat New Recovery key password" : "Korda uut taastevõtme parooli",
+    "Change Password" : "Muuda parooli",
+    "Your private key password no longer matches your log-in password." : "Sinu provaatvõtme parool ei kattu enam sinu sisselogimise parooliga.",
+    "Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Kui sa ei mäleta oma vana parooli, siis palu oma süsteemihalduril taastada ligipääs failidele.",
+    "Old log-in password" : "Vana sisselogimise parool",
+    "Current log-in password" : "Praegune sisselogimise parool",
+    "Update Private Key Password" : "Uuenda privaatse võtme parooli",
+    "Enable password recovery:" : "Luba parooli taaste:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/eu.js b/apps/encryption/l10n/eu.js
new file mode 100644
index 00000000000..937dbe089e0
--- /dev/null
+++ b/apps/encryption/l10n/eu.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Berreskurapen gakoaren pasahitza falta da",
+    "Please repeat the recovery key password" : "Mesedez errepikatu berreskuratze gakoaren pasahitza",
+    "Repeated recovery key password does not match the provided recovery key password" : "Errepikatutako berreskuratze gakoaren pasahitza ez dator bat berreskuratze gakoaren pasahitzarekin",
+    "Recovery key successfully enabled" : "Berreskuratze gakoa behar bezala gaitua",
+    "Could not enable recovery key. Please check your recovery key password!" : "Ezin da berreskuratze gako gaitu. Egiaztatu berreskuratze gako pasahitza!",
+    "Recovery key successfully disabled" : "Berreskuratze gakoa behar bezala desgaitu da",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!",
+    "Please provide the old recovery password" : "Mesedez sartu berreskuratze pasahitz zaharra",
+    "Please provide a new recovery password" : "Mesedez sartu berreskuratze pasahitz berria",
+    "Please repeat the new recovery password" : "Mesedez errepikatu berreskuratze pasahitz berria",
+    "Password successfully changed." : "Pasahitza behar bezala aldatu da.",
+    "Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):",
+    "Recovery key password" : "Berreskuratze gako pasahitza",
+    "Repeat Recovery key password" : "Errepikatu berreskuratze gakoaren pasahitza",
+    "Enabled" : "Gaitua",
+    "Disabled" : "Ez-gaitua",
+    "Change recovery key password:" : "Aldatu berreskuratze gako pasahitza:",
+    "Old Recovery key password" : "Berreskuratze gako pasahitz zaharra",
+    "New Recovery key password" : "Berreskuratze gako pasahitz berria",
+    "Repeat New Recovery key password" : "Errepikatu berreskuratze gako berriaren pasahitza",
+    "Change Password" : "Aldatu Pasahitza",
+    "Your private key password no longer matches your log-in password." : "Zure gako pasahitza pribatua ez da dagoeneko bat etortzen zure sartzeko pasahitzarekin.",
+    "Set your old private key password to your current log-in password:" : "Ezarri zure gako pasahitz zaharra orain duzun  sartzeko pasahitzan:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko.",
+    "Old log-in password" : "Sartzeko pasahitz zaharra",
+    "Current log-in password" : "Sartzeko oraingo pasahitza",
+    "Update Private Key Password" : "Eguneratu gako pasahitza pribatua",
+    "Enable password recovery:" : "Gaitu pasahitzaren berreskuratzea:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/eu.json b/apps/encryption/l10n/eu.json
new file mode 100644
index 00000000000..b1d8f49a34f
--- /dev/null
+++ b/apps/encryption/l10n/eu.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Berreskurapen gakoaren pasahitza falta da",
+    "Please repeat the recovery key password" : "Mesedez errepikatu berreskuratze gakoaren pasahitza",
+    "Repeated recovery key password does not match the provided recovery key password" : "Errepikatutako berreskuratze gakoaren pasahitza ez dator bat berreskuratze gakoaren pasahitzarekin",
+    "Recovery key successfully enabled" : "Berreskuratze gakoa behar bezala gaitua",
+    "Could not enable recovery key. Please check your recovery key password!" : "Ezin da berreskuratze gako gaitu. Egiaztatu berreskuratze gako pasahitza!",
+    "Recovery key successfully disabled" : "Berreskuratze gakoa behar bezala desgaitu da",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!",
+    "Please provide the old recovery password" : "Mesedez sartu berreskuratze pasahitz zaharra",
+    "Please provide a new recovery password" : "Mesedez sartu berreskuratze pasahitz berria",
+    "Please repeat the new recovery password" : "Mesedez errepikatu berreskuratze pasahitz berria",
+    "Password successfully changed." : "Pasahitza behar bezala aldatu da.",
+    "Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):",
+    "Recovery key password" : "Berreskuratze gako pasahitza",
+    "Repeat Recovery key password" : "Errepikatu berreskuratze gakoaren pasahitza",
+    "Enabled" : "Gaitua",
+    "Disabled" : "Ez-gaitua",
+    "Change recovery key password:" : "Aldatu berreskuratze gako pasahitza:",
+    "Old Recovery key password" : "Berreskuratze gako pasahitz zaharra",
+    "New Recovery key password" : "Berreskuratze gako pasahitz berria",
+    "Repeat New Recovery key password" : "Errepikatu berreskuratze gako berriaren pasahitza",
+    "Change Password" : "Aldatu Pasahitza",
+    "Your private key password no longer matches your log-in password." : "Zure gako pasahitza pribatua ez da dagoeneko bat etortzen zure sartzeko pasahitzarekin.",
+    "Set your old private key password to your current log-in password:" : "Ezarri zure gako pasahitz zaharra orain duzun  sartzeko pasahitzan:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko.",
+    "Old log-in password" : "Sartzeko pasahitz zaharra",
+    "Current log-in password" : "Sartzeko oraingo pasahitza",
+    "Update Private Key Password" : "Eguneratu gako pasahitza pribatua",
+    "Enable password recovery:" : "Gaitu pasahitzaren berreskuratzea:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/fa.js b/apps/encryption/l10n/fa.js
new file mode 100644
index 00000000000..c5c2e4efff6
--- /dev/null
+++ b/apps/encryption/l10n/fa.js
@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Recovery key successfully enabled" : "کلید بازیابی با موفقیت فعال شده است.",
+    "Could not enable recovery key. Please check your recovery key password!" : "کلید بازیابی نمی تواند فعال شود. لطفا رمزعبور کلید بازیابی خود را بررسی نمایید!",
+    "Recovery key successfully disabled" : "کلید بازیابی با موفقیت غیر فعال شده است.",
+    "Could not disable recovery key. Please check your recovery key password!" : "کلید بازیابی را نمی تواند غیرفعال نماید. لطفا رمزعبور کلید بازیابی خود را بررسی کنید!",
+    "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
+    "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "فعال کردن کلید بازیابی(اجازه بازیابی فایل های کاربران در صورت از دست دادن رمزعبور):",
+    "Recovery key password" : "رمزعبور کلید بازیابی",
+    "Enabled" : "فعال شده",
+    "Disabled" : "غیرفعال شده",
+    "Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
+    "Old Recovery key password" : "رمزعبور قدیمی  کلید بازیابی ",
+    "New Recovery key password" : "رمزعبور جدید کلید بازیابی",
+    "Change Password" : "تغییر رمزعبور",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "اگر رمزعبور قدیمی را فراموش کرده اید میتوانید از مدیر خود برای بازیابی فایل هایتان درخواست نمایید.",
+    "Old log-in password" : "رمزعبور قدیمی",
+    "Current log-in password" : "رمزعبور فعلی",
+    "Update Private Key Password" : "به روز رسانی رمزعبور کلید خصوصی",
+    "Enable password recovery:" : "فعال سازی بازیابی رمزعبور:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "فعال کردن این گزینه به شما اجازه خواهد داد در صورت از دست دادن رمزعبور به فایل های رمزگذاری شده خود دسترسی داشته باشید."
+},
+"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/fa.json b/apps/encryption/l10n/fa.json
new file mode 100644
index 00000000000..dcc010c3e1c
--- /dev/null
+++ b/apps/encryption/l10n/fa.json
@@ -0,0 +1,23 @@
+{ "translations": {
+    "Recovery key successfully enabled" : "کلید بازیابی با موفقیت فعال شده است.",
+    "Could not enable recovery key. Please check your recovery key password!" : "کلید بازیابی نمی تواند فعال شود. لطفا رمزعبور کلید بازیابی خود را بررسی نمایید!",
+    "Recovery key successfully disabled" : "کلید بازیابی با موفقیت غیر فعال شده است.",
+    "Could not disable recovery key. Please check your recovery key password!" : "کلید بازیابی را نمی تواند غیرفعال نماید. لطفا رمزعبور کلید بازیابی خود را بررسی کنید!",
+    "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
+    "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "فعال کردن کلید بازیابی(اجازه بازیابی فایل های کاربران در صورت از دست دادن رمزعبور):",
+    "Recovery key password" : "رمزعبور کلید بازیابی",
+    "Enabled" : "فعال شده",
+    "Disabled" : "غیرفعال شده",
+    "Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
+    "Old Recovery key password" : "رمزعبور قدیمی  کلید بازیابی ",
+    "New Recovery key password" : "رمزعبور جدید کلید بازیابی",
+    "Change Password" : "تغییر رمزعبور",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "اگر رمزعبور قدیمی را فراموش کرده اید میتوانید از مدیر خود برای بازیابی فایل هایتان درخواست نمایید.",
+    "Old log-in password" : "رمزعبور قدیمی",
+    "Current log-in password" : "رمزعبور فعلی",
+    "Update Private Key Password" : "به روز رسانی رمزعبور کلید خصوصی",
+    "Enable password recovery:" : "فعال سازی بازیابی رمزعبور:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "فعال کردن این گزینه به شما اجازه خواهد داد در صورت از دست دادن رمزعبور به فایل های رمزگذاری شده خود دسترسی داشته باشید."
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/fi_FI.js b/apps/encryption/l10n/fi_FI.js
new file mode 100644
index 00000000000..d9ec3e2d808
--- /dev/null
+++ b/apps/encryption/l10n/fi_FI.js
@@ -0,0 +1,39 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Palautusavaimen salasana puuttuu",
+    "Please repeat the recovery key password" : "Toista palautusavaimen salasana",
+    "Repeated recovery key password does not match the provided recovery key password" : "Toistamiseen annettu palautusavaimen salasana ei täsmää annettua palautusavaimen salasanaa",
+    "Recovery key successfully enabled" : "Palautusavain kytketty päälle onnistuneesti",
+    "Could not enable recovery key. Please check your recovery key password!" : "Palautusavaimen käyttöönotto epäonnistui. Tarkista palautusavaimesi salasana!",
+    "Recovery key successfully disabled" : "Palautusavain poistettu onnistuneesti käytöstä",
+    "Could not disable recovery key. Please check your recovery key password!" : "Palautusavaimen poistaminen käytöstä ei onnistunut. Tarkista palautusavaimesi salasana!",
+    "Please provide the old recovery password" : "Anna vanha palautussalasana",
+    "Please provide a new recovery password" : "Anna uusi palautussalasana",
+    "Please repeat the new recovery password" : "Toista uusi palautussalasana",
+    "Password successfully changed." : "Salasana vaihdettiin onnistuneesti.",
+    "Could not change the password. Maybe the old password was not correct." : "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
+    "Recovery Key enabled" : "Palautusavain käytössä",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Palautusavaimen käyttöönotto epäonnistui, yritä myöhemmin uudelleen tai ota yhteys ylläpitäjään",
+    "ownCloud basic encryption module" : "ownCloudin perussalausmoduuli",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Käytä palautusavainta (salli käyttäjien tiedostojen palauttaminen, jos heidän salasana unohtuu):",
+    "Recovery key password" : "Palautusavaimen salasana",
+    "Repeat Recovery key password" : "Toista palautusavaimen salasana",
+    "Enabled" : "Käytössä",
+    "Disabled" : "Ei käytössä",
+    "Change recovery key password:" : "Vaihda palautusavaimen salasana:",
+    "Old Recovery key password" : "Vanha palautusavaimen salasana",
+    "New Recovery key password" : "Uusi palautusavaimen salasana",
+    "Repeat New Recovery key password" : "Toista uusi palautusavaimen salasana",
+    "Change Password" : "Vaihda salasana",
+    "Your private key password no longer matches your log-in password." : "Salaisen avaimesi salasana ei enää vastaa kirjautumissalasanaasi.",
+    "Set your old private key password to your current log-in password:" : "Aseta yksityisen avaimen vanha salasana vastaamaan nykyistä kirjautumissalasanaasi:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
+    "Old log-in password" : "Vanha kirjautumissalasana",
+    "Current log-in password" : "Nykyinen kirjautumissalasana",
+    "Update Private Key Password" : "Päivitä yksityisen avaimen salasana",
+    "Enable password recovery:" : "Ota salasanan palautus käyttöön:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tämän valinnan käyttäminen mahdollistaa pääsyn salattuihin tiedostoihisi, jos salasana unohtuu"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/fi_FI.json b/apps/encryption/l10n/fi_FI.json
new file mode 100644
index 00000000000..7a3aa891e28
--- /dev/null
+++ b/apps/encryption/l10n/fi_FI.json
@@ -0,0 +1,37 @@
+{ "translations": {
+    "Missing recovery key password" : "Palautusavaimen salasana puuttuu",
+    "Please repeat the recovery key password" : "Toista palautusavaimen salasana",
+    "Repeated recovery key password does not match the provided recovery key password" : "Toistamiseen annettu palautusavaimen salasana ei täsmää annettua palautusavaimen salasanaa",
+    "Recovery key successfully enabled" : "Palautusavain kytketty päälle onnistuneesti",
+    "Could not enable recovery key. Please check your recovery key password!" : "Palautusavaimen käyttöönotto epäonnistui. Tarkista palautusavaimesi salasana!",
+    "Recovery key successfully disabled" : "Palautusavain poistettu onnistuneesti käytöstä",
+    "Could not disable recovery key. Please check your recovery key password!" : "Palautusavaimen poistaminen käytöstä ei onnistunut. Tarkista palautusavaimesi salasana!",
+    "Please provide the old recovery password" : "Anna vanha palautussalasana",
+    "Please provide a new recovery password" : "Anna uusi palautussalasana",
+    "Please repeat the new recovery password" : "Toista uusi palautussalasana",
+    "Password successfully changed." : "Salasana vaihdettiin onnistuneesti.",
+    "Could not change the password. Maybe the old password was not correct." : "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
+    "Recovery Key enabled" : "Palautusavain käytössä",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Palautusavaimen käyttöönotto epäonnistui, yritä myöhemmin uudelleen tai ota yhteys ylläpitäjään",
+    "ownCloud basic encryption module" : "ownCloudin perussalausmoduuli",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Käytä palautusavainta (salli käyttäjien tiedostojen palauttaminen, jos heidän salasana unohtuu):",
+    "Recovery key password" : "Palautusavaimen salasana",
+    "Repeat Recovery key password" : "Toista palautusavaimen salasana",
+    "Enabled" : "Käytössä",
+    "Disabled" : "Ei käytössä",
+    "Change recovery key password:" : "Vaihda palautusavaimen salasana:",
+    "Old Recovery key password" : "Vanha palautusavaimen salasana",
+    "New Recovery key password" : "Uusi palautusavaimen salasana",
+    "Repeat New Recovery key password" : "Toista uusi palautusavaimen salasana",
+    "Change Password" : "Vaihda salasana",
+    "Your private key password no longer matches your log-in password." : "Salaisen avaimesi salasana ei enää vastaa kirjautumissalasanaasi.",
+    "Set your old private key password to your current log-in password:" : "Aseta yksityisen avaimen vanha salasana vastaamaan nykyistä kirjautumissalasanaasi:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
+    "Old log-in password" : "Vanha kirjautumissalasana",
+    "Current log-in password" : "Nykyinen kirjautumissalasana",
+    "Update Private Key Password" : "Päivitä yksityisen avaimen salasana",
+    "Enable password recovery:" : "Ota salasanan palautus käyttöön:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tämän valinnan käyttäminen mahdollistaa pääsyn salattuihin tiedostoihisi, jos salasana unohtuu"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js
new file mode 100644
index 00000000000..2c01315dbd5
--- /dev/null
+++ b/apps/encryption/l10n/fr.js
@@ -0,0 +1,39 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Mot de passe de la clef de récupération manquant",
+    "Please repeat the recovery key password" : "Répétez le mot de passe de la clef de récupération",
+    "Repeated recovery key password does not match the provided recovery key password" : "Le mot de passe de la clef de récupération et sa répétition ne sont pas identiques.",
+    "Recovery key successfully enabled" : "Clef de récupération activée avec succès",
+    "Could not enable recovery key. Please check your recovery key password!" : "Impossible d'activer la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
+    "Recovery key successfully disabled" : "Clef de récupération désactivée avec succès",
+    "Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clef de récupération. Veuillez vérifier le mot de passe de votre clef de récupération !",
+    "Please provide the old recovery password" : "Veuillez entrer l'ancien mot de passe de récupération",
+    "Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération",
+    "Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération",
+    "Password successfully changed." : "Mot de passe changé avec succès.",
+    "Could not change the password. Maybe the old password was not correct." : "Erreur lors du changement de mot de passe. L'ancien mot de passe est peut-être incorrect.",
+    "Recovery Key enabled" : "Clé de récupération activée",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Impossible d'activer la clé de récupération. Veuillez essayer à nouveau ou contacter votre administrateur",
+    "ownCloud basic encryption module" : "Module de chiffrement de base d'ownCloud",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
+    "Recovery key password" : "Mot de passe de la clef de récupération",
+    "Repeat Recovery key password" : "Répétez le mot de passe de la clef de récupération",
+    "Enabled" : "Activé",
+    "Disabled" : "Désactivé",
+    "Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :",
+    "Old Recovery key password" : "Ancien mot de passe de la clef de récupération",
+    "New Recovery key password" : "Nouveau mot de passe de la clef de récupération",
+    "Repeat New Recovery key password" : "Répétez le nouveau mot de passe de la clef de récupération",
+    "Change Password" : "Changer de mot de passe",
+    "Your private key password no longer matches your log-in password." : "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion.",
+    "Set your old private key password to your current log-in password:" : "Faites de votre mot de passe de connexion le mot de passe de votre clef privée :",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
+    "Old log-in password" : "Ancien mot de passe de connexion",
+    "Current log-in password" : "Actuel mot de passe de connexion",
+    "Update Private Key Password" : "Mettre à jour le mot de passe de votre clef privée",
+    "Enable password recovery:" : "Activer la récupération du mot de passe :",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json
new file mode 100644
index 00000000000..4b284f482f6
--- /dev/null
+++ b/apps/encryption/l10n/fr.json
@@ -0,0 +1,37 @@
+{ "translations": {
+    "Missing recovery key password" : "Mot de passe de la clef de récupération manquant",
+    "Please repeat the recovery key password" : "Répétez le mot de passe de la clef de récupération",
+    "Repeated recovery key password does not match the provided recovery key password" : "Le mot de passe de la clef de récupération et sa répétition ne sont pas identiques.",
+    "Recovery key successfully enabled" : "Clef de récupération activée avec succès",
+    "Could not enable recovery key. Please check your recovery key password!" : "Impossible d'activer la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
+    "Recovery key successfully disabled" : "Clef de récupération désactivée avec succès",
+    "Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clef de récupération. Veuillez vérifier le mot de passe de votre clef de récupération !",
+    "Please provide the old recovery password" : "Veuillez entrer l'ancien mot de passe de récupération",
+    "Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération",
+    "Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération",
+    "Password successfully changed." : "Mot de passe changé avec succès.",
+    "Could not change the password. Maybe the old password was not correct." : "Erreur lors du changement de mot de passe. L'ancien mot de passe est peut-être incorrect.",
+    "Recovery Key enabled" : "Clé de récupération activée",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Impossible d'activer la clé de récupération. Veuillez essayer à nouveau ou contacter votre administrateur",
+    "ownCloud basic encryption module" : "Module de chiffrement de base d'ownCloud",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
+    "Recovery key password" : "Mot de passe de la clef de récupération",
+    "Repeat Recovery key password" : "Répétez le mot de passe de la clef de récupération",
+    "Enabled" : "Activé",
+    "Disabled" : "Désactivé",
+    "Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :",
+    "Old Recovery key password" : "Ancien mot de passe de la clef de récupération",
+    "New Recovery key password" : "Nouveau mot de passe de la clef de récupération",
+    "Repeat New Recovery key password" : "Répétez le nouveau mot de passe de la clef de récupération",
+    "Change Password" : "Changer de mot de passe",
+    "Your private key password no longer matches your log-in password." : "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion.",
+    "Set your old private key password to your current log-in password:" : "Faites de votre mot de passe de connexion le mot de passe de votre clef privée :",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
+    "Old log-in password" : "Ancien mot de passe de connexion",
+    "Current log-in password" : "Actuel mot de passe de connexion",
+    "Update Private Key Password" : "Mettre à jour le mot de passe de votre clef privée",
+    "Enable password recovery:" : "Activer la récupération du mot de passe :",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/gl.js b/apps/encryption/l10n/gl.js
new file mode 100644
index 00000000000..2dc9f521428
--- /dev/null
+++ b/apps/encryption/l10n/gl.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Falta a chave de recuperación",
+    "Please repeat the recovery key password" : "Repita a chave de recuperación",
+    "Repeated recovery key password does not match the provided recovery key password" : "A repetición da chave de recuperación non coincide coa chave de recuperación estabelecida",
+    "Recovery key successfully enabled" : "Activada satisfactoriamente a chave de recuperación",
+    "Could not enable recovery key. Please check your recovery key password!" : "Non foi posíbel activar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
+    "Recovery key successfully disabled" : "Desactivada satisfactoriamente a chave de recuperación",
+    "Could not disable recovery key. Please check your recovery key password!" : "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
+    "Please provide the old recovery password" : "Introduza a chave de recuperación antiga",
+    "Please provide a new recovery password" : "Introduza a nova chave de recuperación",
+    "Please repeat the new recovery password" : "Repita a nova chave de recuperación",
+    "Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente",
+    "Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron preparadas, saia da sesión e volva a acceder de novo",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):",
+    "Recovery key password" : "Contrasinal da chave de recuperación",
+    "Repeat Recovery key password" : "Repita o contrasinal da chave de recuperación",
+    "Enabled" : "Activado",
+    "Disabled" : "Desactivado",
+    "Change recovery key password:" : "Cambiar o contrasinal da chave de la recuperación:",
+    "Old Recovery key password" : "Antigo contrasinal da chave de recuperación",
+    "New Recovery key password" : "Novo contrasinal da chave de recuperación",
+    "Repeat New Recovery key password" : "Repita o novo contrasinal da chave de recuperación",
+    "Change Password" : "Cambiar o contrasinal",
+    "Your private key password no longer matches your log-in password." : "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso.",
+    "Set your old private key password to your current log-in password:" : "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu antigo contrasinal pode pedírllelo ao seu administrador para recuperar os seus ficheiros.",
+    "Old log-in password" : "Contrasinal antigo de acceso",
+    "Current log-in password" : "Contrasinal actual de acceso",
+    "Update Private Key Password" : "Actualizar o contrasinal da chave privada",
+    "Enable password recovery:" : "Activar o  contrasinal de recuperación:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados no caso de perda do contrasinal"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/gl.json b/apps/encryption/l10n/gl.json
new file mode 100644
index 00000000000..451b88f6750
--- /dev/null
+++ b/apps/encryption/l10n/gl.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Falta a chave de recuperación",
+    "Please repeat the recovery key password" : "Repita a chave de recuperación",
+    "Repeated recovery key password does not match the provided recovery key password" : "A repetición da chave de recuperación non coincide coa chave de recuperación estabelecida",
+    "Recovery key successfully enabled" : "Activada satisfactoriamente a chave de recuperación",
+    "Could not enable recovery key. Please check your recovery key password!" : "Non foi posíbel activar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
+    "Recovery key successfully disabled" : "Desactivada satisfactoriamente a chave de recuperación",
+    "Could not disable recovery key. Please check your recovery key password!" : "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
+    "Please provide the old recovery password" : "Introduza a chave de recuperación antiga",
+    "Please provide a new recovery password" : "Introduza a nova chave de recuperación",
+    "Please repeat the new recovery password" : "Repita a nova chave de recuperación",
+    "Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente",
+    "Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron preparadas, saia da sesión e volva a acceder de novo",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):",
+    "Recovery key password" : "Contrasinal da chave de recuperación",
+    "Repeat Recovery key password" : "Repita o contrasinal da chave de recuperación",
+    "Enabled" : "Activado",
+    "Disabled" : "Desactivado",
+    "Change recovery key password:" : "Cambiar o contrasinal da chave de la recuperación:",
+    "Old Recovery key password" : "Antigo contrasinal da chave de recuperación",
+    "New Recovery key password" : "Novo contrasinal da chave de recuperación",
+    "Repeat New Recovery key password" : "Repita o novo contrasinal da chave de recuperación",
+    "Change Password" : "Cambiar o contrasinal",
+    "Your private key password no longer matches your log-in password." : "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso.",
+    "Set your old private key password to your current log-in password:" : "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu antigo contrasinal pode pedírllelo ao seu administrador para recuperar os seus ficheiros.",
+    "Old log-in password" : "Contrasinal antigo de acceso",
+    "Current log-in password" : "Contrasinal actual de acceso",
+    "Update Private Key Password" : "Actualizar o contrasinal da chave privada",
+    "Enable password recovery:" : "Activar o  contrasinal de recuperación:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados no caso de perda do contrasinal"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/hr.js b/apps/encryption/l10n/hr.js
new file mode 100644
index 00000000000..9d910763c2a
--- /dev/null
+++ b/apps/encryption/l10n/hr.js
@@ -0,0 +1,30 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Recovery key successfully enabled" : "Ključ za oporavak uspješno aktiviran",
+    "Could not enable recovery key. Please check your recovery key password!" : "Ključ za oporavak nije moguće aktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
+    "Recovery key successfully disabled" : "Ključ za ooravak uspješno deaktiviran",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ključ za oporavak nije moguće deaktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
+    "Password successfully changed." : "Lozinka uspješno promijenjena.",
+    "Could not change the password. Maybe the old password was not correct." : "Lozinku nije moguće promijeniti. Možda je stara lozinka bila neispravna.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je aktivirana ali vaši ključevi nisu inicijalizirani, molimo odjavite se iponovno prijavite.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivirajte ključ za oporavak (u slučaju gubitka lozinke dozvolite oporavak korisničkih datoteka):",
+    "Recovery key password" : "Lozinka ključa za oporavak",
+    "Repeat Recovery key password" : "Ponovite lozinku ključa za oporavak",
+    "Enabled" : "Aktivirano",
+    "Disabled" : "Onemogućeno",
+    "Change recovery key password:" : "Promijenite lozinku ključa za oporavak",
+    "Old Recovery key password" : "Stara lozinka ključa za oporavak",
+    "New Recovery key password" : "Nova lozinka ključa za oporavak",
+    "Repeat New Recovery key password" : "Ponovite novu lozinku ključa za oporavak",
+    "Change Password" : "Promijenite lozinku",
+    "Your private key password no longer matches your log-in password." : "Lozinka vašeg privatnog ključa više se ne slaže s vašom lozinkom za prijavu.",
+    "Set your old private key password to your current log-in password:" : "Postavite svoju staru lozinku privatnog ključa u svoju postojeću lozinku za prijavu.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ako se ne sjećate svoje stare lozinke, možete zamoliti administratora da oporavi vaše datoteke.",
+    "Old log-in password" : "Stara lozinka za prijavu",
+    "Current log-in password" : "Aktualna lozinka za prijavu",
+    "Update Private Key Password" : "Ažurirajte lozinku privatnog ključa",
+    "Enable password recovery:" : "Omogućite oporavak lozinke:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "U slučaju gubitka lozinke, aktiviranje ove opcije ponovno će vam pribaviti pristup vašim šifriranim datotekama"
+},
+"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
diff --git a/apps/encryption/l10n/hr.json b/apps/encryption/l10n/hr.json
new file mode 100644
index 00000000000..3e5eda279cb
--- /dev/null
+++ b/apps/encryption/l10n/hr.json
@@ -0,0 +1,28 @@
+{ "translations": {
+    "Recovery key successfully enabled" : "Ključ za oporavak uspješno aktiviran",
+    "Could not enable recovery key. Please check your recovery key password!" : "Ključ za oporavak nije moguće aktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
+    "Recovery key successfully disabled" : "Ključ za ooravak uspješno deaktiviran",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ključ za oporavak nije moguće deaktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
+    "Password successfully changed." : "Lozinka uspješno promijenjena.",
+    "Could not change the password. Maybe the old password was not correct." : "Lozinku nije moguće promijeniti. Možda je stara lozinka bila neispravna.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je aktivirana ali vaši ključevi nisu inicijalizirani, molimo odjavite se iponovno prijavite.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivirajte ključ za oporavak (u slučaju gubitka lozinke dozvolite oporavak korisničkih datoteka):",
+    "Recovery key password" : "Lozinka ključa za oporavak",
+    "Repeat Recovery key password" : "Ponovite lozinku ključa za oporavak",
+    "Enabled" : "Aktivirano",
+    "Disabled" : "Onemogućeno",
+    "Change recovery key password:" : "Promijenite lozinku ključa za oporavak",
+    "Old Recovery key password" : "Stara lozinka ključa za oporavak",
+    "New Recovery key password" : "Nova lozinka ključa za oporavak",
+    "Repeat New Recovery key password" : "Ponovite novu lozinku ključa za oporavak",
+    "Change Password" : "Promijenite lozinku",
+    "Your private key password no longer matches your log-in password." : "Lozinka vašeg privatnog ključa više se ne slaže s vašom lozinkom za prijavu.",
+    "Set your old private key password to your current log-in password:" : "Postavite svoju staru lozinku privatnog ključa u svoju postojeću lozinku za prijavu.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ako se ne sjećate svoje stare lozinke, možete zamoliti administratora da oporavi vaše datoteke.",
+    "Old log-in password" : "Stara lozinka za prijavu",
+    "Current log-in password" : "Aktualna lozinka za prijavu",
+    "Update Private Key Password" : "Ažurirajte lozinku privatnog ključa",
+    "Enable password recovery:" : "Omogućite oporavak lozinke:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "U slučaju gubitka lozinke, aktiviranje ove opcije ponovno će vam pribaviti pristup vašim šifriranim datotekama"
+},"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/hu_HU.js b/apps/encryption/l10n/hu_HU.js
new file mode 100644
index 00000000000..9b1ec36849c
--- /dev/null
+++ b/apps/encryption/l10n/hu_HU.js
@@ -0,0 +1,28 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Recovery key successfully enabled" : "A helyreállítási kulcs sikeresen bekapcsolva",
+    "Could not enable recovery key. Please check your recovery key password!" : "A helyreállítási kulcsot nem lehetett engedélyezni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
+    "Recovery key successfully disabled" : "A helyreállítási kulcs sikeresen kikapcsolva",
+    "Could not disable recovery key. Please check your recovery key password!" : "A helyreállítási kulcsot nem lehetett kikapcsolni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
+    "Password successfully changed." : "A jelszót sikeresen megváltoztattuk.",
+    "Could not change the password. Maybe the old password was not correct." : "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "A helyreállítási kulcs beállítása (lehetővé teszi a felhasználók állományainak visszaállítását, ha elfelejtik a jelszavukat):",
+    "Recovery key password" : "A helyreállítási kulcs jelszava",
+    "Repeat Recovery key password" : "Ismételje meg a helyreállítási kulcs jelszavát",
+    "Enabled" : "Bekapcsolva",
+    "Disabled" : "Kikapcsolva",
+    "Change recovery key password:" : "A helyreállítási kulcs jelszavának módosítása:",
+    "Old Recovery key password" : "Régi Helyreállítási Kulcs Jelszava",
+    "New Recovery key password" : "Új Helyreállítási kulcs jelszava",
+    "Repeat New Recovery key password" : "Ismételje meg az új helyreállítási kulcs jelszavát",
+    "Change Password" : "Jelszó megváltoztatása",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára akkor megkérheti a rendszergazdát, hogy állítsa vissza az állományait.",
+    "Old log-in password" : "Régi bejelentkezési jelszó",
+    "Current log-in password" : "Jelenlegi bejelentkezési jelszó",
+    "Update Private Key Password" : "A személyest kulcs jelszó frissítése",
+    "Enable password recovery:" : "Jelszó-visszaállítás bekapcsolása",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ez az opció lehetővé teszi, hogy a titkosított állományok tartalmát visszanyerjük abban az esetben, ha elfelejti a jelszavát"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/hu_HU.json b/apps/encryption/l10n/hu_HU.json
new file mode 100644
index 00000000000..9ef22a34bfa
--- /dev/null
+++ b/apps/encryption/l10n/hu_HU.json
@@ -0,0 +1,26 @@
+{ "translations": {
+    "Recovery key successfully enabled" : "A helyreállítási kulcs sikeresen bekapcsolva",
+    "Could not enable recovery key. Please check your recovery key password!" : "A helyreállítási kulcsot nem lehetett engedélyezni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
+    "Recovery key successfully disabled" : "A helyreállítási kulcs sikeresen kikapcsolva",
+    "Could not disable recovery key. Please check your recovery key password!" : "A helyreállítási kulcsot nem lehetett kikapcsolni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
+    "Password successfully changed." : "A jelszót sikeresen megváltoztattuk.",
+    "Could not change the password. Maybe the old password was not correct." : "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "A helyreállítási kulcs beállítása (lehetővé teszi a felhasználók állományainak visszaállítását, ha elfelejtik a jelszavukat):",
+    "Recovery key password" : "A helyreállítási kulcs jelszava",
+    "Repeat Recovery key password" : "Ismételje meg a helyreállítási kulcs jelszavát",
+    "Enabled" : "Bekapcsolva",
+    "Disabled" : "Kikapcsolva",
+    "Change recovery key password:" : "A helyreállítási kulcs jelszavának módosítása:",
+    "Old Recovery key password" : "Régi Helyreállítási Kulcs Jelszava",
+    "New Recovery key password" : "Új Helyreállítási kulcs jelszava",
+    "Repeat New Recovery key password" : "Ismételje meg az új helyreállítási kulcs jelszavát",
+    "Change Password" : "Jelszó megváltoztatása",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára akkor megkérheti a rendszergazdát, hogy állítsa vissza az állományait.",
+    "Old log-in password" : "Régi bejelentkezési jelszó",
+    "Current log-in password" : "Jelenlegi bejelentkezési jelszó",
+    "Update Private Key Password" : "A személyest kulcs jelszó frissítése",
+    "Enable password recovery:" : "Jelszó-visszaállítás bekapcsolása",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ez az opció lehetővé teszi, hogy a titkosított állományok tartalmát visszanyerjük abban az esetben, ha elfelejti a jelszavát"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/id.js b/apps/encryption/l10n/id.js
new file mode 100644
index 00000000000..b0f93d02dd3
--- /dev/null
+++ b/apps/encryption/l10n/id.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Sandi kunci pemuliahan hilang",
+    "Please repeat the recovery key password" : "Silakan ulangi sandi kunci pemulihan",
+    "Repeated recovery key password does not match the provided recovery key password" : "Sandi kunci pemulihan yang diulangi tidak cocok dengan sandi kunci pemulihan yang diberikan",
+    "Recovery key successfully enabled" : "Kunci pemulihan berhasil diaktifkan",
+    "Could not enable recovery key. Please check your recovery key password!" : "Tidak dapat mengaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
+    "Recovery key successfully disabled" : "Kunci pemulihan berhasil dinonaktifkan",
+    "Could not disable recovery key. Please check your recovery key password!" : "Tidak dapat menonaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
+    "Please provide the old recovery password" : "Mohon berikan sandi pemulihan lama",
+    "Please provide a new recovery password" : "Mohon berikan sandi pemulihan baru",
+    "Please repeat the new recovery password" : "Silakan ulangi sandi pemulihan baru",
+    "Password successfully changed." : "Sandi berhasil diubah",
+    "Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):",
+    "Recovery key password" : "Sandi kunci pemulihan",
+    "Repeat Recovery key password" : "Ulangi sandi kunci Pemulihan",
+    "Enabled" : "Diaktifkan",
+    "Disabled" : "Dinonaktifkan",
+    "Change recovery key password:" : "Ubah sandi kunci pemulihan:",
+    "Old Recovery key password" : "Sandi kunci Pemulihan Lama",
+    "New Recovery key password" : "Sandi kunci Pemulihan Baru",
+    "Repeat New Recovery key password" : "Ulangi sandi kunci Pemulihan baru",
+    "Change Password" : "Ubah Sandi",
+    "Your private key password no longer matches your log-in password." : "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.",
+    "Set your old private key password to your current log-in password:" : "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
+    "Old log-in password" : "Sandi masuk yang lama",
+    "Current log-in password" : "Sandi masuk saat ini",
+    "Update Private Key Password" : "Perbarui Sandi Kunci Private",
+    "Enable password recovery:" : "Aktifkan sandi pemulihan:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/id.json b/apps/encryption/l10n/id.json
new file mode 100644
index 00000000000..69a01d9c5ad
--- /dev/null
+++ b/apps/encryption/l10n/id.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Sandi kunci pemuliahan hilang",
+    "Please repeat the recovery key password" : "Silakan ulangi sandi kunci pemulihan",
+    "Repeated recovery key password does not match the provided recovery key password" : "Sandi kunci pemulihan yang diulangi tidak cocok dengan sandi kunci pemulihan yang diberikan",
+    "Recovery key successfully enabled" : "Kunci pemulihan berhasil diaktifkan",
+    "Could not enable recovery key. Please check your recovery key password!" : "Tidak dapat mengaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
+    "Recovery key successfully disabled" : "Kunci pemulihan berhasil dinonaktifkan",
+    "Could not disable recovery key. Please check your recovery key password!" : "Tidak dapat menonaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
+    "Please provide the old recovery password" : "Mohon berikan sandi pemulihan lama",
+    "Please provide a new recovery password" : "Mohon berikan sandi pemulihan baru",
+    "Please repeat the new recovery password" : "Silakan ulangi sandi pemulihan baru",
+    "Password successfully changed." : "Sandi berhasil diubah",
+    "Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):",
+    "Recovery key password" : "Sandi kunci pemulihan",
+    "Repeat Recovery key password" : "Ulangi sandi kunci Pemulihan",
+    "Enabled" : "Diaktifkan",
+    "Disabled" : "Dinonaktifkan",
+    "Change recovery key password:" : "Ubah sandi kunci pemulihan:",
+    "Old Recovery key password" : "Sandi kunci Pemulihan Lama",
+    "New Recovery key password" : "Sandi kunci Pemulihan Baru",
+    "Repeat New Recovery key password" : "Ulangi sandi kunci Pemulihan baru",
+    "Change Password" : "Ubah Sandi",
+    "Your private key password no longer matches your log-in password." : "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.",
+    "Set your old private key password to your current log-in password:" : "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
+    "Old log-in password" : "Sandi masuk yang lama",
+    "Current log-in password" : "Sandi masuk saat ini",
+    "Update Private Key Password" : "Perbarui Sandi Kunci Private",
+    "Enable password recovery:" : "Aktifkan sandi pemulihan:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/it.js b/apps/encryption/l10n/it.js
new file mode 100644
index 00000000000..ea0d4576314
--- /dev/null
+++ b/apps/encryption/l10n/it.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Manca la password della chiave di recupero",
+    "Please repeat the recovery key password" : "Ripeti la password della chiave di recupero",
+    "Repeated recovery key password does not match the provided recovery key password" : "La password della chiave di recupero ripetuta non corrisponde alla password della chiave di recupero fornita",
+    "Recovery key successfully enabled" : "Chiave di recupero abilitata correttamente",
+    "Could not enable recovery key. Please check your recovery key password!" : "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
+    "Recovery key successfully disabled" : "Chiave di recupero disabilitata correttamente",
+    "Could not disable recovery key. Please check your recovery key password!" : "Impossibile disabilitare la chiave di recupero. Verifica la password della chiave di recupero.",
+    "Please provide the old recovery password" : "Fornisci la vecchia password di recupero",
+    "Please provide a new recovery password" : "Fornisci una nuova password di recupero",
+    "Please repeat the new recovery password" : "Ripeti la nuova password di recupero",
+    "Password successfully changed." : "Password modificata correttamente.",
+    "Could not change the password. Maybe the old password was not correct." : "Impossibile cambiare la password. Forse la vecchia password non era corretta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):",
+    "Recovery key password" : "Password della chiave di recupero",
+    "Repeat Recovery key password" : "Ripeti la password della chiave di recupero",
+    "Enabled" : "Abilitata",
+    "Disabled" : "Disabilitata",
+    "Change recovery key password:" : "Cambia la password della chiave di recupero:",
+    "Old Recovery key password" : "Vecchia password della chiave di recupero",
+    "New Recovery key password" : "Nuova password della chiave di recupero",
+    "Repeat New Recovery key password" : "Ripeti la nuova password della chiave di recupero",
+    "Change Password" : "Modifica password",
+    "Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
+    "Set your old private key password to your current log-in password:" : "Imposta la vecchia password della chiave privata sull'attuale password di accesso:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
+    "Old log-in password" : "Vecchia password di accesso",
+    "Current log-in password" : "Password di accesso attuale",
+    "Update Private Key Password" : "Aggiorna la password della chiave privata",
+    "Enable password recovery:" : "Abilita il ripristino della password:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/it.json b/apps/encryption/l10n/it.json
new file mode 100644
index 00000000000..0f66ddfb26d
--- /dev/null
+++ b/apps/encryption/l10n/it.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Manca la password della chiave di recupero",
+    "Please repeat the recovery key password" : "Ripeti la password della chiave di recupero",
+    "Repeated recovery key password does not match the provided recovery key password" : "La password della chiave di recupero ripetuta non corrisponde alla password della chiave di recupero fornita",
+    "Recovery key successfully enabled" : "Chiave di recupero abilitata correttamente",
+    "Could not enable recovery key. Please check your recovery key password!" : "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
+    "Recovery key successfully disabled" : "Chiave di recupero disabilitata correttamente",
+    "Could not disable recovery key. Please check your recovery key password!" : "Impossibile disabilitare la chiave di recupero. Verifica la password della chiave di recupero.",
+    "Please provide the old recovery password" : "Fornisci la vecchia password di recupero",
+    "Please provide a new recovery password" : "Fornisci una nuova password di recupero",
+    "Please repeat the new recovery password" : "Ripeti la nuova password di recupero",
+    "Password successfully changed." : "Password modificata correttamente.",
+    "Could not change the password. Maybe the old password was not correct." : "Impossibile cambiare la password. Forse la vecchia password non era corretta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):",
+    "Recovery key password" : "Password della chiave di recupero",
+    "Repeat Recovery key password" : "Ripeti la password della chiave di recupero",
+    "Enabled" : "Abilitata",
+    "Disabled" : "Disabilitata",
+    "Change recovery key password:" : "Cambia la password della chiave di recupero:",
+    "Old Recovery key password" : "Vecchia password della chiave di recupero",
+    "New Recovery key password" : "Nuova password della chiave di recupero",
+    "Repeat New Recovery key password" : "Ripeti la nuova password della chiave di recupero",
+    "Change Password" : "Modifica password",
+    "Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
+    "Set your old private key password to your current log-in password:" : "Imposta la vecchia password della chiave privata sull'attuale password di accesso:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
+    "Old log-in password" : "Vecchia password di accesso",
+    "Current log-in password" : "Password di accesso attuale",
+    "Update Private Key Password" : "Aggiorna la password della chiave privata",
+    "Enable password recovery:" : "Abilita il ripristino della password:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/ja.js b/apps/encryption/l10n/ja.js
new file mode 100644
index 00000000000..2cc31aa5291
--- /dev/null
+++ b/apps/encryption/l10n/ja.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "復旧キーのパスワードがありません",
+    "Please repeat the recovery key password" : "復旧キーのパスワードをもう一度入力",
+    "Repeated recovery key password does not match the provided recovery key password" : "入力された復旧キーのパスワードが一致しません。",
+    "Recovery key successfully enabled" : "リカバリ用のキーを正常に有効にしました",
+    "Could not enable recovery key. Please check your recovery key password!" : "リカバリ用のキーを有効にできませんでした。リカバリ用のキーのパスワードを確認してください！",
+    "Recovery key successfully disabled" : "リカバリ用のキーを正常に無効化しました",
+    "Could not disable recovery key. Please check your recovery key password!" : "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認してください！",
+    "Please provide the old recovery password" : "古い復旧キーのパスワードを入力",
+    "Please provide a new recovery password" : "新しい復旧キーのパスワードを入力",
+    "Please repeat the new recovery password" : "新しい復旧キーのパスワードをもう一度入力",
+    "Password successfully changed." : "パスワードを変更できました。",
+    "Could not change the password. Maybe the old password was not correct." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "リカバリキーを有効にする (パスワードを忘れた場合にユーザーのファイルを回復できます):",
+    "Recovery key password" : "リカバリキーのパスワード",
+    "Repeat Recovery key password" : "リカバリキーのパスワードをもう一度入力",
+    "Enabled" : "有効",
+    "Disabled" : "無効",
+    "Change recovery key password:" : "リカバリキーのパスワードを変更:",
+    "Old Recovery key password" : "古いリカバリキーのパスワード",
+    "New Recovery key password" : "新しいリカバリキーのパスワード",
+    "Repeat New Recovery key password" : "新しいリカバリキーのパスワードをもう一度入力",
+    "Change Password" : "パスワードを変更",
+    "Your private key password no longer matches your log-in password." : "もはや秘密鍵はログインパスワードと一致しません。",
+    "Set your old private key password to your current log-in password:" : "古い秘密鍵のパスワードを現在のログインパスワードに設定:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。",
+    "Old log-in password" : "古いログインパスワード",
+    "Current log-in password" : "現在のログインパスワード",
+    "Update Private Key Password" : "秘密鍵のパスワードを更新",
+    "Enable password recovery:" : "パスワードリカバリを有効に:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "このオプションを有効にすると、パスワードを紛失した場合も、暗号化されたファイルに再度アクセスすることができるようになります。"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/ja.json b/apps/encryption/l10n/ja.json
new file mode 100644
index 00000000000..c7e16f92233
--- /dev/null
+++ b/apps/encryption/l10n/ja.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "復旧キーのパスワードがありません",
+    "Please repeat the recovery key password" : "復旧キーのパスワードをもう一度入力",
+    "Repeated recovery key password does not match the provided recovery key password" : "入力された復旧キーのパスワードが一致しません。",
+    "Recovery key successfully enabled" : "リカバリ用のキーを正常に有効にしました",
+    "Could not enable recovery key. Please check your recovery key password!" : "リカバリ用のキーを有効にできませんでした。リカバリ用のキーのパスワードを確認してください！",
+    "Recovery key successfully disabled" : "リカバリ用のキーを正常に無効化しました",
+    "Could not disable recovery key. Please check your recovery key password!" : "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認してください！",
+    "Please provide the old recovery password" : "古い復旧キーのパスワードを入力",
+    "Please provide a new recovery password" : "新しい復旧キーのパスワードを入力",
+    "Please repeat the new recovery password" : "新しい復旧キーのパスワードをもう一度入力",
+    "Password successfully changed." : "パスワードを変更できました。",
+    "Could not change the password. Maybe the old password was not correct." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "リカバリキーを有効にする (パスワードを忘れた場合にユーザーのファイルを回復できます):",
+    "Recovery key password" : "リカバリキーのパスワード",
+    "Repeat Recovery key password" : "リカバリキーのパスワードをもう一度入力",
+    "Enabled" : "有効",
+    "Disabled" : "無効",
+    "Change recovery key password:" : "リカバリキーのパスワードを変更:",
+    "Old Recovery key password" : "古いリカバリキーのパスワード",
+    "New Recovery key password" : "新しいリカバリキーのパスワード",
+    "Repeat New Recovery key password" : "新しいリカバリキーのパスワードをもう一度入力",
+    "Change Password" : "パスワードを変更",
+    "Your private key password no longer matches your log-in password." : "もはや秘密鍵はログインパスワードと一致しません。",
+    "Set your old private key password to your current log-in password:" : "古い秘密鍵のパスワードを現在のログインパスワードに設定:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。",
+    "Old log-in password" : "古いログインパスワード",
+    "Current log-in password" : "現在のログインパスワード",
+    "Update Private Key Password" : "秘密鍵のパスワードを更新",
+    "Enable password recovery:" : "パスワードリカバリを有効に:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "このオプションを有効にすると、パスワードを紛失した場合も、暗号化されたファイルに再度アクセスすることができるようになります。"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/km.js b/apps/encryption/l10n/km.js
new file mode 100644
index 00000000000..d0ab537f5b9
--- /dev/null
+++ b/apps/encryption/l10n/km.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Password successfully changed." : "បាន​ប្ដូរ​ពាក្យ​សម្ងាត់​ដោយ​ជោគជ័យ។",
+    "Could not change the password. Maybe the old password was not correct." : "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​បាន​ទេ។ ប្រហែល​ពាក្យ​សម្ងាត់​ចាស់​មិន​ត្រឹម​ត្រូវ។",
+    "Enabled" : "បាន​បើក",
+    "Disabled" : "បាន​បិទ",
+    "Change Password" : "ប្ដូរ​ពាក្យ​សម្ងាត់"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/km.json b/apps/encryption/l10n/km.json
new file mode 100644
index 00000000000..40df66ca4a2
--- /dev/null
+++ b/apps/encryption/l10n/km.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Password successfully changed." : "បាន​ប្ដូរ​ពាក្យ​សម្ងាត់​ដោយ​ជោគជ័យ។",
+    "Could not change the password. Maybe the old password was not correct." : "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​បាន​ទេ។ ប្រហែល​ពាក្យ​សម្ងាត់​ចាស់​មិន​ត្រឹម​ត្រូវ។",
+    "Enabled" : "បាន​បើក",
+    "Disabled" : "បាន​បិទ",
+    "Change Password" : "ប្ដូរ​ពាក្យ​សម្ងាត់"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/kn.js b/apps/encryption/l10n/kn.js
new file mode 100644
index 00000000000..aca1cf249b1
--- /dev/null
+++ b/apps/encryption/l10n/kn.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ",
+    "Disabled" : "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/kn.json b/apps/encryption/l10n/kn.json
new file mode 100644
index 00000000000..8387e3890da
--- /dev/null
+++ b/apps/encryption/l10n/kn.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ",
+    "Disabled" : "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/ko.js b/apps/encryption/l10n/ko.js
new file mode 100644
index 00000000000..94551d42a86
--- /dev/null
+++ b/apps/encryption/l10n/ko.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "잊어버린 복구 키 암호 복구",
+    "Please repeat the recovery key password" : "복구 키 암호를 다시 입력하십시오",
+    "Repeated recovery key password does not match the provided recovery key password" : "입력한 복구 키 암호가 서로 다릅니다",
+    "Recovery key successfully enabled" : "복구 키가 성공적으로 활성화되었습니다",
+    "Could not enable recovery key. Please check your recovery key password!" : "복구 키를 활성화 할 수 없습니다. 복구 키의 암호를 확인해 주세요!",
+    "Recovery key successfully disabled" : "복구 키가 성공적으로 비활성화 되었습니다",
+    "Could not disable recovery key. Please check your recovery key password!" : "복구 키를 비활성화 할 수 없습니다. 복구 키의 암호를 확인해 주십시오!",
+    "Please provide the old recovery password" : "이전 복구 암호를 입력하십시오",
+    "Please provide a new recovery password" : "새 복구 암호를 입력하십시오",
+    "Please repeat the new recovery password" : "새 복구 암호를 다시 입력하십시오",
+    "Password successfully changed." : "암호가 성공적으로 변경되었습니다",
+    "Could not change the password. Maybe the old password was not correct." : "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "복구 키 사용 (암호를 잊었을 때 파일을 복구할 수 있도록 함):",
+    "Recovery key password" : "복구 키 암호",
+    "Repeat Recovery key password" : "복구 키 암호 재입력",
+    "Enabled" : "활성화",
+    "Disabled" : "비활성화",
+    "Change recovery key password:" : "복구 키 암호 변경:",
+    "Old Recovery key password" : "이전 복구 키 암호",
+    "New Recovery key password" : "새 복구 키 암호",
+    "Repeat New Recovery key password" : "새 복구 키 암호 재입력",
+    "Change Password" : "암호 변경",
+    "Your private key password no longer matches your log-in password." : "개인 키 암호와 로그인 암호가 일치하지 않습니다.",
+    "Set your old private key password to your current log-in password:" : "기존 개인 키 암호를 로그인 암호와 동일하게 설정하십시오:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : " 이전 암호가 기억나지 않으면 시스템 관리자에게 파일 복구를 요청하십시오.",
+    "Old log-in password" : "이전 로그인 암호",
+    "Current log-in password" : "현재 로그인 암호",
+    "Update Private Key Password" : "개인 키 암호 업데이트",
+    "Enable password recovery:" : "암호 복구 사용:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "이 옵션을 사용하면 암호를 잊었을 때 암호화된 파일에 다시 접근할 수 있습니다"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/ko.json b/apps/encryption/l10n/ko.json
new file mode 100644
index 00000000000..76824c4efc5
--- /dev/null
+++ b/apps/encryption/l10n/ko.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "잊어버린 복구 키 암호 복구",
+    "Please repeat the recovery key password" : "복구 키 암호를 다시 입력하십시오",
+    "Repeated recovery key password does not match the provided recovery key password" : "입력한 복구 키 암호가 서로 다릅니다",
+    "Recovery key successfully enabled" : "복구 키가 성공적으로 활성화되었습니다",
+    "Could not enable recovery key. Please check your recovery key password!" : "복구 키를 활성화 할 수 없습니다. 복구 키의 암호를 확인해 주세요!",
+    "Recovery key successfully disabled" : "복구 키가 성공적으로 비활성화 되었습니다",
+    "Could not disable recovery key. Please check your recovery key password!" : "복구 키를 비활성화 할 수 없습니다. 복구 키의 암호를 확인해 주십시오!",
+    "Please provide the old recovery password" : "이전 복구 암호를 입력하십시오",
+    "Please provide a new recovery password" : "새 복구 암호를 입력하십시오",
+    "Please repeat the new recovery password" : "새 복구 암호를 다시 입력하십시오",
+    "Password successfully changed." : "암호가 성공적으로 변경되었습니다",
+    "Could not change the password. Maybe the old password was not correct." : "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "복구 키 사용 (암호를 잊었을 때 파일을 복구할 수 있도록 함):",
+    "Recovery key password" : "복구 키 암호",
+    "Repeat Recovery key password" : "복구 키 암호 재입력",
+    "Enabled" : "활성화",
+    "Disabled" : "비활성화",
+    "Change recovery key password:" : "복구 키 암호 변경:",
+    "Old Recovery key password" : "이전 복구 키 암호",
+    "New Recovery key password" : "새 복구 키 암호",
+    "Repeat New Recovery key password" : "새 복구 키 암호 재입력",
+    "Change Password" : "암호 변경",
+    "Your private key password no longer matches your log-in password." : "개인 키 암호와 로그인 암호가 일치하지 않습니다.",
+    "Set your old private key password to your current log-in password:" : "기존 개인 키 암호를 로그인 암호와 동일하게 설정하십시오:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : " 이전 암호가 기억나지 않으면 시스템 관리자에게 파일 복구를 요청하십시오.",
+    "Old log-in password" : "이전 로그인 암호",
+    "Current log-in password" : "현재 로그인 암호",
+    "Update Private Key Password" : "개인 키 암호 업데이트",
+    "Enable password recovery:" : "암호 복구 사용:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "이 옵션을 사용하면 암호를 잊었을 때 암호화된 파일에 다시 접근할 수 있습니다"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/lt_LT.js b/apps/encryption/l10n/lt_LT.js
new file mode 100644
index 00000000000..cd1f0637aaf
--- /dev/null
+++ b/apps/encryption/l10n/lt_LT.js
@@ -0,0 +1,28 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Recovery key successfully enabled" : "Atkūrimo raktas sėkmingai įjungtas",
+    "Could not enable recovery key. Please check your recovery key password!" : "Neišėjo įjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
+    "Recovery key successfully disabled" : "Atkūrimo raktas sėkmingai išjungtas",
+    "Could not disable recovery key. Please check your recovery key password!" : "Neišėjo išjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
+    "Password successfully changed." : "Slaptažodis sėkmingai pakeistas",
+    "Could not change the password. Maybe the old password was not correct." : "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):",
+    "Recovery key password" : "Atkūrimo rakto slaptažodis",
+    "Repeat Recovery key password" : "Pakartokite atkūrimo rakto slaptažodį",
+    "Enabled" : "Įjungta",
+    "Disabled" : "Išjungta",
+    "Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
+    "Old Recovery key password" : "Senas atkūrimo rakto slaptažodis",
+    "New Recovery key password" : "Naujas atkūrimo rakto slaptažodis",
+    "Repeat New Recovery key password" : "Pakartokite naują atkūrimo rakto slaptažodį",
+    "Change Password" : "Pakeisti slaptažodį",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus.",
+    "Old log-in password" : "Senas prisijungimo slaptažodis",
+    "Current log-in password" : "Dabartinis prisijungimo slaptažodis",
+    "Update Private Key Password" : "Atnaujinti privataus rakto slaptažodį",
+    "Enable password recovery:" : "Įjungti slaptažodžio atkūrimą:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį."
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/encryption/l10n/lt_LT.json b/apps/encryption/l10n/lt_LT.json
new file mode 100644
index 00000000000..562afb8b8ca
--- /dev/null
+++ b/apps/encryption/l10n/lt_LT.json
@@ -0,0 +1,26 @@
+{ "translations": {
+    "Recovery key successfully enabled" : "Atkūrimo raktas sėkmingai įjungtas",
+    "Could not enable recovery key. Please check your recovery key password!" : "Neišėjo įjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
+    "Recovery key successfully disabled" : "Atkūrimo raktas sėkmingai išjungtas",
+    "Could not disable recovery key. Please check your recovery key password!" : "Neišėjo išjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
+    "Password successfully changed." : "Slaptažodis sėkmingai pakeistas",
+    "Could not change the password. Maybe the old password was not correct." : "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):",
+    "Recovery key password" : "Atkūrimo rakto slaptažodis",
+    "Repeat Recovery key password" : "Pakartokite atkūrimo rakto slaptažodį",
+    "Enabled" : "Įjungta",
+    "Disabled" : "Išjungta",
+    "Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
+    "Old Recovery key password" : "Senas atkūrimo rakto slaptažodis",
+    "New Recovery key password" : "Naujas atkūrimo rakto slaptažodis",
+    "Repeat New Recovery key password" : "Pakartokite naują atkūrimo rakto slaptažodį",
+    "Change Password" : "Pakeisti slaptažodį",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus.",
+    "Old log-in password" : "Senas prisijungimo slaptažodis",
+    "Current log-in password" : "Dabartinis prisijungimo slaptažodis",
+    "Update Private Key Password" : "Atnaujinti privataus rakto slaptažodį",
+    "Enable password recovery:" : "Įjungti slaptažodžio atkūrimą:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį."
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/lv.js b/apps/encryption/l10n/lv.js
new file mode 100644
index 00000000000..d3bccd6630b
--- /dev/null
+++ b/apps/encryption/l10n/lv.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifrēšanas lietotnes ir pieslēgta, bet šifrēšanas atslēgas nav uzstādītas. Lūdzu izejiet no sistēmas un ieejiet sistēmā atpakaļ.",
+    "Enabled" : "Pievienots"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/encryption/l10n/lv.json b/apps/encryption/l10n/lv.json
new file mode 100644
index 00000000000..c89c656100e
--- /dev/null
+++ b/apps/encryption/l10n/lv.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifrēšanas lietotnes ir pieslēgta, bet šifrēšanas atslēgas nav uzstādītas. Lūdzu izejiet no sistēmas un ieejiet sistēmā atpakaļ.",
+    "Enabled" : "Pievienots"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/mk.js b/apps/encryption/l10n/mk.js
new file mode 100644
index 00000000000..0391c489542
--- /dev/null
+++ b/apps/encryption/l10n/mk.js
@@ -0,0 +1,16 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Password successfully changed." : "Лозинката е успешно променета.",
+    "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
+    "Repeat Recovery key password" : "Повтори ја лозинката за клучот на обновување",
+    "Enabled" : "Овозможен",
+    "Disabled" : "Оневозможен",
+    "Old Recovery key password" : "Старата лозинка за клучот на обновување ",
+    "Repeat New Recovery key password" : "Повтори ја лозинката за клучот на обновувањето",
+    "Change Password" : "Смени лозинка",
+    "Old log-in password" : "Старата лозинка за најавување",
+    "Current log-in password" : "Тековната лозинка за најавување",
+    "Enable password recovery:" : "Овозможи го обновувањето на лозинката:"
+},
+"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/apps/encryption/l10n/mk.json b/apps/encryption/l10n/mk.json
new file mode 100644
index 00000000000..1886a626b6f
--- /dev/null
+++ b/apps/encryption/l10n/mk.json
@@ -0,0 +1,14 @@
+{ "translations": {
+    "Password successfully changed." : "Лозинката е успешно променета.",
+    "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
+    "Repeat Recovery key password" : "Повтори ја лозинката за клучот на обновување",
+    "Enabled" : "Овозможен",
+    "Disabled" : "Оневозможен",
+    "Old Recovery key password" : "Старата лозинка за клучот на обновување ",
+    "Repeat New Recovery key password" : "Повтори ја лозинката за клучот на обновувањето",
+    "Change Password" : "Смени лозинка",
+    "Old log-in password" : "Старата лозинка за најавување",
+    "Current log-in password" : "Тековната лозинка за најавување",
+    "Enable password recovery:" : "Овозможи го обновувањето на лозинката:"
+},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/nb_NO.js b/apps/encryption/l10n/nb_NO.js
new file mode 100644
index 00000000000..cdced9e124a
--- /dev/null
+++ b/apps/encryption/l10n/nb_NO.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Passord for gjenopprettingsnøkkel mangler",
+    "Please repeat the recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
+    "Repeated recovery key password does not match the provided recovery key password" : "Gjentatt passord for gjenopprettingsnøkkel stemmer ikke med oppgitt passord for gjenopprettingsnøkkel",
+    "Recovery key successfully enabled" : "Gjenopprettingsnøkkel aktivert",
+    "Could not enable recovery key. Please check your recovery key password!" : "Klarte ikke å aktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
+    "Recovery key successfully disabled" : "Gjenopprettingsnøkkel ble deaktivert",
+    "Could not disable recovery key. Please check your recovery key password!" : "Klarte ikke å deaktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
+    "Please provide the old recovery password" : "Oppgi det gamle gjenopprettingspassordet",
+    "Please provide a new recovery password" : "Oppgi et nytt gjenopprettingspassord",
+    "Please repeat the new recovery password" : "Gjenta det nye gjenopprettingspassordet",
+    "Password successfully changed." : "Passordet ble endret.",
+    "Could not change the password. Maybe the old password was not correct." : "Klarte ikke å endre passordet. Kanskje gammelt passord ikke var korrekt.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):",
+    "Recovery key password" : "Passord for gjenopprettingsnøkkel",
+    "Repeat Recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
+    "Enabled" : "Aktiv",
+    "Disabled" : "Inaktiv",
+    "Change recovery key password:" : "Endre passord for gjenopprettingsnøkkel:",
+    "Old Recovery key password" : "Gammelt passord for gjenopprettingsnøkkel",
+    "New Recovery key password" : "Nytt passord for gjenopprettingsnøkkel",
+    "Repeat New Recovery key password" : "Gjenta nytt passord for gjenopprettingsnøkkel",
+    "Change Password" : "Endre passord",
+    "Your private key password no longer matches your log-in password." : "Passordet for din private nøkkel stemmer ikke lenger med påloggingspassordet ditt.",
+    "Set your old private key password to your current log-in password:" : "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine.",
+    "Old log-in password" : "Gammelt påloggingspassord",
+    "Current log-in password" : "Nåværende påloggingspassord",
+    "Update Private Key Password" : "Oppdater passord for privat nøkkel",
+    "Enable password recovery:" : "Aktiver gjenoppretting av passord:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/nb_NO.json b/apps/encryption/l10n/nb_NO.json
new file mode 100644
index 00000000000..1526f1d3c1e
--- /dev/null
+++ b/apps/encryption/l10n/nb_NO.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Passord for gjenopprettingsnøkkel mangler",
+    "Please repeat the recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
+    "Repeated recovery key password does not match the provided recovery key password" : "Gjentatt passord for gjenopprettingsnøkkel stemmer ikke med oppgitt passord for gjenopprettingsnøkkel",
+    "Recovery key successfully enabled" : "Gjenopprettingsnøkkel aktivert",
+    "Could not enable recovery key. Please check your recovery key password!" : "Klarte ikke å aktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
+    "Recovery key successfully disabled" : "Gjenopprettingsnøkkel ble deaktivert",
+    "Could not disable recovery key. Please check your recovery key password!" : "Klarte ikke å deaktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
+    "Please provide the old recovery password" : "Oppgi det gamle gjenopprettingspassordet",
+    "Please provide a new recovery password" : "Oppgi et nytt gjenopprettingspassord",
+    "Please repeat the new recovery password" : "Gjenta det nye gjenopprettingspassordet",
+    "Password successfully changed." : "Passordet ble endret.",
+    "Could not change the password. Maybe the old password was not correct." : "Klarte ikke å endre passordet. Kanskje gammelt passord ikke var korrekt.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):",
+    "Recovery key password" : "Passord for gjenopprettingsnøkkel",
+    "Repeat Recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
+    "Enabled" : "Aktiv",
+    "Disabled" : "Inaktiv",
+    "Change recovery key password:" : "Endre passord for gjenopprettingsnøkkel:",
+    "Old Recovery key password" : "Gammelt passord for gjenopprettingsnøkkel",
+    "New Recovery key password" : "Nytt passord for gjenopprettingsnøkkel",
+    "Repeat New Recovery key password" : "Gjenta nytt passord for gjenopprettingsnøkkel",
+    "Change Password" : "Endre passord",
+    "Your private key password no longer matches your log-in password." : "Passordet for din private nøkkel stemmer ikke lenger med påloggingspassordet ditt.",
+    "Set your old private key password to your current log-in password:" : "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine.",
+    "Old log-in password" : "Gammelt påloggingspassord",
+    "Current log-in password" : "Nåværende påloggingspassord",
+    "Update Private Key Password" : "Oppdater passord for privat nøkkel",
+    "Enable password recovery:" : "Aktiver gjenoppretting av passord:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/nl.js b/apps/encryption/l10n/nl.js
new file mode 100644
index 00000000000..28a60c68172
--- /dev/null
+++ b/apps/encryption/l10n/nl.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Ontbrekende wachtwoord herstelsleutel",
+    "Please repeat the recovery key password" : "Herhaal het herstelsleutel wachtwoord",
+    "Repeated recovery key password does not match the provided recovery key password" : "Het herhaalde herstelsleutel wachtwoord kwam niet overeen met het eerdere herstelsleutel wachtwoord ",
+    "Recovery key successfully enabled" : "Herstelsleutel succesvol geactiveerd",
+    "Could not enable recovery key. Please check your recovery key password!" : "Kon herstelsleutel niet activeren. Controleer het wachtwoord van uw herstelsleutel!",
+    "Recovery key successfully disabled" : "Herstelsleutel succesvol gedeactiveerd",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!",
+    "Please provide the old recovery password" : "Geef het oude herstelwachtwoord op",
+    "Please provide a new recovery password" : "Geef een nieuw herstelwachtwoord op",
+    "Please repeat the new recovery password" : "Herhaal het nieuwe herstelwachtwoord",
+    "Password successfully changed." : "Wachtwoord succesvol gewijzigd.",
+    "Could not change the password. Maybe the old password was not correct." : "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):",
+    "Recovery key password" : "Wachtwoord herstelsleulel",
+    "Repeat Recovery key password" : "Herhaal het herstelsleutel wachtwoord",
+    "Enabled" : "Geactiveerd",
+    "Disabled" : "Gedeactiveerd",
+    "Change recovery key password:" : "Wijzig wachtwoord herstelsleutel:",
+    "Old Recovery key password" : "Oude wachtwoord herstelsleutel",
+    "New Recovery key password" : "Nieuwe wachtwoord herstelsleutel",
+    "Repeat New Recovery key password" : "Herhaal het nieuwe herstelsleutel wachtwoord",
+    "Change Password" : "Wijzigen wachtwoord",
+    "Your private key password no longer matches your log-in password." : "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord.",
+    "Set your old private key password to your current log-in password:" : "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Als u uw oude wachtwoord niet meer weet, kunt u uw beheerder vragen uw bestanden terug te halen.",
+    "Old log-in password" : "Oude wachtwoord",
+    "Current log-in password" : "Huidige wachtwoord",
+    "Update Private Key Password" : "Bijwerken wachtwoord Privésleutel",
+    "Enable password recovery:" : "Activeren wachtwoord herstel:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Het activeren van deze optie maakt het mogelijk om uw versleutelde bestanden te benaderen als uw wachtwoord kwijt is"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/nl.json b/apps/encryption/l10n/nl.json
new file mode 100644
index 00000000000..d1086717a35
--- /dev/null
+++ b/apps/encryption/l10n/nl.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Ontbrekende wachtwoord herstelsleutel",
+    "Please repeat the recovery key password" : "Herhaal het herstelsleutel wachtwoord",
+    "Repeated recovery key password does not match the provided recovery key password" : "Het herhaalde herstelsleutel wachtwoord kwam niet overeen met het eerdere herstelsleutel wachtwoord ",
+    "Recovery key successfully enabled" : "Herstelsleutel succesvol geactiveerd",
+    "Could not enable recovery key. Please check your recovery key password!" : "Kon herstelsleutel niet activeren. Controleer het wachtwoord van uw herstelsleutel!",
+    "Recovery key successfully disabled" : "Herstelsleutel succesvol gedeactiveerd",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!",
+    "Please provide the old recovery password" : "Geef het oude herstelwachtwoord op",
+    "Please provide a new recovery password" : "Geef een nieuw herstelwachtwoord op",
+    "Please repeat the new recovery password" : "Herhaal het nieuwe herstelwachtwoord",
+    "Password successfully changed." : "Wachtwoord succesvol gewijzigd.",
+    "Could not change the password. Maybe the old password was not correct." : "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):",
+    "Recovery key password" : "Wachtwoord herstelsleulel",
+    "Repeat Recovery key password" : "Herhaal het herstelsleutel wachtwoord",
+    "Enabled" : "Geactiveerd",
+    "Disabled" : "Gedeactiveerd",
+    "Change recovery key password:" : "Wijzig wachtwoord herstelsleutel:",
+    "Old Recovery key password" : "Oude wachtwoord herstelsleutel",
+    "New Recovery key password" : "Nieuwe wachtwoord herstelsleutel",
+    "Repeat New Recovery key password" : "Herhaal het nieuwe herstelsleutel wachtwoord",
+    "Change Password" : "Wijzigen wachtwoord",
+    "Your private key password no longer matches your log-in password." : "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord.",
+    "Set your old private key password to your current log-in password:" : "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Als u uw oude wachtwoord niet meer weet, kunt u uw beheerder vragen uw bestanden terug te halen.",
+    "Old log-in password" : "Oude wachtwoord",
+    "Current log-in password" : "Huidige wachtwoord",
+    "Update Private Key Password" : "Bijwerken wachtwoord Privésleutel",
+    "Enable password recovery:" : "Activeren wachtwoord herstel:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Het activeren van deze optie maakt het mogelijk om uw versleutelde bestanden te benaderen als uw wachtwoord kwijt is"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/pl.js b/apps/encryption/l10n/pl.js
new file mode 100644
index 00000000000..5bca5e7fe33
--- /dev/null
+++ b/apps/encryption/l10n/pl.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Brakujące hasło klucza odzyskiwania",
+    "Please repeat the recovery key password" : "Proszę powtórz nowe hasło klucza odzyskiwania",
+    "Repeated recovery key password does not match the provided recovery key password" : "Hasła klucza odzyskiwania nie zgadzają się",
+    "Recovery key successfully enabled" : "Klucz odzyskiwania włączony",
+    "Could not enable recovery key. Please check your recovery key password!" : "Nie można włączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
+    "Recovery key successfully disabled" : "Klucz odzyskiwania wyłączony",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
+    "Please provide the old recovery password" : "Podaj stare hasło odzyskiwania",
+    "Please provide a new recovery password" : "Podaj nowe hasło odzyskiwania",
+    "Please repeat the new recovery password" : "Proszę powtórz nowe hasło odzyskiwania",
+    "Password successfully changed." : "Zmiana hasła udana.",
+    "Could not change the password. Maybe the old password was not correct." : "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):",
+    "Recovery key password" : "Hasło klucza odzyskiwania",
+    "Repeat Recovery key password" : "Powtórz hasło klucza odzyskiwania",
+    "Enabled" : "Włączone",
+    "Disabled" : "Wyłączone",
+    "Change recovery key password:" : "Zmień hasło klucza odzyskiwania",
+    "Old Recovery key password" : "Stare hasło klucza odzyskiwania",
+    "New Recovery key password" : "Nowe hasło klucza odzyskiwania",
+    "Repeat New Recovery key password" : "Powtórz nowe hasło klucza odzyskiwania",
+    "Change Password" : "Zmień hasło",
+    "Your private key password no longer matches your log-in password." : "Hasło Twojego klucza prywatnego nie pasuje już do Twojego hasła logowania.",
+    "Set your old private key password to your current log-in password:" : "Ustaw stare hasło klucza prywatnego na aktualne hasło logowania:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki.",
+    "Old log-in password" : "Stare hasło logowania",
+    "Current log-in password" : "Bieżące hasło logowania",
+    "Update Private Key Password" : "Aktualizacja hasła klucza prywatnego",
+    "Enable password recovery:" : "Włącz hasło odzyskiwania:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła"
+},
+"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/encryption/l10n/pl.json b/apps/encryption/l10n/pl.json
new file mode 100644
index 00000000000..c883b8ab718
--- /dev/null
+++ b/apps/encryption/l10n/pl.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Brakujące hasło klucza odzyskiwania",
+    "Please repeat the recovery key password" : "Proszę powtórz nowe hasło klucza odzyskiwania",
+    "Repeated recovery key password does not match the provided recovery key password" : "Hasła klucza odzyskiwania nie zgadzają się",
+    "Recovery key successfully enabled" : "Klucz odzyskiwania włączony",
+    "Could not enable recovery key. Please check your recovery key password!" : "Nie można włączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
+    "Recovery key successfully disabled" : "Klucz odzyskiwania wyłączony",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
+    "Please provide the old recovery password" : "Podaj stare hasło odzyskiwania",
+    "Please provide a new recovery password" : "Podaj nowe hasło odzyskiwania",
+    "Please repeat the new recovery password" : "Proszę powtórz nowe hasło odzyskiwania",
+    "Password successfully changed." : "Zmiana hasła udana.",
+    "Could not change the password. Maybe the old password was not correct." : "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):",
+    "Recovery key password" : "Hasło klucza odzyskiwania",
+    "Repeat Recovery key password" : "Powtórz hasło klucza odzyskiwania",
+    "Enabled" : "Włączone",
+    "Disabled" : "Wyłączone",
+    "Change recovery key password:" : "Zmień hasło klucza odzyskiwania",
+    "Old Recovery key password" : "Stare hasło klucza odzyskiwania",
+    "New Recovery key password" : "Nowe hasło klucza odzyskiwania",
+    "Repeat New Recovery key password" : "Powtórz nowe hasło klucza odzyskiwania",
+    "Change Password" : "Zmień hasło",
+    "Your private key password no longer matches your log-in password." : "Hasło Twojego klucza prywatnego nie pasuje już do Twojego hasła logowania.",
+    "Set your old private key password to your current log-in password:" : "Ustaw stare hasło klucza prywatnego na aktualne hasło logowania:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki.",
+    "Old log-in password" : "Stare hasło logowania",
+    "Current log-in password" : "Bieżące hasło logowania",
+    "Update Private Key Password" : "Aktualizacja hasła klucza prywatnego",
+    "Enable password recovery:" : "Włącz hasło odzyskiwania:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła"
+},"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/pt_BR.js b/apps/encryption/l10n/pt_BR.js
new file mode 100644
index 00000000000..0511e8223d8
--- /dev/null
+++ b/apps/encryption/l10n/pt_BR.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Senha da chave de recuperação em falta",
+    "Please repeat the recovery key password" : "Por favor, repita a senha da chave de recuperação",
+    "Repeated recovery key password does not match the provided recovery key password" : "A senha repetidas da chave de valorização não corresponde a senha da chave de recuperação prevista",
+    "Recovery key successfully enabled" : "Recuperação de chave habilitada com sucesso",
+    "Could not enable recovery key. Please check your recovery key password!" : "Impossível habilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
+    "Recovery key successfully disabled" : "Recuperação de chave desabilitada com sucesso",
+    "Could not disable recovery key. Please check your recovery key password!" : "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
+    "Please provide the old recovery password" : "Por favor, forneça a antiga senha de recuperação",
+    "Please provide a new recovery password" : "Por favor, forneça a nova senha de recuperação",
+    "Please repeat the new recovery password" : "Por favor, repita a nova senha de recuperação",
+    "Password successfully changed." : "Senha alterada com sucesso.",
+    "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):",
+    "Recovery key password" : "Senha da chave de recuperação",
+    "Repeat Recovery key password" : "Repita Recuperação de senha da chave",
+    "Enabled" : "Habilitado",
+    "Disabled" : "Desabilitado",
+    "Change recovery key password:" : "Mudar a senha da chave de recuperação:",
+    "Old Recovery key password" : "Senha antiga da chave de recuperação",
+    "New Recovery key password" : "Nova senha da chave de recuperação",
+    "Repeat New Recovery key password" : "Repita Nova senha da chave de recuperação",
+    "Change Password" : "Trocar Senha",
+    "Your private key password no longer matches your log-in password." : "A sua senha de chave privada não corresponde a sua senha de login.",
+    "Set your old private key password to your current log-in password:" : "Defina a sua antiga senha da chave privada para sua senha de login atual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos.",
+    "Old log-in password" : "Senha antiga de login",
+    "Current log-in password" : "Senha de login atual",
+    "Update Private Key Password" : "Atualizar Senha de Chave Privada",
+    "Enable password recovery:" : "Habilitar recuperação de senha:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/encryption/l10n/pt_BR.json b/apps/encryption/l10n/pt_BR.json
new file mode 100644
index 00000000000..7fde33da2b4
--- /dev/null
+++ b/apps/encryption/l10n/pt_BR.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Senha da chave de recuperação em falta",
+    "Please repeat the recovery key password" : "Por favor, repita a senha da chave de recuperação",
+    "Repeated recovery key password does not match the provided recovery key password" : "A senha repetidas da chave de valorização não corresponde a senha da chave de recuperação prevista",
+    "Recovery key successfully enabled" : "Recuperação de chave habilitada com sucesso",
+    "Could not enable recovery key. Please check your recovery key password!" : "Impossível habilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
+    "Recovery key successfully disabled" : "Recuperação de chave desabilitada com sucesso",
+    "Could not disable recovery key. Please check your recovery key password!" : "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
+    "Please provide the old recovery password" : "Por favor, forneça a antiga senha de recuperação",
+    "Please provide a new recovery password" : "Por favor, forneça a nova senha de recuperação",
+    "Please repeat the new recovery password" : "Por favor, repita a nova senha de recuperação",
+    "Password successfully changed." : "Senha alterada com sucesso.",
+    "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):",
+    "Recovery key password" : "Senha da chave de recuperação",
+    "Repeat Recovery key password" : "Repita Recuperação de senha da chave",
+    "Enabled" : "Habilitado",
+    "Disabled" : "Desabilitado",
+    "Change recovery key password:" : "Mudar a senha da chave de recuperação:",
+    "Old Recovery key password" : "Senha antiga da chave de recuperação",
+    "New Recovery key password" : "Nova senha da chave de recuperação",
+    "Repeat New Recovery key password" : "Repita Nova senha da chave de recuperação",
+    "Change Password" : "Trocar Senha",
+    "Your private key password no longer matches your log-in password." : "A sua senha de chave privada não corresponde a sua senha de login.",
+    "Set your old private key password to your current log-in password:" : "Defina a sua antiga senha da chave privada para sua senha de login atual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos.",
+    "Old log-in password" : "Senha antiga de login",
+    "Current log-in password" : "Senha de login atual",
+    "Update Private Key Password" : "Atualizar Senha de Chave Privada",
+    "Enable password recovery:" : "Habilitar recuperação de senha:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/pt_PT.js b/apps/encryption/l10n/pt_PT.js
new file mode 100644
index 00000000000..f91dabc6998
--- /dev/null
+++ b/apps/encryption/l10n/pt_PT.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Senha da chave de recuperação em falta",
+    "Please repeat the recovery key password" : "Por favor, insira a contrassenha da chave de recuperação",
+    "Repeated recovery key password does not match the provided recovery key password" : "A palavra-passe de recuperação repetida não corresponde à palavra-passe fornecida",
+    "Recovery key successfully enabled" : "A chave de recuperação foi ativada com sucesso",
+    "Could not enable recovery key. Please check your recovery key password!" : "Não foi possível ativar a chave de recuperação. Por favor, verifique a sua senha da chave de recuperação!",
+    "Recovery key successfully disabled" : "A chave de recuperação foi desativada com sucesso",
+    "Could not disable recovery key. Please check your recovery key password!" : "Não foi possível desativar a chave de recuperação. Por favor, verifique a senha da chave de recuperação.",
+    "Please provide the old recovery password" : "Escreva a palavra-passe de recuperação antiga",
+    "Please provide a new recovery password" : "Escreva a nova palavra-passe de recuperação",
+    "Please repeat the new recovery password" : "Escreva de novo a nova palavra-passe de recuperação",
+    "Password successfully changed." : "Palavra-passe alterada com sucesso.",
+    "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Ativar a chave de recuperação (permite recuperar os ficheiros do utilizador, se perder a senha):",
+    "Recovery key password" : "Senha da chave de recuperação",
+    "Repeat Recovery key password" : "Contrassenha da chave de recuperação",
+    "Enabled" : "Ativada",
+    "Disabled" : "Desactivada",
+    "Change recovery key password:" : "Alterar a senha da chave de recuperação:",
+    "Old Recovery key password" : "Senha da chave de recuperação antiga",
+    "New Recovery key password" : "Nova senha da chave de recuperação",
+    "Repeat New Recovery key password" : "Contrassenha da nova chave de recuperação",
+    "Change Password" : "Alterar a Senha",
+    "Your private key password no longer matches your log-in password." : "A Password da sua chave privada não coincide mais com a password do seu login.",
+    "Set your old private key password to your current log-in password:" : "Altere a password antiga da chave privada para a nova password do login:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Se não se lembra da senha antiga pode pedir ao administrador para recuperar os seus ficheiros. ",
+    "Old log-in password" : "Senha de iniciar sessão antiga",
+    "Current log-in password" : "Senha de iniciar sessão atual",
+    "Update Private Key Password" : "Atualizar Senha da Chave Privada ",
+    "Enable password recovery:" : "Ativar a recuperação da senha:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ao ativar esta opção, irá poder obter o acesso aos seus ficheiros encriptados, se perder a senha"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/pt_PT.json b/apps/encryption/l10n/pt_PT.json
new file mode 100644
index 00000000000..b13e94f2078
--- /dev/null
+++ b/apps/encryption/l10n/pt_PT.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Senha da chave de recuperação em falta",
+    "Please repeat the recovery key password" : "Por favor, insira a contrassenha da chave de recuperação",
+    "Repeated recovery key password does not match the provided recovery key password" : "A palavra-passe de recuperação repetida não corresponde à palavra-passe fornecida",
+    "Recovery key successfully enabled" : "A chave de recuperação foi ativada com sucesso",
+    "Could not enable recovery key. Please check your recovery key password!" : "Não foi possível ativar a chave de recuperação. Por favor, verifique a sua senha da chave de recuperação!",
+    "Recovery key successfully disabled" : "A chave de recuperação foi desativada com sucesso",
+    "Could not disable recovery key. Please check your recovery key password!" : "Não foi possível desativar a chave de recuperação. Por favor, verifique a senha da chave de recuperação.",
+    "Please provide the old recovery password" : "Escreva a palavra-passe de recuperação antiga",
+    "Please provide a new recovery password" : "Escreva a nova palavra-passe de recuperação",
+    "Please repeat the new recovery password" : "Escreva de novo a nova palavra-passe de recuperação",
+    "Password successfully changed." : "Palavra-passe alterada com sucesso.",
+    "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Ativar a chave de recuperação (permite recuperar os ficheiros do utilizador, se perder a senha):",
+    "Recovery key password" : "Senha da chave de recuperação",
+    "Repeat Recovery key password" : "Contrassenha da chave de recuperação",
+    "Enabled" : "Ativada",
+    "Disabled" : "Desactivada",
+    "Change recovery key password:" : "Alterar a senha da chave de recuperação:",
+    "Old Recovery key password" : "Senha da chave de recuperação antiga",
+    "New Recovery key password" : "Nova senha da chave de recuperação",
+    "Repeat New Recovery key password" : "Contrassenha da nova chave de recuperação",
+    "Change Password" : "Alterar a Senha",
+    "Your private key password no longer matches your log-in password." : "A Password da sua chave privada não coincide mais com a password do seu login.",
+    "Set your old private key password to your current log-in password:" : "Altere a password antiga da chave privada para a nova password do login:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Se não se lembra da senha antiga pode pedir ao administrador para recuperar os seus ficheiros. ",
+    "Old log-in password" : "Senha de iniciar sessão antiga",
+    "Current log-in password" : "Senha de iniciar sessão atual",
+    "Update Private Key Password" : "Atualizar Senha da Chave Privada ",
+    "Enable password recovery:" : "Ativar a recuperação da senha:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ao ativar esta opção, irá poder obter o acesso aos seus ficheiros encriptados, se perder a senha"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/ro.js b/apps/encryption/l10n/ro.js
new file mode 100644
index 00000000000..fdeb33df8c3
--- /dev/null
+++ b/apps/encryption/l10n/ro.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Recovery key successfully enabled" : "Cheia de recupeare a fost activata cu succes",
+    "Could not enable recovery key. Please check your recovery key password!" : "Nu s-a putut activa cheia de recuperare. Verifica parola de recuperare!",
+    "Recovery key successfully disabled" : "Cheia de recuperare dezactivata cu succes",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nu am putut dezactiva cheia de recuperare. Verifica parola de recuperare!",
+    "Password successfully changed." : "Parola a fost modificată cu succes.",
+    "Could not change the password. Maybe the old password was not correct." : "Parola nu a putut fi schimbata. Poate ca parola veche este incorecta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicatia de criptare este activata dar tastatura nu este initializata , va rugam deconectati-va si reconectati-va",
+    "Enabled" : "Activat",
+    "Disabled" : "Dezactivat",
+    "Change Password" : "Schimbă parola"
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/apps/encryption/l10n/ro.json b/apps/encryption/l10n/ro.json
new file mode 100644
index 00000000000..94b67b91db9
--- /dev/null
+++ b/apps/encryption/l10n/ro.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Recovery key successfully enabled" : "Cheia de recupeare a fost activata cu succes",
+    "Could not enable recovery key. Please check your recovery key password!" : "Nu s-a putut activa cheia de recuperare. Verifica parola de recuperare!",
+    "Recovery key successfully disabled" : "Cheia de recuperare dezactivata cu succes",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nu am putut dezactiva cheia de recuperare. Verifica parola de recuperare!",
+    "Password successfully changed." : "Parola a fost modificată cu succes.",
+    "Could not change the password. Maybe the old password was not correct." : "Parola nu a putut fi schimbata. Poate ca parola veche este incorecta.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicatia de criptare este activata dar tastatura nu este initializata , va rugam deconectati-va si reconectati-va",
+    "Enabled" : "Activat",
+    "Disabled" : "Dezactivat",
+    "Change Password" : "Schimbă parola"
+},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/ru.js b/apps/encryption/l10n/ru.js
new file mode 100644
index 00000000000..e473ab7df1d
--- /dev/null
+++ b/apps/encryption/l10n/ru.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Отсутствует пароль восстановления ключа",
+    "Please repeat the recovery key password" : "Повторите ввод пароля ключа восстановления",
+    "Repeated recovery key password does not match the provided recovery key password" : "Пароль ключа восстановления и повтор пароля не совпадают",
+    "Recovery key successfully enabled" : "Ключ восстановления успешно установлен",
+    "Could not enable recovery key. Please check your recovery key password!" : "Невозможно включить ключ восстановления. Проверьте правильность пароля от ключа!",
+    "Recovery key successfully disabled" : "Ключ восстановления успешно отключен",
+    "Could not disable recovery key. Please check your recovery key password!" : "Невозможно выключить ключ восстановления. Проверьте правильность пароля от ключа!",
+    "Please provide the old recovery password" : "Введите старый пароль восстановления",
+    "Please provide a new recovery password" : "Введите новый пароль восстановления",
+    "Please repeat the new recovery password" : "Повторите новый пароль восстановления",
+    "Password successfully changed." : "Пароль успешно изменен.",
+    "Could not change the password. Maybe the old password was not correct." : "Невозможно изменить пароль. Возможно, указанный старый пароль не верен.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Включить ключ восстановления (позволяет пользователям восстановить файлы при потере пароля):",
+    "Recovery key password" : "Пароль ключа восстановления",
+    "Repeat Recovery key password" : "Повторите пароль ключа восстановления",
+    "Enabled" : "Включено",
+    "Disabled" : "Отключено",
+    "Change recovery key password:" : "Смена пароля ключа восстановления:",
+    "Old Recovery key password" : "Старый пароль ключа восстановления",
+    "New Recovery key password" : "Новый пароль ключа восстановления",
+    "Repeat New Recovery key password" : "Повторите новый пароль ключа восстановления",
+    "Change Password" : "Изменить пароль",
+    "Your private key password no longer matches your log-in password." : "Пароль закрытого ключа больше не соответствует паролю вашей учетной записи.",
+    "Set your old private key password to your current log-in password:" : "Замените старый пароль закрытого ключа на текущий пароль учётной записи.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы",
+    "Old log-in password" : "Старый пароль учётной записи",
+    "Current log-in password" : "Текущий пароль учётной записи",
+    "Update Private Key Password" : "Обновить пароль закрытого ключа",
+    "Enable password recovery:" : "Включить восстановление пароля:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/encryption/l10n/ru.json b/apps/encryption/l10n/ru.json
new file mode 100644
index 00000000000..67d0d70fccf
--- /dev/null
+++ b/apps/encryption/l10n/ru.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Отсутствует пароль восстановления ключа",
+    "Please repeat the recovery key password" : "Повторите ввод пароля ключа восстановления",
+    "Repeated recovery key password does not match the provided recovery key password" : "Пароль ключа восстановления и повтор пароля не совпадают",
+    "Recovery key successfully enabled" : "Ключ восстановления успешно установлен",
+    "Could not enable recovery key. Please check your recovery key password!" : "Невозможно включить ключ восстановления. Проверьте правильность пароля от ключа!",
+    "Recovery key successfully disabled" : "Ключ восстановления успешно отключен",
+    "Could not disable recovery key. Please check your recovery key password!" : "Невозможно выключить ключ восстановления. Проверьте правильность пароля от ключа!",
+    "Please provide the old recovery password" : "Введите старый пароль восстановления",
+    "Please provide a new recovery password" : "Введите новый пароль восстановления",
+    "Please repeat the new recovery password" : "Повторите новый пароль восстановления",
+    "Password successfully changed." : "Пароль успешно изменен.",
+    "Could not change the password. Maybe the old password was not correct." : "Невозможно изменить пароль. Возможно, указанный старый пароль не верен.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Включить ключ восстановления (позволяет пользователям восстановить файлы при потере пароля):",
+    "Recovery key password" : "Пароль ключа восстановления",
+    "Repeat Recovery key password" : "Повторите пароль ключа восстановления",
+    "Enabled" : "Включено",
+    "Disabled" : "Отключено",
+    "Change recovery key password:" : "Смена пароля ключа восстановления:",
+    "Old Recovery key password" : "Старый пароль ключа восстановления",
+    "New Recovery key password" : "Новый пароль ключа восстановления",
+    "Repeat New Recovery key password" : "Повторите новый пароль ключа восстановления",
+    "Change Password" : "Изменить пароль",
+    "Your private key password no longer matches your log-in password." : "Пароль закрытого ключа больше не соответствует паролю вашей учетной записи.",
+    "Set your old private key password to your current log-in password:" : "Замените старый пароль закрытого ключа на текущий пароль учётной записи.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы",
+    "Old log-in password" : "Старый пароль учётной записи",
+    "Current log-in password" : "Текущий пароль учётной записи",
+    "Update Private Key Password" : "Обновить пароль закрытого ключа",
+    "Enable password recovery:" : "Включить восстановление пароля:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/sk_SK.js b/apps/encryption/l10n/sk_SK.js
new file mode 100644
index 00000000000..bf05b8a8c8b
--- /dev/null
+++ b/apps/encryption/l10n/sk_SK.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Chýba kľúč pre obnovu hesla",
+    "Please repeat the recovery key password" : "Prosím zopakujte heslo kľúča pre obnovu",
+    "Repeated recovery key password does not match the provided recovery key password" : "Zopakované heslo kľúča pre obnovenie nesúhlasí zo zadaným heslom",
+    "Recovery key successfully enabled" : "Záchranný kľúč bol úspešne povolený",
+    "Could not enable recovery key. Please check your recovery key password!" : "Nepodarilo sa povoliť záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
+    "Recovery key successfully disabled" : "Záchranný kľúč bol úspešne zakázaný",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
+    "Please provide the old recovery password" : "Zadajte prosím staré heslo pre obnovenie",
+    "Please provide a new recovery password" : "Zadajte prosím nové heslo pre obnovenie",
+    "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pre obnovenie",
+    "Password successfully changed." : "Heslo úspešne zmenené.",
+    "Could not change the password. Maybe the old password was not correct." : "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):",
+    "Recovery key password" : "Heslo obnovovacieho kľúča",
+    "Repeat Recovery key password" : "Zopakujte heslo kľúča pre obnovu",
+    "Enabled" : "Povolené",
+    "Disabled" : "Zakázané",
+    "Change recovery key password:" : "Zmeniť heslo obnovovacieho kľúča:",
+    "Old Recovery key password" : "Staré heslo obnovovacieho kľúča",
+    "New Recovery key password" : "Nové heslo obnovovacieho kľúča",
+    "Repeat New Recovery key password" : "Zopakujte nové heslo kľúča pre obnovu",
+    "Change Password" : "Zmeniť heslo",
+    "Your private key password no longer matches your log-in password." : "Heslo vášho súkromného kľúča sa nezhoduje v vašim prihlasovacím heslom.",
+    "Set your old private key password to your current log-in password:" : "Zmeňte si vaše staré heslo súkromného kľúča na rovnaké, aké je vaše aktuálne prihlasovacie heslo:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie svojich súborov.",
+    "Old log-in password" : "Staré prihlasovacie heslo",
+    "Current log-in password" : "Súčasné prihlasovacie heslo",
+    "Update Private Key Password" : "Aktualizovať heslo súkromného kľúča",
+    "Enable password recovery:" : "Povoliť obnovu hesla:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/encryption/l10n/sk_SK.json b/apps/encryption/l10n/sk_SK.json
new file mode 100644
index 00000000000..66f629af91f
--- /dev/null
+++ b/apps/encryption/l10n/sk_SK.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Chýba kľúč pre obnovu hesla",
+    "Please repeat the recovery key password" : "Prosím zopakujte heslo kľúča pre obnovu",
+    "Repeated recovery key password does not match the provided recovery key password" : "Zopakované heslo kľúča pre obnovenie nesúhlasí zo zadaným heslom",
+    "Recovery key successfully enabled" : "Záchranný kľúč bol úspešne povolený",
+    "Could not enable recovery key. Please check your recovery key password!" : "Nepodarilo sa povoliť záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
+    "Recovery key successfully disabled" : "Záchranný kľúč bol úspešne zakázaný",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
+    "Please provide the old recovery password" : "Zadajte prosím staré heslo pre obnovenie",
+    "Please provide a new recovery password" : "Zadajte prosím nové heslo pre obnovenie",
+    "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pre obnovenie",
+    "Password successfully changed." : "Heslo úspešne zmenené.",
+    "Could not change the password. Maybe the old password was not correct." : "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):",
+    "Recovery key password" : "Heslo obnovovacieho kľúča",
+    "Repeat Recovery key password" : "Zopakujte heslo kľúča pre obnovu",
+    "Enabled" : "Povolené",
+    "Disabled" : "Zakázané",
+    "Change recovery key password:" : "Zmeniť heslo obnovovacieho kľúča:",
+    "Old Recovery key password" : "Staré heslo obnovovacieho kľúča",
+    "New Recovery key password" : "Nové heslo obnovovacieho kľúča",
+    "Repeat New Recovery key password" : "Zopakujte nové heslo kľúča pre obnovu",
+    "Change Password" : "Zmeniť heslo",
+    "Your private key password no longer matches your log-in password." : "Heslo vášho súkromného kľúča sa nezhoduje v vašim prihlasovacím heslom.",
+    "Set your old private key password to your current log-in password:" : "Zmeňte si vaše staré heslo súkromného kľúča na rovnaké, aké je vaše aktuálne prihlasovacie heslo:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie svojich súborov.",
+    "Old log-in password" : "Staré prihlasovacie heslo",
+    "Current log-in password" : "Súčasné prihlasovacie heslo",
+    "Update Private Key Password" : "Aktualizovať heslo súkromného kľúča",
+    "Enable password recovery:" : "Povoliť obnovu hesla:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/sl.js b/apps/encryption/l10n/sl.js
new file mode 100644
index 00000000000..3e9dd2d76b6
--- /dev/null
+++ b/apps/encryption/l10n/sl.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Manjka ključ za obnovitev",
+    "Please repeat the recovery key password" : "Ponovite vpis ključa za obnovitev",
+    "Repeated recovery key password does not match the provided recovery key password" : "Ponovljen vpis ključa za obnovitev ni enak prvemu vpisu tega ključa",
+    "Recovery key successfully enabled" : "Ključ za obnovitev gesla je uspešno nastavljen",
+    "Could not enable recovery key. Please check your recovery key password!" : "Ključa za obnovitev gesla ni mogoče nastaviti. Preverite ključ!",
+    "Recovery key successfully disabled" : "Ključ za obnovitev gesla je uspešno onemogočen",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ključa za obnovitev gesla ni mogoče onemogočiti. Preverite ključ!",
+    "Please provide the old recovery password" : "Vpišite star ključ za obnovitev",
+    "Please provide a new recovery password" : "Vpišite nov ključ za obnovitev",
+    "Please repeat the new recovery password" : "Ponovno vpišite nov ključ za obnovitev",
+    "Password successfully changed." : "Geslo je uspešno spremenjeno.",
+    "Could not change the password. Maybe the old password was not correct." : "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Omogoči ključ za obnovitev datotek (v primeru izgube gesla):",
+    "Recovery key password" : "Ključ za obnovitev gesla",
+    "Repeat Recovery key password" : "Ponovi ključ za obnovitev gesla",
+    "Enabled" : "Omogočeno",
+    "Disabled" : "Onemogočeno",
+    "Change recovery key password:" : "Spremeni ključ za obnovitev gesla:",
+    "Old Recovery key password" : "Stari ključ za obnovitev gesla",
+    "New Recovery key password" : "Novi ključ za obnovitev gesla",
+    "Repeat New Recovery key password" : "Ponovi novi ključ za obnovitev gesla",
+    "Change Password" : "Spremeni geslo",
+    "Your private key password no longer matches your log-in password." : "Zasebno geslo ni več skladno s prijavnim geslom.",
+    "Set your old private key password to your current log-in password:" : "Nastavite star zasebni ključ na trenutno prijavno geslo:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Če ste pozabili svoje geslo, lahko vaše datoteke obnovi le skrbnik sistema.",
+    "Old log-in password" : "Staro geslo",
+    "Current log-in password" : "Trenutno geslo",
+    "Update Private Key Password" : "Posodobi zasebni ključ",
+    "Enable password recovery:" : "Omogoči obnovitev gesla:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Nastavitev te možnosti omogoča ponovno pridobitev dostopa do šifriranih datotek, v primeru, da boste geslo pozabili."
+},
+"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/encryption/l10n/sl.json b/apps/encryption/l10n/sl.json
new file mode 100644
index 00000000000..3b3f55794df
--- /dev/null
+++ b/apps/encryption/l10n/sl.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Manjka ključ za obnovitev",
+    "Please repeat the recovery key password" : "Ponovite vpis ključa za obnovitev",
+    "Repeated recovery key password does not match the provided recovery key password" : "Ponovljen vpis ključa za obnovitev ni enak prvemu vpisu tega ključa",
+    "Recovery key successfully enabled" : "Ključ za obnovitev gesla je uspešno nastavljen",
+    "Could not enable recovery key. Please check your recovery key password!" : "Ključa za obnovitev gesla ni mogoče nastaviti. Preverite ključ!",
+    "Recovery key successfully disabled" : "Ključ za obnovitev gesla je uspešno onemogočen",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ključa za obnovitev gesla ni mogoče onemogočiti. Preverite ključ!",
+    "Please provide the old recovery password" : "Vpišite star ključ za obnovitev",
+    "Please provide a new recovery password" : "Vpišite nov ključ za obnovitev",
+    "Please repeat the new recovery password" : "Ponovno vpišite nov ključ za obnovitev",
+    "Password successfully changed." : "Geslo je uspešno spremenjeno.",
+    "Could not change the password. Maybe the old password was not correct." : "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Omogoči ključ za obnovitev datotek (v primeru izgube gesla):",
+    "Recovery key password" : "Ključ za obnovitev gesla",
+    "Repeat Recovery key password" : "Ponovi ključ za obnovitev gesla",
+    "Enabled" : "Omogočeno",
+    "Disabled" : "Onemogočeno",
+    "Change recovery key password:" : "Spremeni ključ za obnovitev gesla:",
+    "Old Recovery key password" : "Stari ključ za obnovitev gesla",
+    "New Recovery key password" : "Novi ključ za obnovitev gesla",
+    "Repeat New Recovery key password" : "Ponovi novi ključ za obnovitev gesla",
+    "Change Password" : "Spremeni geslo",
+    "Your private key password no longer matches your log-in password." : "Zasebno geslo ni več skladno s prijavnim geslom.",
+    "Set your old private key password to your current log-in password:" : "Nastavite star zasebni ključ na trenutno prijavno geslo:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Če ste pozabili svoje geslo, lahko vaše datoteke obnovi le skrbnik sistema.",
+    "Old log-in password" : "Staro geslo",
+    "Current log-in password" : "Trenutno geslo",
+    "Update Private Key Password" : "Posodobi zasebni ključ",
+    "Enable password recovery:" : "Omogoči obnovitev gesla:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Nastavitev te možnosti omogoča ponovno pridobitev dostopa do šifriranih datotek, v primeru, da boste geslo pozabili."
+},"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/sq.js b/apps/encryption/l10n/sq.js
new file mode 100644
index 00000000000..672859cc166
--- /dev/null
+++ b/apps/encryption/l10n/sq.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Enabled" : "Aktivizuar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/sq.json b/apps/encryption/l10n/sq.json
new file mode 100644
index 00000000000..b0e2b66e012
--- /dev/null
+++ b/apps/encryption/l10n/sq.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Enabled" : "Aktivizuar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/sr.js b/apps/encryption/l10n/sr.js
new file mode 100644
index 00000000000..b9d31514afb
--- /dev/null
+++ b/apps/encryption/l10n/sr.js
@@ -0,0 +1,35 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Недостаје лозинка кључа за опоравак",
+    "Please repeat the recovery key password" : "Поновите лозинку кључа за опоравак",
+    "Repeated recovery key password does not match the provided recovery key password" : "Поновљена лозинка кључа за опоравак се не поклапа",
+    "Recovery key successfully enabled" : "Кључ за опоравак успешно укључен",
+    "Recovery key successfully disabled" : "Кључ за опоравак успешно искључен",
+    "Could not disable recovery key. Please check your recovery key password!" : "Не могу да искључим кључ за опоравак. Проверите лозинку!",
+    "Please provide the old recovery password" : "Унесите стару лозинку опоравка",
+    "Please provide a new recovery password" : "Унесите нову лозинку опоравка",
+    "Please repeat the new recovery password" : "Поновите нову лозинку опоравка",
+    "Password successfully changed." : "Лозинка успешно промењена.",
+    "Could not change the password. Maybe the old password was not correct." : "Не могу да променим лозинку. Можда стара лозинка није исправна.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Апликација шифровања је укључена али ваши кључеви нису иницијализовани. Одјавите се и поново се пријавите.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Омогући кључ за опоравак (омогућава опоравак корисничких фајлова у случају губитка лозинке):",
+    "Recovery key password" : "Лозинка кључа за опоравак",
+    "Repeat Recovery key password" : "Поновите лозинку кључа за опоравак",
+    "Enabled" : "укључено",
+    "Disabled" : "искључено",
+    "Change recovery key password:" : "Измена лозинке кључа опоравка:",
+    "Old Recovery key password" : "Стара лозинка кључа опоравка",
+    "New Recovery key password" : "Нова лозинка кључа опоравка",
+    "Repeat New Recovery key password" : "Поновите лозинку кључа опоравка",
+    "Change Password" : "Измени лозинку",
+    "Your private key password no longer matches your log-in password." : "Лозинка вашег личног кључа више није иста као ваша лозинка за пријаву.",
+    "Set your old private key password to your current log-in password:" : "Промените ваш стари приватни кључ-лозинку у вашу тренутну улазну лозинку:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
+    "Old log-in password" : "Стара лозинка за пријаву",
+    "Current log-in password" : "Тренутна лозинка за пријаву",
+    "Update Private Key Password" : "Ажурирај лозинку личног кључа",
+    "Enable password recovery:" : "Укључи опоравак лозинке:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Укључивање ове опције омогућиће поновно добијање приступа вашим шифрованим фајловима у случају губитка лозинке"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/encryption/l10n/sr.json b/apps/encryption/l10n/sr.json
new file mode 100644
index 00000000000..4aae6f2ff59
--- /dev/null
+++ b/apps/encryption/l10n/sr.json
@@ -0,0 +1,33 @@
+{ "translations": {
+    "Missing recovery key password" : "Недостаје лозинка кључа за опоравак",
+    "Please repeat the recovery key password" : "Поновите лозинку кључа за опоравак",
+    "Repeated recovery key password does not match the provided recovery key password" : "Поновљена лозинка кључа за опоравак се не поклапа",
+    "Recovery key successfully enabled" : "Кључ за опоравак успешно укључен",
+    "Recovery key successfully disabled" : "Кључ за опоравак успешно искључен",
+    "Could not disable recovery key. Please check your recovery key password!" : "Не могу да искључим кључ за опоравак. Проверите лозинку!",
+    "Please provide the old recovery password" : "Унесите стару лозинку опоравка",
+    "Please provide a new recovery password" : "Унесите нову лозинку опоравка",
+    "Please repeat the new recovery password" : "Поновите нову лозинку опоравка",
+    "Password successfully changed." : "Лозинка успешно промењена.",
+    "Could not change the password. Maybe the old password was not correct." : "Не могу да променим лозинку. Можда стара лозинка није исправна.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Апликација шифровања је укључена али ваши кључеви нису иницијализовани. Одјавите се и поново се пријавите.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Омогући кључ за опоравак (омогућава опоравак корисничких фајлова у случају губитка лозинке):",
+    "Recovery key password" : "Лозинка кључа за опоравак",
+    "Repeat Recovery key password" : "Поновите лозинку кључа за опоравак",
+    "Enabled" : "укључено",
+    "Disabled" : "искључено",
+    "Change recovery key password:" : "Измена лозинке кључа опоравка:",
+    "Old Recovery key password" : "Стара лозинка кључа опоравка",
+    "New Recovery key password" : "Нова лозинка кључа опоравка",
+    "Repeat New Recovery key password" : "Поновите лозинку кључа опоравка",
+    "Change Password" : "Измени лозинку",
+    "Your private key password no longer matches your log-in password." : "Лозинка вашег личног кључа више није иста као ваша лозинка за пријаву.",
+    "Set your old private key password to your current log-in password:" : "Промените ваш стари приватни кључ-лозинку у вашу тренутну улазну лозинку:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
+    "Old log-in password" : "Стара лозинка за пријаву",
+    "Current log-in password" : "Тренутна лозинка за пријаву",
+    "Update Private Key Password" : "Ажурирај лозинку личног кључа",
+    "Enable password recovery:" : "Укључи опоравак лозинке:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Укључивање ове опције омогућиће поновно добијање приступа вашим шифрованим фајловима у случају губитка лозинке"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/sr@latin.js b/apps/encryption/l10n/sr@latin.js
new file mode 100644
index 00000000000..4dbc57ff3ec
--- /dev/null
+++ b/apps/encryption/l10n/sr@latin.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.",
+    "Disabled" : "Onemogućeno"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/encryption/l10n/sr@latin.json b/apps/encryption/l10n/sr@latin.json
new file mode 100644
index 00000000000..6cac6d1a0f1
--- /dev/null
+++ b/apps/encryption/l10n/sr@latin.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.",
+    "Disabled" : "Onemogućeno"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/sv.js b/apps/encryption/l10n/sv.js
new file mode 100644
index 00000000000..cb82ade98c8
--- /dev/null
+++ b/apps/encryption/l10n/sv.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Saknar lösenord för återställningsnyckel",
+    "Please repeat the recovery key password" : "Vänligen upprepa lösenordet för återställningsnyckel",
+    "Repeated recovery key password does not match the provided recovery key password" : "Det upprepade lösenordet för återställningsnyckeln matchar inte tillhandahållna lösenordet för återställningsnyckeln",
+    "Recovery key successfully enabled" : "Återställningsnyckeln har framgångsrikt aktiverats",
+    "Could not enable recovery key. Please check your recovery key password!" : "Kunde inte aktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
+    "Recovery key successfully disabled" : "Återställningsnyckeln har framgångsrikt inaktiverats",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kunde inte inaktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
+    "Please provide the old recovery password" : "Vänligen tillhandahåll det gamla återställningslösenordet ",
+    "Please provide a new recovery password" : "Vänligen tillhandahåll ett nytt återställningslösenord",
+    "Please repeat the new recovery password" : "Vänligen upprepa det nya återställningslösenordet",
+    "Password successfully changed." : "Ändringen av lösenordet lyckades.",
+    "Could not change the password. Maybe the old password was not correct." : "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivera återställningsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):",
+    "Recovery key password" : "Lösenord för återställningsnyckel",
+    "Repeat Recovery key password" : "Upprepa återställningsnyckelns lösenord",
+    "Enabled" : "Aktiverad",
+    "Disabled" : "Inaktiverad",
+    "Change recovery key password:" : "Ändra lösenord för återställningsnyckel:",
+    "Old Recovery key password" : "Gammalt lösenord för återställningsnyckel",
+    "New Recovery key password" : "Nytt lösenord för återställningsnyckel",
+    "Repeat New Recovery key password" : "Upprepa lösenord för ny återställningsnyckel",
+    "Change Password" : "Byt lösenord",
+    "Your private key password no longer matches your log-in password." : "Ditt lösenord för din privata nyckel matchar inte längre ditt inloggningslösenord.",
+    "Set your old private key password to your current log-in password:" : "Sätt ditt gamla privatnyckellösenord till ditt aktuella inloggningslösenord:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
+    "Old log-in password" : "Gammalt inloggningslösenord",
+    "Current log-in password" : "Nuvarande inloggningslösenord",
+    "Update Private Key Password" : "Uppdatera lösenordet för din privata nyckel",
+    "Enable password recovery:" : "Aktivera lösenordsåterställning",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/sv.json b/apps/encryption/l10n/sv.json
new file mode 100644
index 00000000000..ed038a0fa33
--- /dev/null
+++ b/apps/encryption/l10n/sv.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Saknar lösenord för återställningsnyckel",
+    "Please repeat the recovery key password" : "Vänligen upprepa lösenordet för återställningsnyckel",
+    "Repeated recovery key password does not match the provided recovery key password" : "Det upprepade lösenordet för återställningsnyckeln matchar inte tillhandahållna lösenordet för återställningsnyckeln",
+    "Recovery key successfully enabled" : "Återställningsnyckeln har framgångsrikt aktiverats",
+    "Could not enable recovery key. Please check your recovery key password!" : "Kunde inte aktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
+    "Recovery key successfully disabled" : "Återställningsnyckeln har framgångsrikt inaktiverats",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kunde inte inaktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
+    "Please provide the old recovery password" : "Vänligen tillhandahåll det gamla återställningslösenordet ",
+    "Please provide a new recovery password" : "Vänligen tillhandahåll ett nytt återställningslösenord",
+    "Please repeat the new recovery password" : "Vänligen upprepa det nya återställningslösenordet",
+    "Password successfully changed." : "Ändringen av lösenordet lyckades.",
+    "Could not change the password. Maybe the old password was not correct." : "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivera återställningsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):",
+    "Recovery key password" : "Lösenord för återställningsnyckel",
+    "Repeat Recovery key password" : "Upprepa återställningsnyckelns lösenord",
+    "Enabled" : "Aktiverad",
+    "Disabled" : "Inaktiverad",
+    "Change recovery key password:" : "Ändra lösenord för återställningsnyckel:",
+    "Old Recovery key password" : "Gammalt lösenord för återställningsnyckel",
+    "New Recovery key password" : "Nytt lösenord för återställningsnyckel",
+    "Repeat New Recovery key password" : "Upprepa lösenord för ny återställningsnyckel",
+    "Change Password" : "Byt lösenord",
+    "Your private key password no longer matches your log-in password." : "Ditt lösenord för din privata nyckel matchar inte längre ditt inloggningslösenord.",
+    "Set your old private key password to your current log-in password:" : "Sätt ditt gamla privatnyckellösenord till ditt aktuella inloggningslösenord:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
+    "Old log-in password" : "Gammalt inloggningslösenord",
+    "Current log-in password" : "Nuvarande inloggningslösenord",
+    "Update Private Key Password" : "Uppdatera lösenordet för din privata nyckel",
+    "Enable password recovery:" : "Aktivera lösenordsåterställning",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/tr.js b/apps/encryption/l10n/tr.js
new file mode 100644
index 00000000000..4fc6dc3fbd0
--- /dev/null
+++ b/apps/encryption/l10n/tr.js
@@ -0,0 +1,36 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Eksik kurtarma anahtarı parolası",
+    "Please repeat the recovery key password" : "Lütfen kurtarma anahtarı parolasını yenileyin",
+    "Repeated recovery key password does not match the provided recovery key password" : "Yenilenen kurtarma anahtarı parolası, belirtilen kurtarma anahtarı parolası ile eşleşmiyor",
+    "Recovery key successfully enabled" : "Kurtarma anahtarı başarıyla etkinleştirildi",
+    "Could not enable recovery key. Please check your recovery key password!" : "Kurtarma anahtarı etkinleştirilemedi. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
+    "Recovery key successfully disabled" : "Kurtarma anahtarı başarıyla devre dışı bırakıldı",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kurtarma anahtarı devre dışı bırakılamadı. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
+    "Please provide the old recovery password" : "Lütfen eski kurtarma parolasını girin",
+    "Please provide a new recovery password" : "Lütfen yeni bir kurtarma parolası girin",
+    "Please repeat the new recovery password" : "Lütfen yeni kurtarma parolasını yenileyin",
+    "Password successfully changed." : "Parola başarıyla değiştirildi.",
+    "Could not change the password. Maybe the old password was not correct." : "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):",
+    "Recovery key password" : "Kurtarma anahtarı parolası",
+    "Repeat Recovery key password" : "Kurtarma anahtarı parolasını yineleyin",
+    "Enabled" : "Etkin",
+    "Disabled" : "Devre Dışı",
+    "Change recovery key password:" : "Kurtarma anahtarı parolasını değiştir:",
+    "Old Recovery key password" : "Eski Kurtarma anahtarı parolası",
+    "New Recovery key password" : "Yeni Kurtarma anahtarı parolası",
+    "Repeat New Recovery key password" : "Yeni Kurtarma anahtarı parolasını yineleyin",
+    "Change Password" : "Parola Değiştir",
+    "Your private key password no longer matches your log-in password." : "Özel anahtar parolanız artık oturum açma parolanız ile eşleşmiyor.",
+    "Set your old private key password to your current log-in password:" : "Eski özel anahtar parolanızı, geçerli oturum açma parolanız olarak ayarlayın:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Eğer eski parolanızı hatırlamıyorsanız, yöneticinizden dosyalarınızı kurtarmasını talep edebilirsiniz.",
+    "Old log-in password" : "Eski oturum açma parolası",
+    "Current log-in password" : "Geçerli oturum açma parolası",
+    "Update Private Key Password" : "Özel Anahtar Parolasını Güncelle",
+    "Enable password recovery:" : "Parola kurtarmayı etkinleştir:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu seçeneği etkinleştirmek, parola kaybı durumunda şifrelenmiş dosyalarınıza erişimi yeniden kazanmanızı sağlayacaktır"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/encryption/l10n/tr.json b/apps/encryption/l10n/tr.json
new file mode 100644
index 00000000000..3f9084528fc
--- /dev/null
+++ b/apps/encryption/l10n/tr.json
@@ -0,0 +1,34 @@
+{ "translations": {
+    "Missing recovery key password" : "Eksik kurtarma anahtarı parolası",
+    "Please repeat the recovery key password" : "Lütfen kurtarma anahtarı parolasını yenileyin",
+    "Repeated recovery key password does not match the provided recovery key password" : "Yenilenen kurtarma anahtarı parolası, belirtilen kurtarma anahtarı parolası ile eşleşmiyor",
+    "Recovery key successfully enabled" : "Kurtarma anahtarı başarıyla etkinleştirildi",
+    "Could not enable recovery key. Please check your recovery key password!" : "Kurtarma anahtarı etkinleştirilemedi. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
+    "Recovery key successfully disabled" : "Kurtarma anahtarı başarıyla devre dışı bırakıldı",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kurtarma anahtarı devre dışı bırakılamadı. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
+    "Please provide the old recovery password" : "Lütfen eski kurtarma parolasını girin",
+    "Please provide a new recovery password" : "Lütfen yeni bir kurtarma parolası girin",
+    "Please repeat the new recovery password" : "Lütfen yeni kurtarma parolasını yenileyin",
+    "Password successfully changed." : "Parola başarıyla değiştirildi.",
+    "Could not change the password. Maybe the old password was not correct." : "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):",
+    "Recovery key password" : "Kurtarma anahtarı parolası",
+    "Repeat Recovery key password" : "Kurtarma anahtarı parolasını yineleyin",
+    "Enabled" : "Etkin",
+    "Disabled" : "Devre Dışı",
+    "Change recovery key password:" : "Kurtarma anahtarı parolasını değiştir:",
+    "Old Recovery key password" : "Eski Kurtarma anahtarı parolası",
+    "New Recovery key password" : "Yeni Kurtarma anahtarı parolası",
+    "Repeat New Recovery key password" : "Yeni Kurtarma anahtarı parolasını yineleyin",
+    "Change Password" : "Parola Değiştir",
+    "Your private key password no longer matches your log-in password." : "Özel anahtar parolanız artık oturum açma parolanız ile eşleşmiyor.",
+    "Set your old private key password to your current log-in password:" : "Eski özel anahtar parolanızı, geçerli oturum açma parolanız olarak ayarlayın:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Eğer eski parolanızı hatırlamıyorsanız, yöneticinizden dosyalarınızı kurtarmasını talep edebilirsiniz.",
+    "Old log-in password" : "Eski oturum açma parolası",
+    "Current log-in password" : "Geçerli oturum açma parolası",
+    "Update Private Key Password" : "Özel Anahtar Parolasını Güncelle",
+    "Enable password recovery:" : "Parola kurtarmayı etkinleştir:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu seçeneği etkinleştirmek, parola kaybı durumunda şifrelenmiş dosyalarınıza erişimi yeniden kazanmanızı sağlayacaktır"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/uk.js b/apps/encryption/l10n/uk.js
new file mode 100644
index 00000000000..0dc7bacc16c
--- /dev/null
+++ b/apps/encryption/l10n/uk.js
@@ -0,0 +1,35 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "Відсутній пароль ключа відновлення",
+    "Please repeat the recovery key password" : "Введіть ще раз пароль для ключа відновлення",
+    "Repeated recovery key password does not match the provided recovery key password" : "Введені паролі ключа відновлення не співпадають",
+    "Recovery key successfully enabled" : "Ключ відновлення підключено",
+    "Recovery key successfully disabled" : "Ключ відновлення відключено",
+    "Could not disable recovery key. Please check your recovery key password!" : "Не вдалося відключити ключ відновлення. Будь ласка, перевірте пароль ключа відновлення!",
+    "Please provide the old recovery password" : "Будь ласка, введіть старий пароль відновлення",
+    "Please provide a new recovery password" : "Будь ласка, введіть новий пароль відновлення",
+    "Please repeat the new recovery password" : "Будь ласка, введіть новий пароль відновлення ще раз",
+    "Password successfully changed." : "Пароль змінено.",
+    "Could not change the password. Maybe the old password was not correct." : "Не вдалося змінити пароль. Можливо ви неправильно ввели старий пароль.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Ввімкнути ключ відновлення (дозволяє користувачам відновлювати файли при втраті паролю):",
+    "Recovery key password" : "Пароль ключа відновлення",
+    "Repeat Recovery key password" : "Введіть ще раз пароль ключа відновлення",
+    "Enabled" : "Увімкнено",
+    "Disabled" : "Вимкнено",
+    "Change recovery key password:" : "Змінити пароль ключа відновлення:",
+    "Old Recovery key password" : "Старий пароль ключа відновлення",
+    "New Recovery key password" : "Новий пароль ключа відновлення",
+    "Repeat New Recovery key password" : "Введіть ще раз новий пароль ключа відновлення",
+    "Change Password" : "Змінити Пароль",
+    "Your private key password no longer matches your log-in password." : "Пароль вашого закритого ключа більше не відповідає паролю від вашого облікового запису.",
+    "Set your old private key password to your current log-in password:" : "Замініть старий пароль від закритого ключа на новий пароль входу:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до адміністратора щоб його відновити.",
+    "Old log-in password" : "Старий пароль входу",
+    "Current log-in password" : "Поточний пароль входу",
+    "Update Private Key Password" : "Оновити пароль для закритого ключа",
+    "Enable password recovery:" : "Ввімкнути відновлення паролю:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Включення цієї опції дозволить вам отримати доступ до своїх зашифрованих файлів у випадку втрати паролю"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/encryption/l10n/uk.json b/apps/encryption/l10n/uk.json
new file mode 100644
index 00000000000..173c7159910
--- /dev/null
+++ b/apps/encryption/l10n/uk.json
@@ -0,0 +1,33 @@
+{ "translations": {
+    "Missing recovery key password" : "Відсутній пароль ключа відновлення",
+    "Please repeat the recovery key password" : "Введіть ще раз пароль для ключа відновлення",
+    "Repeated recovery key password does not match the provided recovery key password" : "Введені паролі ключа відновлення не співпадають",
+    "Recovery key successfully enabled" : "Ключ відновлення підключено",
+    "Recovery key successfully disabled" : "Ключ відновлення відключено",
+    "Could not disable recovery key. Please check your recovery key password!" : "Не вдалося відключити ключ відновлення. Будь ласка, перевірте пароль ключа відновлення!",
+    "Please provide the old recovery password" : "Будь ласка, введіть старий пароль відновлення",
+    "Please provide a new recovery password" : "Будь ласка, введіть новий пароль відновлення",
+    "Please repeat the new recovery password" : "Будь ласка, введіть новий пароль відновлення ще раз",
+    "Password successfully changed." : "Пароль змінено.",
+    "Could not change the password. Maybe the old password was not correct." : "Не вдалося змінити пароль. Можливо ви неправильно ввели старий пароль.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Ввімкнути ключ відновлення (дозволяє користувачам відновлювати файли при втраті паролю):",
+    "Recovery key password" : "Пароль ключа відновлення",
+    "Repeat Recovery key password" : "Введіть ще раз пароль ключа відновлення",
+    "Enabled" : "Увімкнено",
+    "Disabled" : "Вимкнено",
+    "Change recovery key password:" : "Змінити пароль ключа відновлення:",
+    "Old Recovery key password" : "Старий пароль ключа відновлення",
+    "New Recovery key password" : "Новий пароль ключа відновлення",
+    "Repeat New Recovery key password" : "Введіть ще раз новий пароль ключа відновлення",
+    "Change Password" : "Змінити Пароль",
+    "Your private key password no longer matches your log-in password." : "Пароль вашого закритого ключа більше не відповідає паролю від вашого облікового запису.",
+    "Set your old private key password to your current log-in password:" : "Замініть старий пароль від закритого ключа на новий пароль входу:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до адміністратора щоб його відновити.",
+    "Old log-in password" : "Старий пароль входу",
+    "Current log-in password" : "Поточний пароль входу",
+    "Update Private Key Password" : "Оновити пароль для закритого ключа",
+    "Enable password recovery:" : "Ввімкнути відновлення паролю:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Включення цієї опції дозволить вам отримати доступ до своїх зашифрованих файлів у випадку втрати паролю"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/vi.js b/apps/encryption/l10n/vi.js
new file mode 100644
index 00000000000..0bd1e40794d
--- /dev/null
+++ b/apps/encryption/l10n/vi.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Recovery key successfully enabled" : "Khóa khôi phục kích hoạt thành công",
+    "Could not enable recovery key. Please check your recovery key password!" : "Không thể kích hoạt khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
+    "Recovery key successfully disabled" : "Vô hiệu hóa khóa khôi phục thành công",
+    "Could not disable recovery key. Please check your recovery key password!" : "Không thể vô hiệu hóa khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
+    "Password successfully changed." : "Đã đổi mật khẩu.",
+    "Could not change the password. Maybe the old password was not correct." : "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại",
+    "Enabled" : "Bật",
+    "Disabled" : "Tắt",
+    "Change Password" : "Đổi Mật khẩu",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Nếu bạn không nhớ mật khẩu cũ, bạn có thể yêu cầu quản trị viên khôi phục tập tin của bạn.",
+    "Old log-in password" : "Mật khẩu đăng nhập cũ",
+    "Current log-in password" : "Mật khẩu đăng nhập hiện tại",
+    "Update Private Key Password" : "Cập nhật mật khẩu khóa cá nhân",
+    "Enable password recovery:" : "Kích hoạt khôi phục mật khẩu:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tùy chọn này sẽ cho phép bạn tái truy cập đến các tập tin mã hóa trong trường hợp mất mật khẩu"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/vi.json b/apps/encryption/l10n/vi.json
new file mode 100644
index 00000000000..224870445aa
--- /dev/null
+++ b/apps/encryption/l10n/vi.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Recovery key successfully enabled" : "Khóa khôi phục kích hoạt thành công",
+    "Could not enable recovery key. Please check your recovery key password!" : "Không thể kích hoạt khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
+    "Recovery key successfully disabled" : "Vô hiệu hóa khóa khôi phục thành công",
+    "Could not disable recovery key. Please check your recovery key password!" : "Không thể vô hiệu hóa khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
+    "Password successfully changed." : "Đã đổi mật khẩu.",
+    "Could not change the password. Maybe the old password was not correct." : "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại",
+    "Enabled" : "Bật",
+    "Disabled" : "Tắt",
+    "Change Password" : "Đổi Mật khẩu",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Nếu bạn không nhớ mật khẩu cũ, bạn có thể yêu cầu quản trị viên khôi phục tập tin của bạn.",
+    "Old log-in password" : "Mật khẩu đăng nhập cũ",
+    "Current log-in password" : "Mật khẩu đăng nhập hiện tại",
+    "Update Private Key Password" : "Cập nhật mật khẩu khóa cá nhân",
+    "Enable password recovery:" : "Kích hoạt khôi phục mật khẩu:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tùy chọn này sẽ cho phép bạn tái truy cập đến các tập tin mã hóa trong trường hợp mất mật khẩu"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/zh_CN.js b/apps/encryption/l10n/zh_CN.js
new file mode 100644
index 00000000000..7bf5bb3ad37
--- /dev/null
+++ b/apps/encryption/l10n/zh_CN.js
@@ -0,0 +1,33 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Missing recovery key password" : "丢失的回复密钥",
+    "Please repeat the recovery key password" : "请替换恢复密钥",
+    "Recovery key successfully enabled" : "恢复密钥成功启用",
+    "Could not enable recovery key. Please check your recovery key password!" : "不能启用恢复密钥。请检查恢复密钥密码！",
+    "Recovery key successfully disabled" : "恢复密钥成功禁用",
+    "Could not disable recovery key. Please check your recovery key password!" : "不能禁用恢复密钥。请检查恢复密钥密码！",
+    "Please provide the old recovery password" : "请提供原来的恢复密码",
+    "Please provide a new recovery password" : "请提供一个新的恢复密码",
+    "Please repeat the new recovery password" : "请替换新的恢复密码",
+    "Password successfully changed." : "密码修改成功。",
+    "Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "启用恢复密钥（允许你在密码丢失后恢复文件）：",
+    "Recovery key password" : "恢复密钥密码",
+    "Repeat Recovery key password" : "重复恢复密钥密码",
+    "Enabled" : "开启",
+    "Disabled" : "禁用",
+    "Change recovery key password:" : "更改恢复密钥密码",
+    "Old Recovery key password" : "旧的恢复密钥密码",
+    "New Recovery key password" : "新的恢复密钥密码",
+    "Repeat New Recovery key password" : "重复新的密钥恢复密码",
+    "Change Password" : "修改密码",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "如果您记不住旧的密码，您可以请求管理员恢复您的文件。",
+    "Old log-in password" : "旧登录密码",
+    "Current log-in password" : "当前登录密码",
+    "Update Private Key Password" : "更新私钥密码",
+    "Enable password recovery:" : "启用密码恢复：",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "启用该项将允许你在密码丢失后取回您的加密文件"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/zh_CN.json b/apps/encryption/l10n/zh_CN.json
new file mode 100644
index 00000000000..2cb368ad169
--- /dev/null
+++ b/apps/encryption/l10n/zh_CN.json
@@ -0,0 +1,31 @@
+{ "translations": {
+    "Missing recovery key password" : "丢失的回复密钥",
+    "Please repeat the recovery key password" : "请替换恢复密钥",
+    "Recovery key successfully enabled" : "恢复密钥成功启用",
+    "Could not enable recovery key. Please check your recovery key password!" : "不能启用恢复密钥。请检查恢复密钥密码！",
+    "Recovery key successfully disabled" : "恢复密钥成功禁用",
+    "Could not disable recovery key. Please check your recovery key password!" : "不能禁用恢复密钥。请检查恢复密钥密码！",
+    "Please provide the old recovery password" : "请提供原来的恢复密码",
+    "Please provide a new recovery password" : "请提供一个新的恢复密码",
+    "Please repeat the new recovery password" : "请替换新的恢复密码",
+    "Password successfully changed." : "密码修改成功。",
+    "Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "启用恢复密钥（允许你在密码丢失后恢复文件）：",
+    "Recovery key password" : "恢复密钥密码",
+    "Repeat Recovery key password" : "重复恢复密钥密码",
+    "Enabled" : "开启",
+    "Disabled" : "禁用",
+    "Change recovery key password:" : "更改恢复密钥密码",
+    "Old Recovery key password" : "旧的恢复密钥密码",
+    "New Recovery key password" : "新的恢复密钥密码",
+    "Repeat New Recovery key password" : "重复新的密钥恢复密码",
+    "Change Password" : "修改密码",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "如果您记不住旧的密码，您可以请求管理员恢复您的文件。",
+    "Old log-in password" : "旧登录密码",
+    "Current log-in password" : "当前登录密码",
+    "Update Private Key Password" : "更新私钥密码",
+    "Enable password recovery:" : "启用密码恢复：",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "启用该项将允许你在密码丢失后取回您的加密文件"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/zh_HK.js b/apps/encryption/l10n/zh_HK.js
new file mode 100644
index 00000000000..83ee6604e27
--- /dev/null
+++ b/apps/encryption/l10n/zh_HK.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Enabled" : "啟用",
+    "Disabled" : "停用",
+    "Change Password" : "更改密碼"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/zh_HK.json b/apps/encryption/l10n/zh_HK.json
new file mode 100644
index 00000000000..1dad5409c47
--- /dev/null
+++ b/apps/encryption/l10n/zh_HK.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Enabled" : "啟用",
+    "Disabled" : "停用",
+    "Change Password" : "更改密碼"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/zh_TW.js b/apps/encryption/l10n/zh_TW.js
new file mode 100644
index 00000000000..b7860cbb30b
--- /dev/null
+++ b/apps/encryption/l10n/zh_TW.js
@@ -0,0 +1,28 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Recovery key successfully enabled" : "還原金鑰已成功開啟",
+    "Could not enable recovery key. Please check your recovery key password!" : "無法啟用還原金鑰。請檢查您的還原金鑰密碼!",
+    "Recovery key successfully disabled" : "還原金鑰已成功停用",
+    "Could not disable recovery key. Please check your recovery key password!" : "無法停用還原金鑰。請檢查您的還原金鑰密碼!",
+    "Password successfully changed." : "成功變更密碼。",
+    "Could not change the password. Maybe the old password was not correct." : "無法變更密碼，或許是輸入的舊密碼不正確。",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "啟用還原金鑰 (因忘記密碼仍允許還原使用者檔案):",
+    "Recovery key password" : "還原金鑰密碼",
+    "Repeat Recovery key password" : "再輸入還原金鑰密碼一次",
+    "Enabled" : "已啓用",
+    "Disabled" : "已停用",
+    "Change recovery key password:" : "變更還原金鑰密碼:",
+    "Old Recovery key password" : "舊的還原金鑰密碼",
+    "New Recovery key password" : "新的還原金鑰密碼",
+    "Repeat New Recovery key password" : "再輸入新的還原金鑰密碼一次",
+    "Change Password" : "變更密碼",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼，可以請求管理員協助取回檔案。",
+    "Old log-in password" : "舊登入密碼",
+    "Current log-in password" : "目前的登入密碼",
+    "Update Private Key Password" : "更新私人金鑰密碼",
+    "Enable password recovery:" : "啟用密碼還原:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "啟用這個選項將會允許您因忘記密碼但需要存取您的加密檔案"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/zh_TW.json b/apps/encryption/l10n/zh_TW.json
new file mode 100644
index 00000000000..7001d5b9b5f
--- /dev/null
+++ b/apps/encryption/l10n/zh_TW.json
@@ -0,0 +1,26 @@
+{ "translations": {
+    "Recovery key successfully enabled" : "還原金鑰已成功開啟",
+    "Could not enable recovery key. Please check your recovery key password!" : "無法啟用還原金鑰。請檢查您的還原金鑰密碼!",
+    "Recovery key successfully disabled" : "還原金鑰已成功停用",
+    "Could not disable recovery key. Please check your recovery key password!" : "無法停用還原金鑰。請檢查您的還原金鑰密碼!",
+    "Password successfully changed." : "成功變更密碼。",
+    "Could not change the password. Maybe the old password was not correct." : "無法變更密碼，或許是輸入的舊密碼不正確。",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "啟用還原金鑰 (因忘記密碼仍允許還原使用者檔案):",
+    "Recovery key password" : "還原金鑰密碼",
+    "Repeat Recovery key password" : "再輸入還原金鑰密碼一次",
+    "Enabled" : "已啓用",
+    "Disabled" : "已停用",
+    "Change recovery key password:" : "變更還原金鑰密碼:",
+    "Old Recovery key password" : "舊的還原金鑰密碼",
+    "New Recovery key password" : "新的還原金鑰密碼",
+    "Repeat New Recovery key password" : "再輸入新的還原金鑰密碼一次",
+    "Change Password" : "變更密碼",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼，可以請求管理員協助取回檔案。",
+    "Old log-in password" : "舊登入密碼",
+    "Current log-in password" : "目前的登入密碼",
+    "Update Private Key Password" : "更新私人金鑰密碼",
+    "Enable password recovery:" : "啟用密碼還原:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "啟用這個選項將會允許您因忘記密碼但需要存取您的加密檔案"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/ar.js b/apps/files/l10n/ar.js
index 72f82795ea2..412f339a4b3 100644
--- a/apps/files/l10n/ar.js
+++ b/apps/files/l10n/ar.js
@@ -42,9 +42,6 @@ OC.L10N.register(
     "File name cannot be empty." : "اسم الملف لا يجوز أن يكون فارغا",
     "Your storage is full, files can not be updated or synced anymore!" : "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
     "Your storage is almost full ({usedSpacePercent}%)" : "مساحتك التخزينية امتلأت تقريبا ",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "المفتاح الخاص بتشفير التطبيقات غير صالح. يرجى تحديث كلمة السر الخاصة بالمفتاح الخاص من الإعدادت الشخصية حتى تتمكن من الوصول للملفات المشفرة.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك.",
     "{dirs} and {files}" : "{dirs} و {files}",
     "Favorite" : "المفضلة",
     "A new file or folder has been <strong>created</strong>" : "تم <strong>  إنشاء</strong> ملف جديد أو مجلد ",
diff --git a/apps/files/l10n/ar.json b/apps/files/l10n/ar.json
index c1f448e7a88..812769a4fb2 100644
--- a/apps/files/l10n/ar.json
+++ b/apps/files/l10n/ar.json
@@ -40,9 +40,6 @@
     "File name cannot be empty." : "اسم الملف لا يجوز أن يكون فارغا",
     "Your storage is full, files can not be updated or synced anymore!" : "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
     "Your storage is almost full ({usedSpacePercent}%)" : "مساحتك التخزينية امتلأت تقريبا ",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "المفتاح الخاص بتشفير التطبيقات غير صالح. يرجى تحديث كلمة السر الخاصة بالمفتاح الخاص من الإعدادت الشخصية حتى تتمكن من الوصول للملفات المشفرة.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك.",
     "{dirs} and {files}" : "{dirs} و {files}",
     "Favorite" : "المفضلة",
     "A new file or folder has been <strong>created</strong>" : "تم <strong>  إنشاء</strong> ملف جديد أو مجلد ",
diff --git a/apps/files/l10n/ast.js b/apps/files/l10n/ast.js
index 980e1275ffd..2b2359f9e98 100644
--- a/apps/files/l10n/ast.js
+++ b/apps/files/l10n/ast.js
@@ -60,9 +60,6 @@ OC.L10N.register(
     "File name cannot be empty." : "El nome de ficheru nun pue quedar baleru.",
     "Your storage is full, files can not be updated or synced anymore!" : "L'almacenamientu ta completu, ¡yá nun se pueden anovar o sincronizar ficheros!",
     "Your storage is almost full ({usedSpacePercent}%)" : "L'almacenamientu ta casi completu ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clave privada non válida pa Encryption. Por favor, anueva la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Deshabilitose'l cifráu pero los tos ficheros tovía tán cifraos.  Por favor, vete a los axustes personales pa descrifrar los tos ficheros.",
     "{dirs} and {files}" : "{dirs} y {files}",
     "Favorite" : "Favoritu",
     "A new file or folder has been <strong>created</strong>" : "<strong>Creóse</strong> un ficheru o carpeta nuevos",
diff --git a/apps/files/l10n/ast.json b/apps/files/l10n/ast.json
index afc7963cee3..23f78d08323 100644
--- a/apps/files/l10n/ast.json
+++ b/apps/files/l10n/ast.json
@@ -58,9 +58,6 @@
     "File name cannot be empty." : "El nome de ficheru nun pue quedar baleru.",
     "Your storage is full, files can not be updated or synced anymore!" : "L'almacenamientu ta completu, ¡yá nun se pueden anovar o sincronizar ficheros!",
     "Your storage is almost full ({usedSpacePercent}%)" : "L'almacenamientu ta casi completu ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clave privada non válida pa Encryption. Por favor, anueva la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Deshabilitose'l cifráu pero los tos ficheros tovía tán cifraos.  Por favor, vete a los axustes personales pa descrifrar los tos ficheros.",
     "{dirs} and {files}" : "{dirs} y {files}",
     "Favorite" : "Favoritu",
     "A new file or folder has been <strong>created</strong>" : "<strong>Creóse</strong> un ficheru o carpeta nuevos",
diff --git a/apps/files/l10n/az.js b/apps/files/l10n/az.js
index 60f4a8d0f87..5665807da8f 100644
--- a/apps/files/l10n/az.js
+++ b/apps/files/l10n/az.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Faylın adı boş ola bilməz.",
     "Your storage is full, files can not be updated or synced anymore!" : "Sizin deponuz doludur, fayllar artıq yenilənə və sinxronizasiya edilə bilməz!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Sizin depo depo demək olar ki, doludur ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Proqram şifrələnməsi işə salınıb ancaq, sizin açarlar inisializasiya edilməyib. Xahiş edilir çıxıb yenidən daxil olasınız",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifrələnmə proqramı üçün yalnış şəxsi açar. Xahiş olunur öz şəxsi quraşdırmalarınızda şəxsi açarınızı yeniləyəsiniz ki, şifrələnmiş fayllara yetki ala biləsiniz.   ",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Şifrələnmə söndürülüb ancaq, sizin fayllar hələdə şifrələnmiş vəziyyətdədir. Deşifrə etmək üçün xahiş olunur, şəxsi quraşdırılmalarınıza baxasınız.",
     "_matches '{filter}'_::_match '{filter}'_" : ["uyğun '{filter}'","uyğun '{filter}'"],
     "{dirs} and {files}" : "{dirs} və {files}",
     "Favorited" : "İstəkləndi",
diff --git a/apps/files/l10n/az.json b/apps/files/l10n/az.json
index d6bac687732..e3f9b6e49cd 100644
--- a/apps/files/l10n/az.json
+++ b/apps/files/l10n/az.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Faylın adı boş ola bilməz.",
     "Your storage is full, files can not be updated or synced anymore!" : "Sizin deponuz doludur, fayllar artıq yenilənə və sinxronizasiya edilə bilməz!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Sizin depo depo demək olar ki, doludur ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Proqram şifrələnməsi işə salınıb ancaq, sizin açarlar inisializasiya edilməyib. Xahiş edilir çıxıb yenidən daxil olasınız",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifrələnmə proqramı üçün yalnış şəxsi açar. Xahiş olunur öz şəxsi quraşdırmalarınızda şəxsi açarınızı yeniləyəsiniz ki, şifrələnmiş fayllara yetki ala biləsiniz.   ",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Şifrələnmə söndürülüb ancaq, sizin fayllar hələdə şifrələnmiş vəziyyətdədir. Deşifrə etmək üçün xahiş olunur, şəxsi quraşdırılmalarınıza baxasınız.",
     "_matches '{filter}'_::_match '{filter}'_" : ["uyğun '{filter}'","uyğun '{filter}'"],
     "{dirs} and {files}" : "{dirs} və {files}",
     "Favorited" : "İstəkləndi",
diff --git a/apps/files/l10n/bg_BG.js b/apps/files/l10n/bg_BG.js
index ea6adc66004..b43dced5cf8 100644
--- a/apps/files/l10n/bg_BG.js
+++ b/apps/files/l10n/bg_BG.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Името на файла не може да бъде оставено празно.",
     "Your storage is full, files can not be updated or synced anymore!" : "Заделеното място е запълнено, повече файлове не могат да бъдат синхронизирани или опреснени!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Заделеното място е почити запълнено ({usedSpacePercent}%).",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Криптирането е изключено, но файлове ти са все още защитени. Моля, отиди на лични найстройки, за да разшфроваш файловете.",
     "_matches '{filter}'_::_match '{filter}'_" : ["пасва на '{filter}'","пасват на '{filter}'\n "],
     "{dirs} and {files}" : "{dirs} и {files}",
     "Favorited" : "Отбелязано в любими",
diff --git a/apps/files/l10n/bg_BG.json b/apps/files/l10n/bg_BG.json
index d8f205bea6d..266f4f08cdf 100644
--- a/apps/files/l10n/bg_BG.json
+++ b/apps/files/l10n/bg_BG.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Името на файла не може да бъде оставено празно.",
     "Your storage is full, files can not be updated or synced anymore!" : "Заделеното място е запълнено, повече файлове не могат да бъдат синхронизирани или опреснени!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Заделеното място е почити запълнено ({usedSpacePercent}%).",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Криптирането е изключено, но файлове ти са все още защитени. Моля, отиди на лични найстройки, за да разшфроваш файловете.",
     "_matches '{filter}'_::_match '{filter}'_" : ["пасва на '{filter}'","пасват на '{filter}'\n "],
     "{dirs} and {files}" : "{dirs} и {files}",
     "Favorited" : "Отбелязано в любими",
diff --git a/apps/files/l10n/bs.js b/apps/files/l10n/bs.js
index 4063e10f41e..8856725072c 100644
--- a/apps/files/l10n/bs.js
+++ b/apps/files/l10n/bs.js
@@ -62,9 +62,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Naziv datoteke ne može biti prazan",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaša pohrana je puna, datoteke više nije moguće ažurirati niti sinhronizirati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaš prostor za pohranu je skoro pun ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molim ažurirajte lozinku svoga privatnog ključa u svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifriranje je onemogućeno, ali vaše su datoteke još uvijek šifrirane. Molimo, odite u osobne postavke da biste dešifrirali svoje datoteke.",
     "{dirs} and {files}" : "{dirs} i {files}",
     "Favorited" : "Favorizovano",
     "Favorite" : "Favorit",
diff --git a/apps/files/l10n/bs.json b/apps/files/l10n/bs.json
index d4bf9ea3721..30a38102a69 100644
--- a/apps/files/l10n/bs.json
+++ b/apps/files/l10n/bs.json
@@ -60,9 +60,6 @@
     "File name cannot be empty." : "Naziv datoteke ne može biti prazan",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaša pohrana je puna, datoteke više nije moguće ažurirati niti sinhronizirati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaš prostor za pohranu je skoro pun ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molim ažurirajte lozinku svoga privatnog ključa u svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifriranje je onemogućeno, ali vaše su datoteke još uvijek šifrirane. Molimo, odite u osobne postavke da biste dešifrirali svoje datoteke.",
     "{dirs} and {files}" : "{dirs} i {files}",
     "Favorited" : "Favorizovano",
     "Favorite" : "Favorit",
diff --git a/apps/files/l10n/ca.js b/apps/files/l10n/ca.js
index 4f9bb23032e..ef55e399946 100644
--- a/apps/files/l10n/ca.js
+++ b/apps/files/l10n/ca.js
@@ -45,11 +45,13 @@ OC.L10N.register(
     "Download" : "Baixa",
     "Select" : "Selecciona",
     "Pending" : "Pendent",
+    "Unable to determine date" : "No s'ha pogut determinar la data",
     "Error moving file." : "Error en moure el fitxer.",
     "Error moving file" : "Error en moure el fitxer",
     "Error" : "Error",
     "Could not rename file" : "No es pot canviar el nom de fitxer",
     "Error deleting file." : "Error en esborrar el fitxer.",
+    "No entries in this folder match '{filter}'" : "No hi ha resultats que coincideixin amb '{filter}'",
     "Name" : "Nom",
     "Size" : "Mida",
     "Modified" : "Modificat",
@@ -61,11 +63,11 @@ OC.L10N.register(
     "File name cannot be empty." : "El nom del fitxer no pot ser buit.",
     "Your storage is full, files can not be updated or synced anymore!" : "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden actualitzar o sincronitzar!",
     "Your storage is almost full ({usedSpacePercent}%)" : "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clau privada de l'aplicació d'encriptació no és vàlida! Actualitzeu la contrasenya de la clau privada a l'arranjament personal per recuperar els fitxers encriptats.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers.",
+    "_matches '{filter}'_::_match '{filter}'_" : ["coincidències '{filter}'","coincidència '{filter}'"],
     "{dirs} and {files}" : "{dirs} i {files}",
+    "Favorited" : "Agregat a favorits",
     "Favorite" : "Preferits",
+    "An error occurred while trying to update the tags" : "S'ha produït un error en tractar d'actualitzar les etiquetes",
     "A new file or folder has been <strong>created</strong>" : "S'ha <strong>creat</strong> un nou fitxer o una nova carpeta",
     "A file or folder has been <strong>changed</strong>" : "S'ha <strong>canviat</strong> un fitxer o una carpeta",
     "A file or folder has been <strong>deleted</strong>" : "S'ha <strong>elminiat</strong> un fitxer o una carpeta",
@@ -86,6 +88,7 @@ OC.L10N.register(
     "Maximum upload size" : "Mida màxima de pujada",
     "max. possible: " : "màxim possible:",
     "Save" : "Desa",
+    "Can not be edited from here due to insufficient permissions." : "No es pot editar des d'aquí per permisos insuficients.",
     "Settings" : "Arranjament",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
@@ -96,9 +99,15 @@ OC.L10N.register(
     "Folder" : "Carpeta",
     "Upload" : "Puja",
     "Cancel upload" : "Cancel·la la pujada",
+    "No files in here" : "No hi ha arxius",
+    "Upload some content or sync with your devices!" : "Pugi continguts o sincronitzi els seus dispositius.",
+    "No entries found in this folder" : "No hi ha entrades en aquesta carpeta",
+    "Select all" : "Seleccionar tot",
     "Upload too large" : "La pujada és massa gran",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
     "Files are being scanned, please wait." : "S'estan escanejant els fitxers, espereu",
-    "Currently scanning" : "Actualment escanejant"
+    "Currently scanning" : "Actualment escanejant",
+    "No favorites" : "No hi ha favorits",
+    "Files and folders you mark as favorite will show up here" : "Aquí apareixeran els arxius i carpetes que vostè marqui com favorits"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ca.json b/apps/files/l10n/ca.json
index 24b7321f118..f102b4f5fd3 100644
--- a/apps/files/l10n/ca.json
+++ b/apps/files/l10n/ca.json
@@ -43,11 +43,13 @@
     "Download" : "Baixa",
     "Select" : "Selecciona",
     "Pending" : "Pendent",
+    "Unable to determine date" : "No s'ha pogut determinar la data",
     "Error moving file." : "Error en moure el fitxer.",
     "Error moving file" : "Error en moure el fitxer",
     "Error" : "Error",
     "Could not rename file" : "No es pot canviar el nom de fitxer",
     "Error deleting file." : "Error en esborrar el fitxer.",
+    "No entries in this folder match '{filter}'" : "No hi ha resultats que coincideixin amb '{filter}'",
     "Name" : "Nom",
     "Size" : "Mida",
     "Modified" : "Modificat",
@@ -59,11 +61,11 @@
     "File name cannot be empty." : "El nom del fitxer no pot ser buit.",
     "Your storage is full, files can not be updated or synced anymore!" : "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden actualitzar o sincronitzar!",
     "Your storage is almost full ({usedSpacePercent}%)" : "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clau privada de l'aplicació d'encriptació no és vàlida! Actualitzeu la contrasenya de la clau privada a l'arranjament personal per recuperar els fitxers encriptats.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers.",
+    "_matches '{filter}'_::_match '{filter}'_" : ["coincidències '{filter}'","coincidència '{filter}'"],
     "{dirs} and {files}" : "{dirs} i {files}",
+    "Favorited" : "Agregat a favorits",
     "Favorite" : "Preferits",
+    "An error occurred while trying to update the tags" : "S'ha produït un error en tractar d'actualitzar les etiquetes",
     "A new file or folder has been <strong>created</strong>" : "S'ha <strong>creat</strong> un nou fitxer o una nova carpeta",
     "A file or folder has been <strong>changed</strong>" : "S'ha <strong>canviat</strong> un fitxer o una carpeta",
     "A file or folder has been <strong>deleted</strong>" : "S'ha <strong>elminiat</strong> un fitxer o una carpeta",
@@ -84,6 +86,7 @@
     "Maximum upload size" : "Mida màxima de pujada",
     "max. possible: " : "màxim possible:",
     "Save" : "Desa",
+    "Can not be edited from here due to insufficient permissions." : "No es pot editar des d'aquí per permisos insuficients.",
     "Settings" : "Arranjament",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
@@ -94,9 +97,15 @@
     "Folder" : "Carpeta",
     "Upload" : "Puja",
     "Cancel upload" : "Cancel·la la pujada",
+    "No files in here" : "No hi ha arxius",
+    "Upload some content or sync with your devices!" : "Pugi continguts o sincronitzi els seus dispositius.",
+    "No entries found in this folder" : "No hi ha entrades en aquesta carpeta",
+    "Select all" : "Seleccionar tot",
     "Upload too large" : "La pujada és massa gran",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
     "Files are being scanned, please wait." : "S'estan escanejant els fitxers, espereu",
-    "Currently scanning" : "Actualment escanejant"
+    "Currently scanning" : "Actualment escanejant",
+    "No favorites" : "No hi ha favorits",
+    "Files and folders you mark as favorite will show up here" : "Aquí apareixeran els arxius i carpetes que vostè marqui com favorits"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js
index 7eab30b25e4..84444eb360e 100644
--- a/apps/files/l10n/cs_CZ.js
+++ b/apps/files/l10n/cs_CZ.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Název souboru nemůže být prázdný řetězec.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete.",
     "_matches '{filter}'_::_match '{filter}'_" : ["odpovídá '{filter}'","odpovídá '{filter}'","odpovídá '{filter}'"],
     "{dirs} and {files}" : "{dirs} a {files}",
     "Favorited" : "Přidáno k oblíbeným",
@@ -73,6 +70,7 @@ OC.L10N.register(
     "An error occurred while trying to update the tags" : "Při pokusu o úpravu tagů nastala chyba",
     "A new file or folder has been <strong>created</strong>" : "Byl <strong>vytvořen</strong> nový soubor nebo složka",
     "A file or folder has been <strong>changed</strong>" : "Soubor nebo složka byla <strong>změněna</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limit oznámení o tvorbě a změnách vašich <strong>oblíbených souborů</strong> <em>(Pouze streamovat)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Soubor nebo složka byla <strong>smazána</strong>",
     "A file or folder has been <strong>restored</strong>" : "Soubor nebo složka byla <strong>obnovena</strong>",
     "You created %1$s" : "Vytvořili jste %1$s",
diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json
index 2458195469b..24fa5840ad5 100644
--- a/apps/files/l10n/cs_CZ.json
+++ b/apps/files/l10n/cs_CZ.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Název souboru nemůže být prázdný řetězec.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete.",
     "_matches '{filter}'_::_match '{filter}'_" : ["odpovídá '{filter}'","odpovídá '{filter}'","odpovídá '{filter}'"],
     "{dirs} and {files}" : "{dirs} a {files}",
     "Favorited" : "Přidáno k oblíbeným",
@@ -71,6 +68,7 @@
     "An error occurred while trying to update the tags" : "Při pokusu o úpravu tagů nastala chyba",
     "A new file or folder has been <strong>created</strong>" : "Byl <strong>vytvořen</strong> nový soubor nebo složka",
     "A file or folder has been <strong>changed</strong>" : "Soubor nebo složka byla <strong>změněna</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limit oznámení o tvorbě a změnách vašich <strong>oblíbených souborů</strong> <em>(Pouze streamovat)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Soubor nebo složka byla <strong>smazána</strong>",
     "A file or folder has been <strong>restored</strong>" : "Soubor nebo složka byla <strong>obnovena</strong>",
     "You created %1$s" : "Vytvořili jste %1$s",
diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js
index b9dfbe23ab2..b2cd08da2d3 100644
--- a/apps/files/l10n/da.js
+++ b/apps/files/l10n/da.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Filnavnet kan ikke stå tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. ",
     "_matches '{filter}'_::_match '{filter}'_" : ["match '{filter}'","match '{filter}'"],
     "{dirs} and {files}" : "{dirs} og {files}",
     "Favorited" : "Gjort til foretrukken",
@@ -73,6 +70,7 @@ OC.L10N.register(
     "An error occurred while trying to update the tags" : "Der opstod en fejl under forsøg på at opdatere mærkerne",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mapper er blevet <strong>oprettet</strong>",
     "A file or folder has been <strong>changed</strong>" : "En fil eller mappe er blevet <strong>ændret</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Begræns noter om oprettelse og ændringer af dine <strong>favorit filer</strong> <em>(Kun streaming)</em>",
     "A file or folder has been <strong>deleted</strong>" : "En fil eller mappe er blevet <strong>slettet</strong>",
     "A file or folder has been <strong>restored</strong>" : "En fil eller mappe er blevet <strong>gendannet</strong>",
     "You created %1$s" : "Du oprettede %1$s ",
diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json
index 3ba0f9abbd8..2b368767a44 100644
--- a/apps/files/l10n/da.json
+++ b/apps/files/l10n/da.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Filnavnet kan ikke stå tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. ",
     "_matches '{filter}'_::_match '{filter}'_" : ["match '{filter}'","match '{filter}'"],
     "{dirs} and {files}" : "{dirs} og {files}",
     "Favorited" : "Gjort til foretrukken",
@@ -71,6 +68,7 @@
     "An error occurred while trying to update the tags" : "Der opstod en fejl under forsøg på at opdatere mærkerne",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mapper er blevet <strong>oprettet</strong>",
     "A file or folder has been <strong>changed</strong>" : "En fil eller mappe er blevet <strong>ændret</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Begræns noter om oprettelse og ændringer af dine <strong>favorit filer</strong> <em>(Kun streaming)</em>",
     "A file or folder has been <strong>deleted</strong>" : "En fil eller mappe er blevet <strong>slettet</strong>",
     "A file or folder has been <strong>restored</strong>" : "En fil eller mappe er blevet <strong>gendannet</strong>",
     "You created %1$s" : "Du oprettede %1$s ",
diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js
index 9d49c783e62..721495a7335 100644
--- a/apps/files/l10n/de.js
+++ b/apps/files/l10n/de.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
     "Your storage is full, files can not be updated or synced anymore!" : "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Dein Speicher ist fast voll ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melden Dich nochmals ab und wieder an.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselung-App. Bitte aktualisiere Dein privates Schlüssel-Passwort, um den Zugriff auf Deine verschlüsselten Dateien wiederherzustellen.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Die Verschlüsselung wurde deaktiviert, jedoch sind Deine Dateien nach wie vor verschlüsselt. Bitte gehe zu Deinen persönlichen Einstellungen, um Deine Dateien zu entschlüsseln.",
     "_matches '{filter}'_::_match '{filter}'_" : ["stimmt mit '{filter}' überein","stimmen mit '{filter}' überein"],
     "{dirs} and {files}" : "{dirs} und {files}",
     "Favorited" : "Favorisiert",
@@ -73,6 +70,7 @@ OC.L10N.register(
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Benachrichtigungen über Neues und Änderungen auf Deine <strong>favorisierten Dateien</strong> beschränken <em>(nur im Stream)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Eine Datei oder ein Ordner wurde <strong>gelöscht</strong>",
     "A file or folder has been <strong>restored</strong>" : "Eine Datei oder ein Ordner wurde <strong>wiederhergestellt</strong>",
     "You created %1$s" : "Du hast %1$s erstellt",
diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json
index 2ff4fae237b..467cbda63ea 100644
--- a/apps/files/l10n/de.json
+++ b/apps/files/l10n/de.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
     "Your storage is full, files can not be updated or synced anymore!" : "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Dein Speicher ist fast voll ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melden Dich nochmals ab und wieder an.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselung-App. Bitte aktualisiere Dein privates Schlüssel-Passwort, um den Zugriff auf Deine verschlüsselten Dateien wiederherzustellen.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Die Verschlüsselung wurde deaktiviert, jedoch sind Deine Dateien nach wie vor verschlüsselt. Bitte gehe zu Deinen persönlichen Einstellungen, um Deine Dateien zu entschlüsseln.",
     "_matches '{filter}'_::_match '{filter}'_" : ["stimmt mit '{filter}' überein","stimmen mit '{filter}' überein"],
     "{dirs} and {files}" : "{dirs} und {files}",
     "Favorited" : "Favorisiert",
@@ -71,6 +68,7 @@
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Benachrichtigungen über Neues und Änderungen auf Deine <strong>favorisierten Dateien</strong> beschränken <em>(nur im Stream)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Eine Datei oder ein Ordner wurde <strong>gelöscht</strong>",
     "A file or folder has been <strong>restored</strong>" : "Eine Datei oder ein Ordner wurde <strong>wiederhergestellt</strong>",
     "You created %1$s" : "Du hast %1$s erstellt",
diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js
index 0dab592ae92..34239019ea4 100644
--- a/apps/files/l10n/de_DE.js
+++ b/apps/files/l10n/de_DE.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden Sie sich nochmals ab und wieder an.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihr privates Schlüsselpasswort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
     "_matches '{filter}'_::_match '{filter}'_" : ["stimmt mit '{filter}' überein","stimmen mit '{filter}' überein"],
     "{dirs} and {files}" : "{dirs} und {files}",
     "Favorited" : "Favorisiert",
@@ -73,6 +70,7 @@ OC.L10N.register(
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Benachrichtigungen über Neues und Änderungen auf Ihre <strong>favorisierten Dateien</strong> beschränken <em>(nur im Stream)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Eine Datei oder ein Ordner wurde <strong>gelöscht</strong>",
     "A file or folder has been <strong>restored</strong>" : "Eine Datei oder ein Ordner wurde <strong>wiederhergestellt</strong>",
     "You created %1$s" : "Sie haben %1$s erstellt",
diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json
index cad25b15f5c..2a061bda5f0 100644
--- a/apps/files/l10n/de_DE.json
+++ b/apps/files/l10n/de_DE.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden Sie sich nochmals ab und wieder an.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihr privates Schlüsselpasswort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
     "_matches '{filter}'_::_match '{filter}'_" : ["stimmt mit '{filter}' überein","stimmen mit '{filter}' überein"],
     "{dirs} and {files}" : "{dirs} und {files}",
     "Favorited" : "Favorisiert",
@@ -71,6 +68,7 @@
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Benachrichtigungen über Neues und Änderungen auf Ihre <strong>favorisierten Dateien</strong> beschränken <em>(nur im Stream)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Eine Datei oder ein Ordner wurde <strong>gelöscht</strong>",
     "A file or folder has been <strong>restored</strong>" : "Eine Datei oder ein Ordner wurde <strong>wiederhergestellt</strong>",
     "You created %1$s" : "Sie haben %1$s erstellt",
diff --git a/apps/files/l10n/el.js b/apps/files/l10n/el.js
index f86e86fcc84..24ebdfbfc6c 100644
--- a/apps/files/l10n/el.js
+++ b/apps/files/l10n/el.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Το όνομα αρχείου δεν μπορεί να είναι κενό.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις",
     "_matches '{filter}'_::_match '{filter}'_" : ["ταιριάζουν '{filter}' ","ταιριάζουν '{filter}'"],
     "{dirs} and {files}" : "{Κατάλογοι αρχείων} και {αρχεία}",
     "Favorited" : "Προτιμώμενα",
@@ -73,6 +70,7 @@ OC.L10N.register(
     "An error occurred while trying to update the tags" : "Ένα σφάλμα προέκυψε κατά τη διάρκεια ενημέρωσης των ετικετών",
     "A new file or folder has been <strong>created</strong>" : "Ένα νέο αρχείο ή κατάλογος έχουν <strong>δημιουργηθεί</strong>",
     "A file or folder has been <strong>changed</strong>" : "Ένα αρχείο ή κατάλογος έχουν <strong>αλλάξει</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Βάλτε όριο στις ειδοποιήσεις για τη δημιουργία και αλλαγές στα <strong>αγαπημένα σας αρχεία</strong> <em>(Μόνο Stream)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Ένα αρχείο ή κατάλογος έχουν <strong>διαγραφεί</strong>",
     "A file or folder has been <strong>restored</strong>" : "Ένα αρχείο ή φάκελος <strong>επαναφέρθηκε</ strong>",
     "You created %1$s" : "Δημιουργήσατε %1$s",
diff --git a/apps/files/l10n/el.json b/apps/files/l10n/el.json
index b864d5e3276..c718e8323d2 100644
--- a/apps/files/l10n/el.json
+++ b/apps/files/l10n/el.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Το όνομα αρχείου δεν μπορεί να είναι κενό.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις",
     "_matches '{filter}'_::_match '{filter}'_" : ["ταιριάζουν '{filter}' ","ταιριάζουν '{filter}'"],
     "{dirs} and {files}" : "{Κατάλογοι αρχείων} και {αρχεία}",
     "Favorited" : "Προτιμώμενα",
@@ -71,6 +68,7 @@
     "An error occurred while trying to update the tags" : "Ένα σφάλμα προέκυψε κατά τη διάρκεια ενημέρωσης των ετικετών",
     "A new file or folder has been <strong>created</strong>" : "Ένα νέο αρχείο ή κατάλογος έχουν <strong>δημιουργηθεί</strong>",
     "A file or folder has been <strong>changed</strong>" : "Ένα αρχείο ή κατάλογος έχουν <strong>αλλάξει</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Βάλτε όριο στις ειδοποιήσεις για τη δημιουργία και αλλαγές στα <strong>αγαπημένα σας αρχεία</strong> <em>(Μόνο Stream)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Ένα αρχείο ή κατάλογος έχουν <strong>διαγραφεί</strong>",
     "A file or folder has been <strong>restored</strong>" : "Ένα αρχείο ή φάκελος <strong>επαναφέρθηκε</ strong>",
     "You created %1$s" : "Δημιουργήσατε %1$s",
diff --git a/apps/files/l10n/en_GB.js b/apps/files/l10n/en_GB.js
index d2f563d1568..fa0fa7307c8 100644
--- a/apps/files/l10n/en_GB.js
+++ b/apps/files/l10n/en_GB.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "File name cannot be empty.",
     "Your storage is full, files can not be updated or synced anymore!" : "Your storage is full, files can not be updated or synced anymore!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Your storage is almost full ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.",
     "_matches '{filter}'_::_match '{filter}'_" : ["matches '{filter}'","match '{filter}'"],
     "{dirs} and {files}" : "{dirs} and {files}",
     "Favorited" : "Favourited",
diff --git a/apps/files/l10n/en_GB.json b/apps/files/l10n/en_GB.json
index 7ee7b36d2e5..8f3a23a1639 100644
--- a/apps/files/l10n/en_GB.json
+++ b/apps/files/l10n/en_GB.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "File name cannot be empty.",
     "Your storage is full, files can not be updated or synced anymore!" : "Your storage is full, files can not be updated or synced anymore!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Your storage is almost full ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.",
     "_matches '{filter}'_::_match '{filter}'_" : ["matches '{filter}'","match '{filter}'"],
     "{dirs} and {files}" : "{dirs} and {files}",
     "Favorited" : "Favourited",
diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js
index 37e523529f5..c6b9a7b6e7e 100644
--- a/apps/files/l10n/es.js
+++ b/apps/files/l10n/es.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
     "Your storage is full, files can not be updated or synced anymore!" : "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
     "_matches '{filter}'_::_match '{filter}'_" : ["coincidencias '{filter}'","coincidencia '{filter}'"],
     "{dirs} and {files}" : "{dirs} y {files}",
     "Favorited" : "Agregado a favoritos",
diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json
index 76226b54948..683149bafea 100644
--- a/apps/files/l10n/es.json
+++ b/apps/files/l10n/es.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
     "Your storage is full, files can not be updated or synced anymore!" : "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
     "_matches '{filter}'_::_match '{filter}'_" : ["coincidencias '{filter}'","coincidencia '{filter}'"],
     "{dirs} and {files}" : "{dirs} y {files}",
     "Favorited" : "Agregado a favoritos",
diff --git a/apps/files/l10n/es_AR.js b/apps/files/l10n/es_AR.js
index ea56123f11d..f4d74e553ae 100644
--- a/apps/files/l10n/es_AR.js
+++ b/apps/files/l10n/es_AR.js
@@ -51,9 +51,6 @@ OC.L10N.register(
     "File name cannot be empty." : "El nombre del archivo no puede quedar vacío.",
     "Your storage is full, files can not be updated or synced anymore!" : "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
     "Your storage is almost full ({usedSpacePercent}%)" : "El almacenamiento está casi lleno ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Llave privada inválida para la aplicación de encriptación. Por favor actualice la clave de la llave privada en las configuraciones personales para recobrar el acceso a sus archivos encriptados.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos.",
     "{dirs} and {files}" : "{carpetas} y {archivos}",
     "Favorite" : "Favorito",
     "A new file or folder has been <strong>created</strong>" : "Un archivo o carpeta ha sido <strong>creado</strong>",
diff --git a/apps/files/l10n/es_AR.json b/apps/files/l10n/es_AR.json
index 33df652d756..376f24e3636 100644
--- a/apps/files/l10n/es_AR.json
+++ b/apps/files/l10n/es_AR.json
@@ -49,9 +49,6 @@
     "File name cannot be empty." : "El nombre del archivo no puede quedar vacío.",
     "Your storage is full, files can not be updated or synced anymore!" : "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
     "Your storage is almost full ({usedSpacePercent}%)" : "El almacenamiento está casi lleno ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Llave privada inválida para la aplicación de encriptación. Por favor actualice la clave de la llave privada en las configuraciones personales para recobrar el acceso a sus archivos encriptados.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos.",
     "{dirs} and {files}" : "{carpetas} y {archivos}",
     "Favorite" : "Favorito",
     "A new file or folder has been <strong>created</strong>" : "Un archivo o carpeta ha sido <strong>creado</strong>",
diff --git a/apps/files/l10n/es_MX.js b/apps/files/l10n/es_MX.js
index 4ada37134ab..c621aa33290 100644
--- a/apps/files/l10n/es_MX.js
+++ b/apps/files/l10n/es_MX.js
@@ -50,9 +50,6 @@ OC.L10N.register(
     "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
     "Your storage is full, files can not be updated or synced anymore!" : "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la aplicación de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
     "{dirs} and {files}" : "{dirs} y {files}",
     "Favorite" : "Favorito",
     "%s could not be renamed" : "%s no pudo ser renombrado",
diff --git a/apps/files/l10n/es_MX.json b/apps/files/l10n/es_MX.json
index 760fc042998..ae5c152af2d 100644
--- a/apps/files/l10n/es_MX.json
+++ b/apps/files/l10n/es_MX.json
@@ -48,9 +48,6 @@
     "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
     "Your storage is full, files can not be updated or synced anymore!" : "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la aplicación de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
     "{dirs} and {files}" : "{dirs} y {files}",
     "Favorite" : "Favorito",
     "%s could not be renamed" : "%s no pudo ser renombrado",
diff --git a/apps/files/l10n/et_EE.js b/apps/files/l10n/et_EE.js
index 895b3812f0e..a829246bfa9 100644
--- a/apps/files/l10n/et_EE.js
+++ b/apps/files/l10n/et_EE.js
@@ -61,9 +61,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Faili nimi ei saa olla tühi.",
     "Your storage is full, files can not be updated or synced anymore!" : "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks.",
     "{dirs} and {files}" : "{dirs} ja {files}",
     "Favorite" : "Lemmik",
     "A new file or folder has been <strong>created</strong>" : "Uus fail või kataloog on <strong>loodud</strong>",
diff --git a/apps/files/l10n/et_EE.json b/apps/files/l10n/et_EE.json
index 3ff409f1f72..b39420a5aa3 100644
--- a/apps/files/l10n/et_EE.json
+++ b/apps/files/l10n/et_EE.json
@@ -59,9 +59,6 @@
     "File name cannot be empty." : "Faili nimi ei saa olla tühi.",
     "Your storage is full, files can not be updated or synced anymore!" : "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks.",
     "{dirs} and {files}" : "{dirs} ja {files}",
     "Favorite" : "Lemmik",
     "A new file or folder has been <strong>created</strong>" : "Uus fail või kataloog on <strong>loodud</strong>",
diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js
index 899f4f604f5..f54385bd3c6 100644
--- a/apps/files/l10n/eu.js
+++ b/apps/files/l10n/eu.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Fitxategi izena ezin da hutsa izan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Enkriptazio aplikaziorako gako pribatu okerra. Mesedez eguneratu zure gako pribatuaren pasahitza zure ezarpen pertsonaletan zure enkriptatuko fitxategietarako sarrera berreskuratzeko.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez  jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.",
     "{dirs} and {files}" : "{dirs} eta {files}",
     "Favorited" : "Gogokoa",
     "Favorite" : "Gogokoa",
diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json
index b798e9032a8..5eb3ede3e1f 100644
--- a/apps/files/l10n/eu.json
+++ b/apps/files/l10n/eu.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Fitxategi izena ezin da hutsa izan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Enkriptazio aplikaziorako gako pribatu okerra. Mesedez eguneratu zure gako pribatuaren pasahitza zure ezarpen pertsonaletan zure enkriptatuko fitxategietarako sarrera berreskuratzeko.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez  jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.",
     "{dirs} and {files}" : "{dirs} eta {files}",
     "Favorited" : "Gogokoa",
     "Favorite" : "Gogokoa",
diff --git a/apps/files/l10n/fi_FI.js b/apps/files/l10n/fi_FI.js
index 66c0f37ab65..db7dbca8f12 100644
--- a/apps/files/l10n/fi_FI.js
+++ b/apps/files/l10n/fi_FI.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Tiedoston nimi ei voi olla tyhjä.",
     "Your storage is full, files can not be updated or synced anymore!" : "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Tallennustila on melkein loppu ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Salaussovelluksen salausavain on virheellinen. Ole hyvä ja päivitä salausavain henkilökohtaisissa asetuksissasi jotta voit taas avata salatuskirjoitetut tiedostosi.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Salaus poistettiin käytöstä, mutta tiedostosi ovat edelleen salattuina. Siirry henkilökohtaisiin asetuksiin avataksesi tiedostojesi salauksen.",
     "_matches '{filter}'_::_match '{filter}'_" : ["vastaa '{filter}'","vastaa '{filter}'"],
     "{dirs} and {files}" : "{dirs} ja {files}",
     "Favorited" : "Lisätty suosikkeihin",
@@ -73,6 +70,7 @@ OC.L10N.register(
     "An error occurred while trying to update the tags" : "Tunnisteiden päivitystä yrittäessä tapahtui virhe",
     "A new file or folder has been <strong>created</strong>" : "Uusi tiedosto tai kansio on <strong>luotu</strong>",
     "A file or folder has been <strong>changed</strong>" : "Tiedostoa tai kansiota on <strong>muutettu</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Rajoita luomis- ja muutosilmoitukset <strong>omiin suosikkitiedostoihin</strong> <em>(Vain listaus)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Tiedosto tai kansio on <strong>poistettu</strong>",
     "A file or folder has been <strong>restored</strong>" : "Tiedosto tai kansio on <strong>palautettu</strong>",
     "You created %1$s" : "Loit kohteen %1$s",
diff --git a/apps/files/l10n/fi_FI.json b/apps/files/l10n/fi_FI.json
index 1f7c353c7e8..8bfa09be9bc 100644
--- a/apps/files/l10n/fi_FI.json
+++ b/apps/files/l10n/fi_FI.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Tiedoston nimi ei voi olla tyhjä.",
     "Your storage is full, files can not be updated or synced anymore!" : "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Tallennustila on melkein loppu ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Salaussovelluksen salausavain on virheellinen. Ole hyvä ja päivitä salausavain henkilökohtaisissa asetuksissasi jotta voit taas avata salatuskirjoitetut tiedostosi.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Salaus poistettiin käytöstä, mutta tiedostosi ovat edelleen salattuina. Siirry henkilökohtaisiin asetuksiin avataksesi tiedostojesi salauksen.",
     "_matches '{filter}'_::_match '{filter}'_" : ["vastaa '{filter}'","vastaa '{filter}'"],
     "{dirs} and {files}" : "{dirs} ja {files}",
     "Favorited" : "Lisätty suosikkeihin",
@@ -71,6 +68,7 @@
     "An error occurred while trying to update the tags" : "Tunnisteiden päivitystä yrittäessä tapahtui virhe",
     "A new file or folder has been <strong>created</strong>" : "Uusi tiedosto tai kansio on <strong>luotu</strong>",
     "A file or folder has been <strong>changed</strong>" : "Tiedostoa tai kansiota on <strong>muutettu</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Rajoita luomis- ja muutosilmoitukset <strong>omiin suosikkitiedostoihin</strong> <em>(Vain listaus)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Tiedosto tai kansio on <strong>poistettu</strong>",
     "A file or folder has been <strong>restored</strong>" : "Tiedosto tai kansio on <strong>palautettu</strong>",
     "You created %1$s" : "Loit kohteen %1$s",
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index 242f2ad4d76..997b916b051 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Le nom de fichier ne peut être vide.",
     "Your storage is full, files can not be updated or synced anymore!" : "Votre espage de stockage est plein, les fichiers ne peuvent plus être ajoutés ou synchronisés !",
     "Your storage is almost full ({usedSpacePercent}%)" : "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Le chiffrement est activé, mais vos clés ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée pour le chiffrement n'est pas valide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Le chiffrement a été désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos paramètres personnels pour déchiffrer vos fichiers.",
     "_matches '{filter}'_::_match '{filter}'_" : ["correspond à '{filter}'","correspondent à '{filter}'"],
     "{dirs} and {files}" : "{dirs} et {files}",
     "Favorited" : "Marqué comme favori",
@@ -73,6 +70,7 @@ OC.L10N.register(
     "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la tentative de mise à jour des étiquettes",
     "A new file or folder has been <strong>created</strong>" : "Un nouveau fichier ou répertoire a été <strong>créé</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un fichier ou un répertoire a été <strong>modifié</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limiter les notifications à ce qui concerne la création et la modification de vos <strong>fichiers favoris</strong> <em>(Flux uniquement)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Un fichier ou un répertoire a été <strong>supprimé</strong>",
     "A file or folder has been <strong>restored</strong>" : "Un fichier ou répertoire a été <strong>restauré</strong>",
     "You created %1$s" : "Vous avez créé %1$s",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index 76136495968..c27bdd6ca6d 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Le nom de fichier ne peut être vide.",
     "Your storage is full, files can not be updated or synced anymore!" : "Votre espage de stockage est plein, les fichiers ne peuvent plus être ajoutés ou synchronisés !",
     "Your storage is almost full ({usedSpacePercent}%)" : "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Le chiffrement est activé, mais vos clés ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée pour le chiffrement n'est pas valide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Le chiffrement a été désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos paramètres personnels pour déchiffrer vos fichiers.",
     "_matches '{filter}'_::_match '{filter}'_" : ["correspond à '{filter}'","correspondent à '{filter}'"],
     "{dirs} and {files}" : "{dirs} et {files}",
     "Favorited" : "Marqué comme favori",
@@ -71,6 +68,7 @@
     "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la tentative de mise à jour des étiquettes",
     "A new file or folder has been <strong>created</strong>" : "Un nouveau fichier ou répertoire a été <strong>créé</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un fichier ou un répertoire a été <strong>modifié</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limiter les notifications à ce qui concerne la création et la modification de vos <strong>fichiers favoris</strong> <em>(Flux uniquement)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Un fichier ou un répertoire a été <strong>supprimé</strong>",
     "A file or folder has been <strong>restored</strong>" : "Un fichier ou répertoire a été <strong>restauré</strong>",
     "You created %1$s" : "Vous avez créé %1$s",
diff --git a/apps/files/l10n/gl.js b/apps/files/l10n/gl.js
index e23212fe504..c1c6ec11f45 100644
--- a/apps/files/l10n/gl.js
+++ b/apps/files/l10n/gl.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "O nome de ficheiro non pode estar baleiro",
     "Your storage is full, files can not be updated or synced anymore!" : "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!",
     "Your storage is almost full ({usedSpacePercent}%)" : "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron preparadas, saia da sesión e volva a acceder de novo",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "A chave privada para a aplicación de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros.",
     "_matches '{filter}'_::_match '{filter}'_" : ["coincidente con «{filter}»","coincidentes con «{filter}»"],
     "{dirs} and {files}" : "{dirs} e {files}",
     "Favorited" : "Marcado como favorito",
@@ -73,6 +70,7 @@ OC.L10N.register(
     "An error occurred while trying to update the tags" : "Produciuse un erro ao tentar actualizar as etiquetas",
     "A new file or folder has been <strong>created</strong>" : "<strong>Creouse</strong> un novo ficheiro ou cartafol",
     "A file or folder has been <strong>changed</strong>" : "<strong>Cambiouse</strong> un ficheiro ou cartafol",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limita as notificacións sobre a creación e modificación dos seus <strong>ficheiros favoritos</strong> <em>(só os fluxos)</em>",
     "A file or folder has been <strong>deleted</strong>" : "<strong>Eliminouse</strong> un ficheiro ou cartafol",
     "A file or folder has been <strong>restored</strong>" : "Foi <strong>restaurado</strong> satisfactoriamente un ficheiro ou cartafol",
     "You created %1$s" : "Creou %1$s",
diff --git a/apps/files/l10n/gl.json b/apps/files/l10n/gl.json
index f5ffd326b89..07c5efde382 100644
--- a/apps/files/l10n/gl.json
+++ b/apps/files/l10n/gl.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "O nome de ficheiro non pode estar baleiro",
     "Your storage is full, files can not be updated or synced anymore!" : "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!",
     "Your storage is almost full ({usedSpacePercent}%)" : "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron preparadas, saia da sesión e volva a acceder de novo",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "A chave privada para a aplicación de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros.",
     "_matches '{filter}'_::_match '{filter}'_" : ["coincidente con «{filter}»","coincidentes con «{filter}»"],
     "{dirs} and {files}" : "{dirs} e {files}",
     "Favorited" : "Marcado como favorito",
@@ -71,6 +68,7 @@
     "An error occurred while trying to update the tags" : "Produciuse un erro ao tentar actualizar as etiquetas",
     "A new file or folder has been <strong>created</strong>" : "<strong>Creouse</strong> un novo ficheiro ou cartafol",
     "A file or folder has been <strong>changed</strong>" : "<strong>Cambiouse</strong> un ficheiro ou cartafol",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limita as notificacións sobre a creación e modificación dos seus <strong>ficheiros favoritos</strong> <em>(só os fluxos)</em>",
     "A file or folder has been <strong>deleted</strong>" : "<strong>Eliminouse</strong> un ficheiro ou cartafol",
     "A file or folder has been <strong>restored</strong>" : "Foi <strong>restaurado</strong> satisfactoriamente un ficheiro ou cartafol",
     "You created %1$s" : "Creou %1$s",
diff --git a/apps/files/l10n/hr.js b/apps/files/l10n/hr.js
index a1d08bea51d..f62fe8d6c64 100644
--- a/apps/files/l10n/hr.js
+++ b/apps/files/l10n/hr.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Naziv datoteke ne može biti prazan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaša je pohrana puna, datoteke više nije moguće ažurirati niti sinkronizirati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaš prostor za pohranu je skoro pun ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je onemogućena, ali vaši ključevi nisu inicijalizirani, molimo odjavite se i ponovno prijavite",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molimo ažurirajte lozinku svoga privatnog ključa u svojim osobnimpostavkama da biste obnovili pristup svojim šifriranim datotekama.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifriranje je onemogućeno, ali vaše su datoteke još uvijek šifrirane. Molimo, otiđite u svojeosobne postavke da biste dešifrirali svoje datoteke.",
     "{dirs} and {files}" : "{dirs} i {files}",
     "Favorited" : "Favoritovan",
     "Favorite" : "Favorit",
diff --git a/apps/files/l10n/hr.json b/apps/files/l10n/hr.json
index 80a0faec727..9a83a301dd9 100644
--- a/apps/files/l10n/hr.json
+++ b/apps/files/l10n/hr.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Naziv datoteke ne može biti prazan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaša je pohrana puna, datoteke više nije moguće ažurirati niti sinkronizirati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaš prostor za pohranu je skoro pun ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je onemogućena, ali vaši ključevi nisu inicijalizirani, molimo odjavite se i ponovno prijavite",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molimo ažurirajte lozinku svoga privatnog ključa u svojim osobnimpostavkama da biste obnovili pristup svojim šifriranim datotekama.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifriranje je onemogućeno, ali vaše su datoteke još uvijek šifrirane. Molimo, otiđite u svojeosobne postavke da biste dešifrirali svoje datoteke.",
     "{dirs} and {files}" : "{dirs} i {files}",
     "Favorited" : "Favoritovan",
     "Favorite" : "Favorit",
diff --git a/apps/files/l10n/hu_HU.js b/apps/files/l10n/hu_HU.js
index 3365195d258..52800fc6cee 100644
--- a/apps/files/l10n/hu_HU.js
+++ b/apps/files/l10n/hu_HU.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "A fájlnév nem lehet semmi.",
     "Your storage is full, files can not be updated or synced anymore!" : "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben.",
     "Your storage is almost full ({usedSpacePercent}%)" : "A tároló majdnem tele van ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Kérjük frissítse a titkos kulcs jelszót a személyes beállításokban, hogy ismét hozzáférjen a titkosított állományaihoz!",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani.",
     "_matches '{filter}'_::_match '{filter}'_" : ["egyezések '{filter}'","egyezés '{filter}'"],
     "{dirs} and {files}" : "{dirs} és {files}",
     "Favorited" : "Kedvenc",
diff --git a/apps/files/l10n/hu_HU.json b/apps/files/l10n/hu_HU.json
index e5c3ab973d8..3f2d8e133f2 100644
--- a/apps/files/l10n/hu_HU.json
+++ b/apps/files/l10n/hu_HU.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "A fájlnév nem lehet semmi.",
     "Your storage is full, files can not be updated or synced anymore!" : "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben.",
     "Your storage is almost full ({usedSpacePercent}%)" : "A tároló majdnem tele van ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Kérjük frissítse a titkos kulcs jelszót a személyes beállításokban, hogy ismét hozzáférjen a titkosított állományaihoz!",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani.",
     "_matches '{filter}'_::_match '{filter}'_" : ["egyezések '{filter}'","egyezés '{filter}'"],
     "{dirs} and {files}" : "{dirs} és {files}",
     "Favorited" : "Kedvenc",
diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js
index d5bf00e01f3..ffc8c909b91 100644
--- a/apps/files/l10n/id.js
+++ b/apps/files/l10n/id.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Nama berkas tidak boleh kosong.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda.",
     "_matches '{filter}'_::_match '{filter}'_" : ["cocok dengan '{filter}'"],
     "{dirs} and {files}" : "{dirs} dan {files}",
     "Favorited" : "Difavoritkan",
diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json
index 52b1426a6f7..51d64896b0c 100644
--- a/apps/files/l10n/id.json
+++ b/apps/files/l10n/id.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Nama berkas tidak boleh kosong.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda.",
     "_matches '{filter}'_::_match '{filter}'_" : ["cocok dengan '{filter}'"],
     "{dirs} and {files}" : "{dirs} dan {files}",
     "Favorited" : "Difavoritkan",
diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js
index 52f1d0a728d..13f2ecd4dcb 100644
--- a/apps/files/l10n/it.js
+++ b/apps/files/l10n/it.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Il nome del file non può essere vuoto.",
     "Your storage is full, files can not be updated or synced anymore!" : "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file.",
     "_matches '{filter}'_::_match '{filter}'_" : ["corrispondono a '{filter}'","corrisponde a '{filter}'"],
     "{dirs} and {files}" : "{dirs} e {files}",
     "Favorited" : "Preferiti",
@@ -73,6 +70,7 @@ OC.L10N.register(
     "An error occurred while trying to update the tags" : "Si è verificato un errore durante il tentativo di aggiornare le etichette",
     "A new file or folder has been <strong>created</strong>" : "Un nuovo file o cartella è stato <strong>creato</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un file o una cartella è stato <strong>modificato</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limita le notifiche relative alla creazione e alla modifica dei tuoi <strong>file preferiti</strong> <em>(Solo flusso)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Un file o una cartella è stato <strong>eliminato</strong>",
     "A file or folder has been <strong>restored</strong>" : "Un file o una cartella è stato <strong>ripristinato</strong>",
     "You created %1$s" : "Hai creato %1$s",
diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json
index ce73465ce73..40d3aa7f125 100644
--- a/apps/files/l10n/it.json
+++ b/apps/files/l10n/it.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Il nome del file non può essere vuoto.",
     "Your storage is full, files can not be updated or synced anymore!" : "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file.",
     "_matches '{filter}'_::_match '{filter}'_" : ["corrispondono a '{filter}'","corrisponde a '{filter}'"],
     "{dirs} and {files}" : "{dirs} e {files}",
     "Favorited" : "Preferiti",
@@ -71,6 +68,7 @@
     "An error occurred while trying to update the tags" : "Si è verificato un errore durante il tentativo di aggiornare le etichette",
     "A new file or folder has been <strong>created</strong>" : "Un nuovo file o cartella è stato <strong>creato</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un file o una cartella è stato <strong>modificato</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limita le notifiche relative alla creazione e alla modifica dei tuoi <strong>file preferiti</strong> <em>(Solo flusso)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Un file o una cartella è stato <strong>eliminato</strong>",
     "A file or folder has been <strong>restored</strong>" : "Un file o una cartella è stato <strong>ripristinato</strong>",
     "You created %1$s" : "Hai creato %1$s",
diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js
index 7b4ccb0c6bc..fc90f8c2d97 100644
--- a/apps/files/l10n/ja.js
+++ b/apps/files/l10n/ja.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "ファイル名を空にすることはできません。",
     "Your storage is full, files can not be updated or synced anymore!" : "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！",
     "Your storage is almost full ({usedSpacePercent}%)" : "ストレージがほぼ一杯です（{usedSpacePercent}%）",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。",
     "_matches '{filter}'_::_match '{filter}'_" : [" '{filter}' にマッチ"],
     "{dirs} and {files}" : "{dirs} と {files}",
     "Favorited" : "お気に入り済",
diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json
index 1ec47b409db..c9c579ac189 100644
--- a/apps/files/l10n/ja.json
+++ b/apps/files/l10n/ja.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "ファイル名を空にすることはできません。",
     "Your storage is full, files can not be updated or synced anymore!" : "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！",
     "Your storage is almost full ({usedSpacePercent}%)" : "ストレージがほぼ一杯です（{usedSpacePercent}%）",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。",
     "_matches '{filter}'_::_match '{filter}'_" : [" '{filter}' にマッチ"],
     "{dirs} and {files}" : "{dirs} と {files}",
     "Favorited" : "お気に入り済",
diff --git a/apps/files/l10n/ko.js b/apps/files/l10n/ko.js
index c98403c77ee..ca961a8fbbd 100644
--- a/apps/files/l10n/ko.js
+++ b/apps/files/l10n/ko.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "파일 이름이 비어 있을 수 없습니다.",
     "Your storage is full, files can not be updated or synced anymore!" : "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!",
     "Your storage is almost full ({usedSpacePercent}%)" : "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "암호화는 해제되어 있지만, 파일은 아직 암호화되어 있습니다. 개인 설정에서 파일을 복호화하십시오.",
     "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}'와(과) 일치"],
     "{dirs} and {files}" : "{dirs} 그리고 {files}",
     "Favorited" : "책갈피에 추가됨",
diff --git a/apps/files/l10n/ko.json b/apps/files/l10n/ko.json
index 4c77124d80f..e8757da56b9 100644
--- a/apps/files/l10n/ko.json
+++ b/apps/files/l10n/ko.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "파일 이름이 비어 있을 수 없습니다.",
     "Your storage is full, files can not be updated or synced anymore!" : "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!",
     "Your storage is almost full ({usedSpacePercent}%)" : "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "암호화는 해제되어 있지만, 파일은 아직 암호화되어 있습니다. 개인 설정에서 파일을 복호화하십시오.",
     "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}'와(과) 일치"],
     "{dirs} and {files}" : "{dirs} 그리고 {files}",
     "Favorited" : "책갈피에 추가됨",
diff --git a/apps/files/l10n/lt_LT.js b/apps/files/l10n/lt_LT.js
index 38848c41f07..376e0d84f67 100644
--- a/apps/files/l10n/lt_LT.js
+++ b/apps/files/l10n/lt_LT.js
@@ -62,9 +62,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Failo pavadinimas negali būti tuščias.",
     "Your storage is full, files can not be updated or synced anymore!" : "Jūsų visa vieta serveryje užimta",
     "Your storage is almost full ({usedSpacePercent}%)" : "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Netinkamas privatus raktas Šifravimo programai. Prašome atnaujinti savo privataus rakto slaptažodį asmeniniuose nustatymuose, kad atkurti prieigą prie šifruotų failų.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus.",
     "{dirs} and {files}" : "{dirs} ir {files}",
     "Favorited" : "Pažymėta mėgstamu",
     "Favorite" : "Mėgiamas",
diff --git a/apps/files/l10n/lt_LT.json b/apps/files/l10n/lt_LT.json
index d57121d8aba..b8e296a0d43 100644
--- a/apps/files/l10n/lt_LT.json
+++ b/apps/files/l10n/lt_LT.json
@@ -60,9 +60,6 @@
     "File name cannot be empty." : "Failo pavadinimas negali būti tuščias.",
     "Your storage is full, files can not be updated or synced anymore!" : "Jūsų visa vieta serveryje užimta",
     "Your storage is almost full ({usedSpacePercent}%)" : "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Netinkamas privatus raktas Šifravimo programai. Prašome atnaujinti savo privataus rakto slaptažodį asmeniniuose nustatymuose, kad atkurti prieigą prie šifruotų failų.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus.",
     "{dirs} and {files}" : "{dirs} ir {files}",
     "Favorited" : "Pažymėta mėgstamu",
     "Favorite" : "Mėgiamas",
diff --git a/apps/files/l10n/lv.js b/apps/files/l10n/lv.js
index fb0b4907ff4..8454fe48faa 100644
--- a/apps/files/l10n/lv.js
+++ b/apps/files/l10n/lv.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Datnes nosaukums nevar būt tukšs.",
     "Your storage is full, files can not be updated or synced anymore!" : "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifrēšanas lietotnes ir pieslēgta, bet šifrēšanas atslēgas nav uzstādītas. Lūdzu izejiet no sistēmas un ieejiet sistēmā atpakaļ.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Šifrēšanas lietotnei nepareiza privātā atslēga. Lūdzu atjaunojiet savu privāto atslēgu personīgo uzstādījumu sadaļā, lai atjaunot pieeju šifrētajiem failiem.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos.",
     "_matches '{filter}'_::_match '{filter}'_" : ["atrasts pēc '{filter}'","atrasts pēc '{filter}'","atrasti pēc '{filter}'"],
     "{dirs} and {files}" : "{dirs} un {files}",
     "Favorited" : "Favorīti",
diff --git a/apps/files/l10n/lv.json b/apps/files/l10n/lv.json
index 7146e1b423e..59220478b65 100644
--- a/apps/files/l10n/lv.json
+++ b/apps/files/l10n/lv.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Datnes nosaukums nevar būt tukšs.",
     "Your storage is full, files can not be updated or synced anymore!" : "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifrēšanas lietotnes ir pieslēgta, bet šifrēšanas atslēgas nav uzstādītas. Lūdzu izejiet no sistēmas un ieejiet sistēmā atpakaļ.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Šifrēšanas lietotnei nepareiza privātā atslēga. Lūdzu atjaunojiet savu privāto atslēgu personīgo uzstādījumu sadaļā, lai atjaunot pieeju šifrētajiem failiem.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos.",
     "_matches '{filter}'_::_match '{filter}'_" : ["atrasts pēc '{filter}'","atrasts pēc '{filter}'","atrasti pēc '{filter}'"],
     "{dirs} and {files}" : "{dirs} un {files}",
     "Favorited" : "Favorīti",
diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js
index bc9893c708a..56cea9ed363 100644
--- a/apps/files/l10n/nb_NO.js
+++ b/apps/files/l10n/nb_NO.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Filnavn kan ikke være tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine.",
     "_matches '{filter}'_::_match '{filter}'_" : [" stemmer med '{filter}'"," stemmer med '{filter}'"],
     "{dirs} and {files}" : "{dirs} og {files}",
     "Favorited" : "Er favoritt",
diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json
index 2c12b3ad0c5..69db79a6695 100644
--- a/apps/files/l10n/nb_NO.json
+++ b/apps/files/l10n/nb_NO.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Filnavn kan ikke være tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine.",
     "_matches '{filter}'_::_match '{filter}'_" : [" stemmer med '{filter}'"," stemmer med '{filter}'"],
     "{dirs} and {files}" : "{dirs} og {files}",
     "Favorited" : "Er favoritt",
diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js
index 92be41a4c47..01363c80c27 100644
--- a/apps/files/l10n/nl.js
+++ b/apps/files/l10n/nl.js
@@ -62,9 +62,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Bestandsnaam kan niet leeg zijn.",
     "Your storage is full, files can not be updated or synced anymore!" : "Uw opslagruimte zit vol. Bestanden kunnen niet meer worden gewijzigd of gesynchroniseerd!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige privésleutel voor crypto app. Werk het privésleutel wachtwoord bij in uw persoonlijke instellingen om opnieuw toegang te krijgen tot uw versleutelde bestanden.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen.",
     "_matches '{filter}'_::_match '{filter}'_" : ["komt overeen met '{filter}'","komen overeen met '{filter}'"],
     "{dirs} and {files}" : "{dirs} en {files}",
     "Favorited" : "Favoriet",
@@ -72,6 +69,7 @@ OC.L10N.register(
     "An error occurred while trying to update the tags" : "Er trad een fout op bij uw poging de tags bij te werken",
     "A new file or folder has been <strong>created</strong>" : "Een nieuw bestand of map is <strong>aangemaakt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Een bestand of map is <strong>gewijzigd</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Beperk meldingen over aanmaken en wijzigen aan uw <strong>favoriete bestanden</strong> <em>(Alleen stream)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Een bestand of map is <strong>verwijderd</strong>",
     "A file or folder has been <strong>restored</strong>" : "Een bestand of een mmaps is <strong>hersteld</strong>",
     "You created %1$s" : "U creëerde %1$s",
diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json
index 154f8c835a7..1b8a2381de6 100644
--- a/apps/files/l10n/nl.json
+++ b/apps/files/l10n/nl.json
@@ -60,9 +60,6 @@
     "File name cannot be empty." : "Bestandsnaam kan niet leeg zijn.",
     "Your storage is full, files can not be updated or synced anymore!" : "Uw opslagruimte zit vol. Bestanden kunnen niet meer worden gewijzigd of gesynchroniseerd!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige privésleutel voor crypto app. Werk het privésleutel wachtwoord bij in uw persoonlijke instellingen om opnieuw toegang te krijgen tot uw versleutelde bestanden.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen.",
     "_matches '{filter}'_::_match '{filter}'_" : ["komt overeen met '{filter}'","komen overeen met '{filter}'"],
     "{dirs} and {files}" : "{dirs} en {files}",
     "Favorited" : "Favoriet",
@@ -70,6 +67,7 @@
     "An error occurred while trying to update the tags" : "Er trad een fout op bij uw poging de tags bij te werken",
     "A new file or folder has been <strong>created</strong>" : "Een nieuw bestand of map is <strong>aangemaakt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Een bestand of map is <strong>gewijzigd</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Beperk meldingen over aanmaken en wijzigen aan uw <strong>favoriete bestanden</strong> <em>(Alleen stream)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Een bestand of map is <strong>verwijderd</strong>",
     "A file or folder has been <strong>restored</strong>" : "Een bestand of een mmaps is <strong>hersteld</strong>",
     "You created %1$s" : "U creëerde %1$s",
diff --git a/apps/files/l10n/nn_NO.js b/apps/files/l10n/nn_NO.js
index fd378eeb606..af4ec92771c 100644
--- a/apps/files/l10n/nn_NO.js
+++ b/apps/files/l10n/nn_NO.js
@@ -42,7 +42,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Filnamnet kan ikkje vera tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lagringa di er nesten full ({usedSpacePercent} %)",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar.",
     "{dirs} and {files}" : "{dirs} og {files}",
     "Favorite" : "Favoritt",
     "A new file or folder has been <strong>created</strong>" : "Ei ny fil eller mappe er <strong>oppretta</strong>",
diff --git a/apps/files/l10n/nn_NO.json b/apps/files/l10n/nn_NO.json
index a03cb799eae..8e0e297220f 100644
--- a/apps/files/l10n/nn_NO.json
+++ b/apps/files/l10n/nn_NO.json
@@ -40,7 +40,6 @@
     "File name cannot be empty." : "Filnamnet kan ikkje vera tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lagringa di er nesten full ({usedSpacePercent} %)",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar.",
     "{dirs} and {files}" : "{dirs} og {files}",
     "Favorite" : "Favoritt",
     "A new file or folder has been <strong>created</strong>" : "Ei ny fil eller mappe er <strong>oppretta</strong>",
diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js
index 635780e8876..94edeb52755 100644
--- a/apps/files/l10n/pl.js
+++ b/apps/files/l10n/pl.js
@@ -61,9 +61,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Nazwa pliku nie może być pusta.",
     "Your storage is full, files can not be updated or synced anymore!" : "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Twój magazyn jest prawie pełny ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz. Można zaktualizować hasło klucza prywatnego w ustawieniach osobistych w celu odzyskania dostępu do plików",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki.",
     "{dirs} and {files}" : "{dirs} i {files}",
     "Favorite" : "Ulubione",
     "A new file or folder has been <strong>created</strong>" : "Nowy plik lub folder został <strong>utworzony</strong>",
diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json
index 6ecce8ddca2..28ca7f7170c 100644
--- a/apps/files/l10n/pl.json
+++ b/apps/files/l10n/pl.json
@@ -59,9 +59,6 @@
     "File name cannot be empty." : "Nazwa pliku nie może być pusta.",
     "Your storage is full, files can not be updated or synced anymore!" : "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Twój magazyn jest prawie pełny ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz. Można zaktualizować hasło klucza prywatnego w ustawieniach osobistych w celu odzyskania dostępu do plików",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki.",
     "{dirs} and {files}" : "{dirs} i {files}",
     "Favorite" : "Ulubione",
     "A new file or folder has been <strong>created</strong>" : "Nowy plik lub folder został <strong>utworzony</strong>",
diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js
index 7d23e67422b..83343a9444e 100644
--- a/apps/files/l10n/pt_BR.js
+++ b/apps/files/l10n/pt_BR.js
@@ -63,15 +63,13 @@ OC.L10N.register(
     "File name cannot be empty." : "O nome do arquivo não pode estar vazio.",
     "Your storage is full, files can not be updated or synced anymore!" : "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave do App de Criptografia é inválida. Por favor, atualize sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Criptografia foi desabilitada mas seus arquivos continuam criptografados. Por favor vá a suas configurações pessoais para descriptar seus arquivos.",
     "{dirs} and {files}" : "{dirs} e {files}",
     "Favorited" : "Favorito",
     "Favorite" : "Favorito",
     "An error occurred while trying to update the tags" : "Ocorreu um erro enquanto tentava atualizar as etiquetas",
     "A new file or folder has been <strong>created</strong>" : "Um novo arquivo ou pasta foi <strong>criado</strong>",
     "A file or folder has been <strong>changed</strong>" : "Um arquivo ou pasta foi <strong>modificado</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limite de notificações sobre a criação e alterações em seus <strong>arquivos favoritos</strong> <em>(Stream apenas)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Um arquivo ou pasta foi <strong>excluído</strong>",
     "A file or folder has been <strong>restored</strong>" : "Um arquivo ou pasta foi <strong>restautado</strong>",
     "You created %1$s" : "Você criou %1$s",
diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json
index 17c69e0607d..42bacf971b2 100644
--- a/apps/files/l10n/pt_BR.json
+++ b/apps/files/l10n/pt_BR.json
@@ -61,15 +61,13 @@
     "File name cannot be empty." : "O nome do arquivo não pode estar vazio.",
     "Your storage is full, files can not be updated or synced anymore!" : "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave do App de Criptografia é inválida. Por favor, atualize sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Criptografia foi desabilitada mas seus arquivos continuam criptografados. Por favor vá a suas configurações pessoais para descriptar seus arquivos.",
     "{dirs} and {files}" : "{dirs} e {files}",
     "Favorited" : "Favorito",
     "Favorite" : "Favorito",
     "An error occurred while trying to update the tags" : "Ocorreu um erro enquanto tentava atualizar as etiquetas",
     "A new file or folder has been <strong>created</strong>" : "Um novo arquivo ou pasta foi <strong>criado</strong>",
     "A file or folder has been <strong>changed</strong>" : "Um arquivo ou pasta foi <strong>modificado</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limite de notificações sobre a criação e alterações em seus <strong>arquivos favoritos</strong> <em>(Stream apenas)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Um arquivo ou pasta foi <strong>excluído</strong>",
     "A file or folder has been <strong>restored</strong>" : "Um arquivo ou pasta foi <strong>restautado</strong>",
     "You created %1$s" : "Você criou %1$s",
diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js
index b37996b5073..072141105c8 100644
--- a/apps/files/l10n/pt_PT.js
+++ b/apps/files/l10n/pt_PT.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "O nome do ficheiro não pode estar em branco.",
     "Your storage is full, files can not be updated or synced anymore!" : "O seu armazenamento está cheio, os ficheiros já não podem ser atualizados ou sincronizados.",
     "Your storage is almost full ({usedSpacePercent}%)" : "O seu armazenamento está quase cheiro ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A encriptação foi desactivada mas os seus ficheiros continuam encriptados.  Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
     "_matches '{filter}'_::_match '{filter}'_" : ["corresponde a '{filter}'","correspondem a '{filter}'"],
     "{dirs} and {files}" : "{dirs} e {files}",
     "Favorited" : "Assinalado como Favorito",
@@ -73,6 +70,7 @@ OC.L10N.register(
     "An error occurred while trying to update the tags" : "Ocorreu um erro ao tentar atualizar as tags",
     "A new file or folder has been <strong>created</strong>" : "Foi <strong>criado</strong> um novo ficheiro ou pasta",
     "A file or folder has been <strong>changed</strong>" : "Foi <strong>alterado</strong> um ficheiro ou pasta",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limite notificações sobre a criação e modificações nos seus <strong>ficheiros favoritos</strong> <em>(apenas Stream)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Foi <strong>apagado</strong> um ficheiro ou pasta",
     "A file or folder has been <strong>restored</strong>" : "Foi <strong>restaurado(a)</strong> um ficheiro ou pasta",
     "You created %1$s" : "Criou %1$s",
diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json
index c0ab202a86d..66230a0e6c9 100644
--- a/apps/files/l10n/pt_PT.json
+++ b/apps/files/l10n/pt_PT.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "O nome do ficheiro não pode estar em branco.",
     "Your storage is full, files can not be updated or synced anymore!" : "O seu armazenamento está cheio, os ficheiros já não podem ser atualizados ou sincronizados.",
     "Your storage is almost full ({usedSpacePercent}%)" : "O seu armazenamento está quase cheiro ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A encriptação foi desactivada mas os seus ficheiros continuam encriptados.  Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
     "_matches '{filter}'_::_match '{filter}'_" : ["corresponde a '{filter}'","correspondem a '{filter}'"],
     "{dirs} and {files}" : "{dirs} e {files}",
     "Favorited" : "Assinalado como Favorito",
@@ -71,6 +68,7 @@
     "An error occurred while trying to update the tags" : "Ocorreu um erro ao tentar atualizar as tags",
     "A new file or folder has been <strong>created</strong>" : "Foi <strong>criado</strong> um novo ficheiro ou pasta",
     "A file or folder has been <strong>changed</strong>" : "Foi <strong>alterado</strong> um ficheiro ou pasta",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limite notificações sobre a criação e modificações nos seus <strong>ficheiros favoritos</strong> <em>(apenas Stream)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Foi <strong>apagado</strong> um ficheiro ou pasta",
     "A file or folder has been <strong>restored</strong>" : "Foi <strong>restaurado(a)</strong> um ficheiro ou pasta",
     "You created %1$s" : "Criou %1$s",
diff --git a/apps/files/l10n/ro.js b/apps/files/l10n/ro.js
index 6831754b1b5..0a293c2523e 100644
--- a/apps/files/l10n/ro.js
+++ b/apps/files/l10n/ro.js
@@ -61,9 +61,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Numele fișierului nu poate rămâne gol.",
     "Your storage is full, files can not be updated or synced anymore!" : "Spațiul de stocare este plin, fișierele nu mai pot fi actualizate sau sincronizate!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Spațiul de stocare este aproape plin ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicatia de criptare este activata dar tastatura nu este initializata , va rugam deconectati-va si reconectati-va",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Cheie privată nevalidă pentru aplicația Încriptare. Te rog, actualizează-ți parola cheii private folosind setările personale pentru a reaccesa fișierele tale încriptate.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele",
     "{dirs} and {files}" : "{dirs} și {files}",
     "Favorite" : "Favorit",
     "A new file or folder has been <strong>created</strong>" : "Un nou fișier sau dosar a fost <strong>creat</strong>",
diff --git a/apps/files/l10n/ro.json b/apps/files/l10n/ro.json
index 206bb7e7e6c..b3e59f9cfac 100644
--- a/apps/files/l10n/ro.json
+++ b/apps/files/l10n/ro.json
@@ -59,9 +59,6 @@
     "File name cannot be empty." : "Numele fișierului nu poate rămâne gol.",
     "Your storage is full, files can not be updated or synced anymore!" : "Spațiul de stocare este plin, fișierele nu mai pot fi actualizate sau sincronizate!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Spațiul de stocare este aproape plin ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicatia de criptare este activata dar tastatura nu este initializata , va rugam deconectati-va si reconectati-va",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Cheie privată nevalidă pentru aplicația Încriptare. Te rog, actualizează-ți parola cheii private folosind setările personale pentru a reaccesa fișierele tale încriptate.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele",
     "{dirs} and {files}" : "{dirs} și {files}",
     "Favorite" : "Favorit",
     "A new file or folder has been <strong>created</strong>" : "Un nou fișier sau dosar a fost <strong>creat</strong>",
diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js
index f93ac884971..e6f3b43bf04 100644
--- a/apps/files/l10n/ru.js
+++ b/apps/files/l10n/ru.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Имя файла не может быть пустым.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ваше хранилище заполнено, произведите очистку перед загрузкой новых файлов.",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ваше хранилище почти заполнено ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение для шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Закрытый ключ приложения шифрования недействителен. Обновите закрытый ключ в личных настройках, чтобы восстановить доступ к зашифрованным файлам.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Шифрование было отключено, но ваши файлы остались зашифрованными. Зайдите на страницу личных настроек для того, чтобы расшифровать их.",
     "_matches '{filter}'_::_match '{filter}'_" : ["соответствует '{filter}'","соответствуют '{filter}'","соответствуют '{filter}'"],
     "{dirs} and {files}" : "{dirs} и {files}",
     "Favorited" : "Избранное",
@@ -73,6 +70,7 @@ OC.L10N.register(
     "An error occurred while trying to update the tags" : "Во время обновления тегов возникла ошибка",
     "A new file or folder has been <strong>created</strong>" : "<strong>Создан</strong> новый файл или каталог",
     "A file or folder has been <strong>changed</strong>" : "<strong>Изменён</strong> файл или каталог",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Ограничить уведомления о создании и изменении ваших <strong>избранных файлов</strong> <em>(отображать только в приложении события)</em>",
     "A file or folder has been <strong>deleted</strong>" : "<strong>Удален</strong> файл или каталог",
     "A file or folder has been <strong>restored</strong>" : "<strong>Восстановлен</strong> файл или каталог",
     "You created %1$s" : "Вы создали %1$s",
diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json
index eee5d0957fc..66e059a160e 100644
--- a/apps/files/l10n/ru.json
+++ b/apps/files/l10n/ru.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Имя файла не может быть пустым.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ваше хранилище заполнено, произведите очистку перед загрузкой новых файлов.",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ваше хранилище почти заполнено ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение для шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Закрытый ключ приложения шифрования недействителен. Обновите закрытый ключ в личных настройках, чтобы восстановить доступ к зашифрованным файлам.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Шифрование было отключено, но ваши файлы остались зашифрованными. Зайдите на страницу личных настроек для того, чтобы расшифровать их.",
     "_matches '{filter}'_::_match '{filter}'_" : ["соответствует '{filter}'","соответствуют '{filter}'","соответствуют '{filter}'"],
     "{dirs} and {files}" : "{dirs} и {files}",
     "Favorited" : "Избранное",
@@ -71,6 +68,7 @@
     "An error occurred while trying to update the tags" : "Во время обновления тегов возникла ошибка",
     "A new file or folder has been <strong>created</strong>" : "<strong>Создан</strong> новый файл или каталог",
     "A file or folder has been <strong>changed</strong>" : "<strong>Изменён</strong> файл или каталог",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Ограничить уведомления о создании и изменении ваших <strong>избранных файлов</strong> <em>(отображать только в приложении события)</em>",
     "A file or folder has been <strong>deleted</strong>" : "<strong>Удален</strong> файл или каталог",
     "A file or folder has been <strong>restored</strong>" : "<strong>Восстановлен</strong> файл или каталог",
     "You created %1$s" : "Вы создали %1$s",
diff --git a/apps/files/l10n/sk_SK.js b/apps/files/l10n/sk_SK.js
index 3b426f7b026..a806979d086 100644
--- a/apps/files/l10n/sk_SK.js
+++ b/apps/files/l10n/sk_SK.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Meno súboru nemôže byť prázdne",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný súkromný kľúč na šifrovanie aplikácií. Zaktualizujte si heslo súkromného kľúča v svojom osobnom nastavení, aby ste znovu získali prístup k svojim zašifrovaným súborom.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov.",
     "_matches '{filter}'_::_match '{filter}'_" : ["zodpovedá '{filter}'","zodpovedá '{filter}'","zodpovedá '{filter}'"],
     "{dirs} and {files}" : "{dirs} a {files}",
     "Favorited" : "Pridané k obľúbeným",
diff --git a/apps/files/l10n/sk_SK.json b/apps/files/l10n/sk_SK.json
index 673d16788a6..f16ccc8f241 100644
--- a/apps/files/l10n/sk_SK.json
+++ b/apps/files/l10n/sk_SK.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Meno súboru nemôže byť prázdne",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný súkromný kľúč na šifrovanie aplikácií. Zaktualizujte si heslo súkromného kľúča v svojom osobnom nastavení, aby ste znovu získali prístup k svojim zašifrovaným súborom.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov.",
     "_matches '{filter}'_::_match '{filter}'_" : ["zodpovedá '{filter}'","zodpovedá '{filter}'","zodpovedá '{filter}'"],
     "{dirs} and {files}" : "{dirs} a {files}",
     "Favorited" : "Pridané k obľúbeným",
diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js
index 9abf025473b..712346c3cf9 100644
--- a/apps/files/l10n/sl.js
+++ b/apps/files/l10n/sl.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Ime datoteke ne sme biti prazno polje.",
     "Your storage is full, files can not be updated or synced anymore!" : "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Prostor za shranjevanje je skoraj do konca zaseden ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifriranje je onemogočeno, datoteke pa so še vedno šifrirane. Odšifrirajte jih med nastavitvami.",
     "_matches '{filter}'_::_match '{filter}'_" : ["se sklada s filtrom '{filter}'","se skladata s filtrom '{filter}'","se skladajo s filtrom '{filter}'","se skladajo s filtrom '{filter}'"],
     "{dirs} and {files}" : "{dirs} in {files}",
     "Favorited" : "Označeno kot priljubljeno",
diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json
index ce8a63f6376..75f96fcc1e4 100644
--- a/apps/files/l10n/sl.json
+++ b/apps/files/l10n/sl.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Ime datoteke ne sme biti prazno polje.",
     "Your storage is full, files can not be updated or synced anymore!" : "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Prostor za shranjevanje je skoraj do konca zaseden ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifriranje je onemogočeno, datoteke pa so še vedno šifrirane. Odšifrirajte jih med nastavitvami.",
     "_matches '{filter}'_::_match '{filter}'_" : ["se sklada s filtrom '{filter}'","se skladata s filtrom '{filter}'","se skladajo s filtrom '{filter}'","se skladajo s filtrom '{filter}'"],
     "{dirs} and {files}" : "{dirs} in {files}",
     "Favorited" : "Označeno kot priljubljeno",
diff --git a/apps/files/l10n/sq.js b/apps/files/l10n/sq.js
index 73476b286b0..e171d3d1e9b 100644
--- a/apps/files/l10n/sq.js
+++ b/apps/files/l10n/sq.js
@@ -59,9 +59,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Emri i skedarit nuk mund të jetë bosh.",
     "Your storage is full, files can not be updated or synced anymore!" : "Hapsira juaj e arkivimit është plot, skedarët nuk mund të përditësohen ose sinkronizohen!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Hapsira juaj e arkivimit është pothuajse në fund  ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacioni i Shifrimit është i aktivizuar por çelësat tuaj nuk janë aktivizuar, ju lutem dilni dhe ri-hyni përseri në sistem",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Çelësi privat për Aplikacionin e Shifrimit është i pavlefshëm. Ju lutem përditësoni fjalëkalimin e çelësit tuaj privat në parametrat tuaj për të rimarrë qasje në skedarët tuaj të shifruar.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj.",
     "{dirs} and {files}" : "{dirs} dhe {files}",
     "A new file or folder has been <strong>created</strong>" : "Një skedar ose një dosje e re është <strong>krijuar</strong>",
     "A file or folder has been <strong>changed</strong>" : "Një skedar ose një dosje ka <strong>ndryshuar</strong>",
diff --git a/apps/files/l10n/sq.json b/apps/files/l10n/sq.json
index 2f8b64a24b1..624f85bf0c8 100644
--- a/apps/files/l10n/sq.json
+++ b/apps/files/l10n/sq.json
@@ -57,9 +57,6 @@
     "File name cannot be empty." : "Emri i skedarit nuk mund të jetë bosh.",
     "Your storage is full, files can not be updated or synced anymore!" : "Hapsira juaj e arkivimit është plot, skedarët nuk mund të përditësohen ose sinkronizohen!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Hapsira juaj e arkivimit është pothuajse në fund  ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacioni i Shifrimit është i aktivizuar por çelësat tuaj nuk janë aktivizuar, ju lutem dilni dhe ri-hyni përseri në sistem",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Çelësi privat për Aplikacionin e Shifrimit është i pavlefshëm. Ju lutem përditësoni fjalëkalimin e çelësit tuaj privat në parametrat tuaj për të rimarrë qasje në skedarët tuaj të shifruar.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj.",
     "{dirs} and {files}" : "{dirs} dhe {files}",
     "A new file or folder has been <strong>created</strong>" : "Një skedar ose një dosje e re është <strong>krijuar</strong>",
     "A file or folder has been <strong>changed</strong>" : "Një skedar ose një dosje ka <strong>ndryshuar</strong>",
diff --git a/apps/files/l10n/sr.js b/apps/files/l10n/sr.js
index 75a1ad3b1c6..0064fd19818 100644
--- a/apps/files/l10n/sr.js
+++ b/apps/files/l10n/sr.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Назив фајла не може бити празан.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ваше складиште је пуно. Фајлови више не могу бити ажурирани ни синхронизовани!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ваше складиште је скоро пуно ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Апликација шифровања је укључена али није иницијализована. Одјавите се и поново се пријавите.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Неисправан лични кључ за апликацију шифровања. Ажурирајте лозинку личног кључа у личним поставкама да бисте опоравили приступ вашим шифрованим фајловима.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Шифровање је искључено али ваши фајлови су и даље шифровани. Идите у личне поставке и дешифрујте ваше фајлове.",
     "_matches '{filter}'_::_match '{filter}'_" : ["се поклапа са '{filter}'","се поклапају са '{filter}'","се поклапа са '{filter}'"],
     "{dirs} and {files}" : "{dirs} и {files}",
     "Favorited" : "Омиљено",
@@ -73,6 +70,7 @@ OC.L10N.register(
     "An error occurred while trying to update the tags" : "Дошло је до грешке при покушају ажурирања ознака",
     "A new file or folder has been <strong>created</strong>" : "Нови фајл или фасцикла су <strong>направљени</strong>",
     "A file or folder has been <strong>changed</strong>" : "Фајл или фасцикла су <strong>измењени</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Ограничи обавештења о стварању и изменама на <strong>омиљене фајлове</strong> <em>(само у записнику)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Фајл или фасцикла су <strong>обрисани</strong>",
     "A file or folder has been <strong>restored</strong>" : "Фајл или фасцикла су <strong>враћени</strong>",
     "You created %1$s" : "Направили сте %1$s",
diff --git a/apps/files/l10n/sr.json b/apps/files/l10n/sr.json
index 1384a2598dc..7a27e3d89fb 100644
--- a/apps/files/l10n/sr.json
+++ b/apps/files/l10n/sr.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Назив фајла не може бити празан.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ваше складиште је пуно. Фајлови више не могу бити ажурирани ни синхронизовани!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ваше складиште је скоро пуно ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Апликација шифровања је укључена али није иницијализована. Одјавите се и поново се пријавите.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Неисправан лични кључ за апликацију шифровања. Ажурирајте лозинку личног кључа у личним поставкама да бисте опоравили приступ вашим шифрованим фајловима.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Шифровање је искључено али ваши фајлови су и даље шифровани. Идите у личне поставке и дешифрујте ваше фајлове.",
     "_matches '{filter}'_::_match '{filter}'_" : ["се поклапа са '{filter}'","се поклапају са '{filter}'","се поклапа са '{filter}'"],
     "{dirs} and {files}" : "{dirs} и {files}",
     "Favorited" : "Омиљено",
@@ -71,6 +68,7 @@
     "An error occurred while trying to update the tags" : "Дошло је до грешке при покушају ажурирања ознака",
     "A new file or folder has been <strong>created</strong>" : "Нови фајл или фасцикла су <strong>направљени</strong>",
     "A file or folder has been <strong>changed</strong>" : "Фајл или фасцикла су <strong>измењени</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Ограничи обавештења о стварању и изменама на <strong>омиљене фајлове</strong> <em>(само у записнику)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Фајл или фасцикла су <strong>обрисани</strong>",
     "A file or folder has been <strong>restored</strong>" : "Фајл или фасцикла су <strong>враћени</strong>",
     "You created %1$s" : "Направили сте %1$s",
diff --git a/apps/files/l10n/sr@latin.js b/apps/files/l10n/sr@latin.js
index ba2c2072551..acd0a988ec6 100644
--- a/apps/files/l10n/sr@latin.js
+++ b/apps/files/l10n/sr@latin.js
@@ -4,110 +4,111 @@ OC.L10N.register(
     "Storage not available" : "Skladište nije dostupno",
     "Storage invalid" : "Neispravno skladište",
     "Unknown error" : "Nepoznata greška",
-    "Could not move %s - File with this name already exists" : "Nemoguće premeštanje %s - fajl sa ovim imenom već postoji",
-    "Could not move %s" : "Nemoguće premeštanje %s",
+    "Could not move %s - File with this name already exists" : "Ne mogu da premestim %s – fajl sa ovim nazivom već postoji",
+    "Could not move %s" : "Ne mogu da premestim %s",
     "Permission denied" : "Pristup odbijen",
-    "The target folder has been moved or deleted." : "Ciljani direktorijum je premešten ili izbrisan.",
-    "The name %s is already used in the folder %s. Please choose a different name." : "Ime %s je već u upotrebi u direktorijumu %s. Molimo izaberite drugo ime.",
-    "Error when creating the file" : "Greška pri kreiranju fajla",
-    "Error when creating the folder" : "Greška pri kreiranju direktorijuma",
-    "Unable to set upload directory." : "Nemoguće postaviti direktorijum za otpremanje.",
-    "Invalid Token" : "Neispravan simbol",
-    "No file was uploaded. Unknown error" : "Fajl nije otpremeljen. Nepoznata greška",
-    "There is no error, the file uploaded with success" : "Nema greške, fajl je uspešno poslat",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Otpremljeni fajl prevazilazi upload_max_filesize direktivu u php.ini:",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi",
-    "The uploaded file was only partially uploaded" : "Poslati fajl je samo delimično otpremljen!",
-    "No file was uploaded" : "Nijedan fajl nije poslat",
+    "The target folder has been moved or deleted." : "Odredišna fascikla je premeštena ili obrisana.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Naziv %s se već koristi u fascikli %s. Odredite drugi naziv.",
+    "Error when creating the file" : "Greška pri stvaranju fajla",
+    "Error when creating the folder" : "Greška pri stvaranju fajla",
+    "Unable to set upload directory." : "Ne mogu da postavim direktorijum za otpremanje.",
+    "Invalid Token" : "Neispravan token",
+    "No file was uploaded. Unknown error" : "Nijedan fajl nije otpremljen. Nepoznata greška",
+    "There is no error, the file uploaded with success" : "Nema greške, fajl je uspešno otpremljen",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Otpremani fajl prevazilazi smernicu upload_max_filesize u fajlu php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Otpremani fajl prevazilazi smernicu MAX_FILE_SIZE koja je navedena u HTML obrascu",
+    "The uploaded file was only partially uploaded" : "Otpremani fajl je samo delimično otpremljen",
+    "No file was uploaded" : "Ništa nije otpremljeno",
     "Missing a temporary folder" : "Nedostaje privremena fascikla",
-    "Failed to write to disk" : "Neuspelo pisanje na disk",
-    "Not enough storage available" : "Nema dovoljno skladišnog prostora na raspolaganju",
-    "Upload failed. Could not find uploaded file" : "Otpremanje nije uspelo. Nije pronađen otpremljeni fajl",
-    "Upload failed. Could not get file info." : "Otpremanje nije uspelo. Nije moguće pronaći informacije o fajlu.",
-    "Invalid directory." : "Neispravan direktorijum",
+    "Failed to write to disk" : "Ne mogu da pišem na disk",
+    "Not enough storage available" : "Nema dovoljno prostora",
+    "Upload failed. Could not find uploaded file" : "Neuspešno otpremanje. Ne mogu da nađem otpremljeni fajl",
+    "Upload failed. Could not get file info." : "Neuspešno otpremanje. Ne mogu da dobijem podatke o fajlu.",
+    "Invalid directory." : "Neispravna fascikla.",
     "Files" : "Fajlovi",
     "All files" : "Svi fajlovi",
     "Favorites" : "Omiljeni",
-    "Home" : "Kuća",
-    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nije moguće otpremiti {filename} zato što je u pitanju direktorijum ili ima 0 bajtova.",
-    "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina fajla {size1} prevazilazi limit za otpremanje {size2}",
-    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nema dovoljno slobodnog prostora, otpremate {size1} ali samo je {size2} preostalo",
-    "Upload cancelled." : "Otpremanje otkazano.",
-    "Could not get result from server." : "Nije bilo moguće dobiti rezultat sa servera.",
-    "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, prekinućete otpremanje.",
+    "Home" : "Početna",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne mogu da otpremim {filename} jer je to direktorijum ili ima 0 bajtova",
+    "Total file size {size1} exceeds upload limit {size2}" : "Veličina {size1} prevazilazi ograničenje za otpremanje od {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nema prostora. Otpremate {size1} ali samo {size2} je preostalo",
+    "Upload cancelled." : "Otpremanje je otkazano.",
+    "Could not get result from server." : "Ne mogu da dobijem rezultat sa servera.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, otkazaćete otpremanje.",
     "{new_name} already exists" : "{new_name} već postoji",
-    "Could not create file" : "Nije bilo moguće kreirati fajl",
-    "Could not create folder" : "Nije bilo moguće kreirati direktorijum",
-    "Rename" : "Preimenij",
+    "Could not create file" : "Ne mogu da stvorim fajl",
+    "Could not create folder" : "Ne mogu da stvorim fasciklu",
+    "Rename" : "Preimenuj",
     "Delete" : "Obriši",
-    "Disconnect storage" : "Nepovezano skladište",
-    "Unshare" : "Ukljoni deljenje",
+    "Disconnect storage" : "Isključi skladište",
+    "Unshare" : "Ne deli",
     "Download" : "Preuzmi",
-    "Select" : "Odaberi",
-    "Pending" : "U toku",
-    "Unable to determine date" : "Nemoguće ustanoviti datum",
+    "Select" : "Izaberi",
+    "Pending" : "Na čekanju",
+    "Unable to determine date" : "Ne mogu da odredim datum",
     "Error moving file." : "Greška pri premeštanju fajla.",
     "Error moving file" : "Greška pri premeštanju fajla",
     "Error" : "Greška",
-    "Could not rename file" : "Nemoguća promena imena fajla",
+    "Could not rename file" : "Ne mogu da preimenujem fajl",
     "Error deleting file." : "Greška pri brisanju fajla.",
-    "No entries in this folder match '{filter}'" : "Nijedan unos u ovom direktorijumu se ne poklapa sa '{filter}'",
-    "Name" : "Ime",
+    "No entries in this folder match '{filter}'" : "U ovoj fascikli ništa se ne poklapa sa '{filter}'",
+    "Name" : "Naziv",
     "Size" : "Veličina",
-    "Modified" : "Zadnja izmena",
-    "_%n folder_::_%n folders_" : ["%n direktorijum","%n direktorijuma","%n direktorijuma"],
-    "_%n file_::_%n files_" : ["%n fajl","%n fajlova","%n fajlova"],
-    "You don’t have permission to upload or create files here" : "Nemate dozvolu da otpremate ili kreirate fajlove ovde",
-    "_Uploading %n file_::_Uploading %n files_" : ["Otpremam %n fajl","Otpremam %n fajlova","Otpremam %n fajlova"],
-    "\"{name}\" is an invalid file name." : "\"{name}\" je neispravno ime fajla.",
-    "File name cannot be empty." : "Ime fajla ne može biti prazno.",
-    "Your storage is full, files can not be updated or synced anymore!" : "Vaše skladište je puno, fajlovi se ne mogu više otpremati ili sinhronizovati.",
+    "Modified" : "Izmenjen",
+    "_%n folder_::_%n folders_" : ["%n fascikla","%n fascikle","%n fascikli"],
+    "_%n file_::_%n files_" : ["%n fajl","%n fajla","%n fajlova"],
+    "You don’t have permission to upload or create files here" : "Nemate dozvole da ovde otpremate ili stvarate fajlove",
+    "_Uploading %n file_::_Uploading %n files_" : ["Otpremam %n fajl","Otpremam %n fajla","Otpremam %n fajlova"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" nije ispravan naziv fajla.",
+    "File name cannot be empty." : "Naziv fajla ne može biti prazan.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Vaše skladište je puno. Fajlovi više ne mogu biti ažurirani ni sinhronizovani!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaše skladište je skoro puno ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za Aplikaciju za šifrovanje. Molimo da osvežite vašu lozinku privatnog ključa u ličnim podešavanjima kako bi dobili pristup šifrovanim fajlovima.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrovanje je isključeno, ali Vaši fajlovi su i dalje šifrovani. Molimo Vas da odete u lična podešavanja da dešifrujete svoje fajlove.",
-    "_matches '{filter}'_::_match '{filter}'_" : ["poklapa se sa '{filter}'","poklapaju se sa '{filter}'","poklapaju se sa '{filter}'"],
+    "_matches '{filter}'_::_match '{filter}'_" : ["se poklapa sa '{filter}'","se poklapaju sa '{filter}'","se poklapa sa '{filter}'"],
     "{dirs} and {files}" : "{dirs} i {files}",
-    "Favorited" : "Omiljeni",
-    "Favorite" : "Omiljen",
-    "A new file or folder has been <strong>created</strong>" : "Novi fajl ili direktorijum je <strong>kreiran</strong>",
-    "A file or folder has been <strong>changed</strong>" : "Faj ili direktorijum je <strong>promenjen</strong>",
-    "A file or folder has been <strong>deleted</strong>" : "Fajl ili direktorijum je <strong>uklonjen</strong>",
-    "A file or folder has been <strong>restored</strong>" : "Fajl ili direktorijum je <strong>povraćen</strong>",
-    "You created %1$s" : "Kreirali ste %1$s",
-    "%2$s created %1$s" : "%2$s je kreirao %1$s",
-    "%1$s was created in a public folder" : "%1$s je kreiran u javnom direktorijumu",
+    "Favorited" : "Omiljeno",
+    "Favorite" : "Omiljeni",
+    "An error occurred while trying to update the tags" : "Došlo je do greške pri pokušaju ažuriranja oznaka",
+    "A new file or folder has been <strong>created</strong>" : "Novi fajl ili fascikla su <strong>napravljeni</strong>",
+    "A file or folder has been <strong>changed</strong>" : "Fajl ili fascikla su <strong>izmenjeni</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Ograniči obaveštenja o stvaranju i izmenama na <strong>omiljene fajlove</strong> <em>(samo u zapisniku)</em>",
+    "A file or folder has been <strong>deleted</strong>" : "Fajl ili fascikla su <strong>obrisani</strong>",
+    "A file or folder has been <strong>restored</strong>" : "Fajl ili fascikla su <strong>vraćeni</strong>",
+    "You created %1$s" : "Napravili ste %1$s",
+    "%2$s created %1$s" : "%2$s napravi %1$s",
+    "%1$s was created in a public folder" : "%1$s je napravljen u javnoj fascikli",
     "You changed %1$s" : "Izmenili ste %1$s",
-    "%2$s changed %1$s" : "%2$s je izmenio %1$s",
+    "%2$s changed %1$s" : "%2$s izmeni %1$s",
     "You deleted %1$s" : "Obrisali ste %1$s",
-    "%2$s deleted %1$s" : "%2$s je obrisao %1$s",
-    "You restored %1$s" : "Povratili ste %1$s",
-    "%2$s restored %1$s" : "%2$s je povratio %1$s",
-    "%s could not be renamed as it has been deleted" : "%s nije mogao biti preimenovan jer je obrisan.",
-    "%s could not be renamed" : "%s nije mogao biti preimenovan",
-    "Upload (max. %s)" : "Otpremanje  (maksimalno %s)",
-    "File handling" : "Upravljanje fajlovima",
-    "Maximum upload size" : "Maksimalna veličina pošiljke",
+    "%2$s deleted %1$s" : "%2$s obrisa %1$s",
+    "You restored %1$s" : "Vratili ste %1$s",
+    "%2$s restored %1$s" : "%2$s povrati %1$s",
+    "%s could not be renamed as it has been deleted" : "%s se ne može preimenovati jer je obrisan",
+    "%s could not be renamed" : "%s se ne može preimenovati",
+    "Upload (max. %s)" : "Otpremanje (maks. %s)",
+    "File handling" : "Rukovanje fajlovima",
+    "Maximum upload size" : "Najveća veličina otpremanja",
     "max. possible: " : "najviše moguće:",
-    "Save" : "Snimi",
-    "Settings" : "Podešavanja",
+    "Save" : "Sačuvaj",
+    "Can not be edited from here due to insufficient permissions." : "Ne može da se menja odavde zbog nedostatka dozvola.",
+    "Settings" : "Postavke",
     "WebDAV" : "WebDAV",
-    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Upotrebite ovu adresu da <a href=\"%s\" target=\"_blank\">pristupite svojim fajlovima putem WebDAV-a</a>",
-    "New" : "Novi",
-    "New text file" : "Novi tekstualni fajl",
-    "Text file" : "Tekstualni fajl",
-    "New folder" : "Novi direktorijum",
-    "Folder" : "Direktorijum",
-    "Upload" : "Pošalji",
+    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Koristite ovu adresu da <a href=\"%s\" target=\"_blank\"> pristupite fajlovima preko WebDAV-a</a>",
+    "New" : "Novo",
+    "New text file" : "Nov tekstualni fajl",
+    "Text file" : "tekstualni fajl",
+    "New folder" : "Nova fascikla",
+    "Folder" : "fascikla",
+    "Upload" : "Otpremi",
     "Cancel upload" : "Otkaži otpremanje",
-    "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa svojim uređajima!",
-    "No entries found in this folder" : "Nema pronađenih unosa u ovom direktorijumu",
-    "Select all" : "Odaberi sve",
-    "Upload too large" : "Pošiljka je prevelika",
-    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru.",
-    "Files are being scanned, please wait." : "Fajlovi se skeniraju, molimo sačekajte.",
+    "No files in here" : "Ovde nema fajlova",
+    "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa vašim uređajima!",
+    "No entries found in this folder" : "Nema ničega u ovoj fascikli",
+    "Select all" : "Označi sve",
+    "Upload too large" : "Otpremanje je preveliko",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da otpremite prevazilaze ograničenje otpremanja na ovom serveru.",
+    "Files are being scanned, please wait." : "Skeniram fajlove, sačekajte.",
     "Currently scanning" : "Trenutno skeniram",
     "No favorites" : "Nema omiljenih",
-    "Files and folders you mark as favorite will show up here" : "Fajlovi i direktorijumi koje ste obeležili kao omiljene će biti prikazani ovde"
+    "Files and folders you mark as favorite will show up here" : "Fajlovi i fascikle koje obeležite kao omiljene pojaviće se ovde"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files/l10n/sr@latin.json b/apps/files/l10n/sr@latin.json
index be17fd7bed9..cb6882c5c5c 100644
--- a/apps/files/l10n/sr@latin.json
+++ b/apps/files/l10n/sr@latin.json
@@ -2,110 +2,111 @@
     "Storage not available" : "Skladište nije dostupno",
     "Storage invalid" : "Neispravno skladište",
     "Unknown error" : "Nepoznata greška",
-    "Could not move %s - File with this name already exists" : "Nemoguće premeštanje %s - fajl sa ovim imenom već postoji",
-    "Could not move %s" : "Nemoguće premeštanje %s",
+    "Could not move %s - File with this name already exists" : "Ne mogu da premestim %s – fajl sa ovim nazivom već postoji",
+    "Could not move %s" : "Ne mogu da premestim %s",
     "Permission denied" : "Pristup odbijen",
-    "The target folder has been moved or deleted." : "Ciljani direktorijum je premešten ili izbrisan.",
-    "The name %s is already used in the folder %s. Please choose a different name." : "Ime %s je već u upotrebi u direktorijumu %s. Molimo izaberite drugo ime.",
-    "Error when creating the file" : "Greška pri kreiranju fajla",
-    "Error when creating the folder" : "Greška pri kreiranju direktorijuma",
-    "Unable to set upload directory." : "Nemoguće postaviti direktorijum za otpremanje.",
-    "Invalid Token" : "Neispravan simbol",
-    "No file was uploaded. Unknown error" : "Fajl nije otpremeljen. Nepoznata greška",
-    "There is no error, the file uploaded with success" : "Nema greške, fajl je uspešno poslat",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Otpremljeni fajl prevazilazi upload_max_filesize direktivu u php.ini:",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi",
-    "The uploaded file was only partially uploaded" : "Poslati fajl je samo delimično otpremljen!",
-    "No file was uploaded" : "Nijedan fajl nije poslat",
+    "The target folder has been moved or deleted." : "Odredišna fascikla je premeštena ili obrisana.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Naziv %s se već koristi u fascikli %s. Odredite drugi naziv.",
+    "Error when creating the file" : "Greška pri stvaranju fajla",
+    "Error when creating the folder" : "Greška pri stvaranju fajla",
+    "Unable to set upload directory." : "Ne mogu da postavim direktorijum za otpremanje.",
+    "Invalid Token" : "Neispravan token",
+    "No file was uploaded. Unknown error" : "Nijedan fajl nije otpremljen. Nepoznata greška",
+    "There is no error, the file uploaded with success" : "Nema greške, fajl je uspešno otpremljen",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Otpremani fajl prevazilazi smernicu upload_max_filesize u fajlu php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Otpremani fajl prevazilazi smernicu MAX_FILE_SIZE koja je navedena u HTML obrascu",
+    "The uploaded file was only partially uploaded" : "Otpremani fajl je samo delimično otpremljen",
+    "No file was uploaded" : "Ništa nije otpremljeno",
     "Missing a temporary folder" : "Nedostaje privremena fascikla",
-    "Failed to write to disk" : "Neuspelo pisanje na disk",
-    "Not enough storage available" : "Nema dovoljno skladišnog prostora na raspolaganju",
-    "Upload failed. Could not find uploaded file" : "Otpremanje nije uspelo. Nije pronađen otpremljeni fajl",
-    "Upload failed. Could not get file info." : "Otpremanje nije uspelo. Nije moguće pronaći informacije o fajlu.",
-    "Invalid directory." : "Neispravan direktorijum",
+    "Failed to write to disk" : "Ne mogu da pišem na disk",
+    "Not enough storage available" : "Nema dovoljno prostora",
+    "Upload failed. Could not find uploaded file" : "Neuspešno otpremanje. Ne mogu da nađem otpremljeni fajl",
+    "Upload failed. Could not get file info." : "Neuspešno otpremanje. Ne mogu da dobijem podatke o fajlu.",
+    "Invalid directory." : "Neispravna fascikla.",
     "Files" : "Fajlovi",
     "All files" : "Svi fajlovi",
     "Favorites" : "Omiljeni",
-    "Home" : "Kuća",
-    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nije moguće otpremiti {filename} zato što je u pitanju direktorijum ili ima 0 bajtova.",
-    "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina fajla {size1} prevazilazi limit za otpremanje {size2}",
-    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nema dovoljno slobodnog prostora, otpremate {size1} ali samo je {size2} preostalo",
-    "Upload cancelled." : "Otpremanje otkazano.",
-    "Could not get result from server." : "Nije bilo moguće dobiti rezultat sa servera.",
-    "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, prekinućete otpremanje.",
+    "Home" : "Početna",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne mogu da otpremim {filename} jer je to direktorijum ili ima 0 bajtova",
+    "Total file size {size1} exceeds upload limit {size2}" : "Veličina {size1} prevazilazi ograničenje za otpremanje od {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nema prostora. Otpremate {size1} ali samo {size2} je preostalo",
+    "Upload cancelled." : "Otpremanje je otkazano.",
+    "Could not get result from server." : "Ne mogu da dobijem rezultat sa servera.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, otkazaćete otpremanje.",
     "{new_name} already exists" : "{new_name} već postoji",
-    "Could not create file" : "Nije bilo moguće kreirati fajl",
-    "Could not create folder" : "Nije bilo moguće kreirati direktorijum",
-    "Rename" : "Preimenij",
+    "Could not create file" : "Ne mogu da stvorim fajl",
+    "Could not create folder" : "Ne mogu da stvorim fasciklu",
+    "Rename" : "Preimenuj",
     "Delete" : "Obriši",
-    "Disconnect storage" : "Nepovezano skladište",
-    "Unshare" : "Ukljoni deljenje",
+    "Disconnect storage" : "Isključi skladište",
+    "Unshare" : "Ne deli",
     "Download" : "Preuzmi",
-    "Select" : "Odaberi",
-    "Pending" : "U toku",
-    "Unable to determine date" : "Nemoguće ustanoviti datum",
+    "Select" : "Izaberi",
+    "Pending" : "Na čekanju",
+    "Unable to determine date" : "Ne mogu da odredim datum",
     "Error moving file." : "Greška pri premeštanju fajla.",
     "Error moving file" : "Greška pri premeštanju fajla",
     "Error" : "Greška",
-    "Could not rename file" : "Nemoguća promena imena fajla",
+    "Could not rename file" : "Ne mogu da preimenujem fajl",
     "Error deleting file." : "Greška pri brisanju fajla.",
-    "No entries in this folder match '{filter}'" : "Nijedan unos u ovom direktorijumu se ne poklapa sa '{filter}'",
-    "Name" : "Ime",
+    "No entries in this folder match '{filter}'" : "U ovoj fascikli ništa se ne poklapa sa '{filter}'",
+    "Name" : "Naziv",
     "Size" : "Veličina",
-    "Modified" : "Zadnja izmena",
-    "_%n folder_::_%n folders_" : ["%n direktorijum","%n direktorijuma","%n direktorijuma"],
-    "_%n file_::_%n files_" : ["%n fajl","%n fajlova","%n fajlova"],
-    "You don’t have permission to upload or create files here" : "Nemate dozvolu da otpremate ili kreirate fajlove ovde",
-    "_Uploading %n file_::_Uploading %n files_" : ["Otpremam %n fajl","Otpremam %n fajlova","Otpremam %n fajlova"],
-    "\"{name}\" is an invalid file name." : "\"{name}\" je neispravno ime fajla.",
-    "File name cannot be empty." : "Ime fajla ne može biti prazno.",
-    "Your storage is full, files can not be updated or synced anymore!" : "Vaše skladište je puno, fajlovi se ne mogu više otpremati ili sinhronizovati.",
+    "Modified" : "Izmenjen",
+    "_%n folder_::_%n folders_" : ["%n fascikla","%n fascikle","%n fascikli"],
+    "_%n file_::_%n files_" : ["%n fajl","%n fajla","%n fajlova"],
+    "You don’t have permission to upload or create files here" : "Nemate dozvole da ovde otpremate ili stvarate fajlove",
+    "_Uploading %n file_::_Uploading %n files_" : ["Otpremam %n fajl","Otpremam %n fajla","Otpremam %n fajlova"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" nije ispravan naziv fajla.",
+    "File name cannot be empty." : "Naziv fajla ne može biti prazan.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Vaše skladište je puno. Fajlovi više ne mogu biti ažurirani ni sinhronizovani!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaše skladište je skoro puno ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za Aplikaciju za šifrovanje. Molimo da osvežite vašu lozinku privatnog ključa u ličnim podešavanjima kako bi dobili pristup šifrovanim fajlovima.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrovanje je isključeno, ali Vaši fajlovi su i dalje šifrovani. Molimo Vas da odete u lična podešavanja da dešifrujete svoje fajlove.",
-    "_matches '{filter}'_::_match '{filter}'_" : ["poklapa se sa '{filter}'","poklapaju se sa '{filter}'","poklapaju se sa '{filter}'"],
+    "_matches '{filter}'_::_match '{filter}'_" : ["se poklapa sa '{filter}'","se poklapaju sa '{filter}'","se poklapa sa '{filter}'"],
     "{dirs} and {files}" : "{dirs} i {files}",
-    "Favorited" : "Omiljeni",
-    "Favorite" : "Omiljen",
-    "A new file or folder has been <strong>created</strong>" : "Novi fajl ili direktorijum je <strong>kreiran</strong>",
-    "A file or folder has been <strong>changed</strong>" : "Faj ili direktorijum je <strong>promenjen</strong>",
-    "A file or folder has been <strong>deleted</strong>" : "Fajl ili direktorijum je <strong>uklonjen</strong>",
-    "A file or folder has been <strong>restored</strong>" : "Fajl ili direktorijum je <strong>povraćen</strong>",
-    "You created %1$s" : "Kreirali ste %1$s",
-    "%2$s created %1$s" : "%2$s je kreirao %1$s",
-    "%1$s was created in a public folder" : "%1$s je kreiran u javnom direktorijumu",
+    "Favorited" : "Omiljeno",
+    "Favorite" : "Omiljeni",
+    "An error occurred while trying to update the tags" : "Došlo je do greške pri pokušaju ažuriranja oznaka",
+    "A new file or folder has been <strong>created</strong>" : "Novi fajl ili fascikla su <strong>napravljeni</strong>",
+    "A file or folder has been <strong>changed</strong>" : "Fajl ili fascikla su <strong>izmenjeni</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Ograniči obaveštenja o stvaranju i izmenama na <strong>omiljene fajlove</strong> <em>(samo u zapisniku)</em>",
+    "A file or folder has been <strong>deleted</strong>" : "Fajl ili fascikla su <strong>obrisani</strong>",
+    "A file or folder has been <strong>restored</strong>" : "Fajl ili fascikla su <strong>vraćeni</strong>",
+    "You created %1$s" : "Napravili ste %1$s",
+    "%2$s created %1$s" : "%2$s napravi %1$s",
+    "%1$s was created in a public folder" : "%1$s je napravljen u javnoj fascikli",
     "You changed %1$s" : "Izmenili ste %1$s",
-    "%2$s changed %1$s" : "%2$s je izmenio %1$s",
+    "%2$s changed %1$s" : "%2$s izmeni %1$s",
     "You deleted %1$s" : "Obrisali ste %1$s",
-    "%2$s deleted %1$s" : "%2$s je obrisao %1$s",
-    "You restored %1$s" : "Povratili ste %1$s",
-    "%2$s restored %1$s" : "%2$s je povratio %1$s",
-    "%s could not be renamed as it has been deleted" : "%s nije mogao biti preimenovan jer je obrisan.",
-    "%s could not be renamed" : "%s nije mogao biti preimenovan",
-    "Upload (max. %s)" : "Otpremanje  (maksimalno %s)",
-    "File handling" : "Upravljanje fajlovima",
-    "Maximum upload size" : "Maksimalna veličina pošiljke",
+    "%2$s deleted %1$s" : "%2$s obrisa %1$s",
+    "You restored %1$s" : "Vratili ste %1$s",
+    "%2$s restored %1$s" : "%2$s povrati %1$s",
+    "%s could not be renamed as it has been deleted" : "%s se ne može preimenovati jer je obrisan",
+    "%s could not be renamed" : "%s se ne može preimenovati",
+    "Upload (max. %s)" : "Otpremanje (maks. %s)",
+    "File handling" : "Rukovanje fajlovima",
+    "Maximum upload size" : "Najveća veličina otpremanja",
     "max. possible: " : "najviše moguće:",
-    "Save" : "Snimi",
-    "Settings" : "Podešavanja",
+    "Save" : "Sačuvaj",
+    "Can not be edited from here due to insufficient permissions." : "Ne može da se menja odavde zbog nedostatka dozvola.",
+    "Settings" : "Postavke",
     "WebDAV" : "WebDAV",
-    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Upotrebite ovu adresu da <a href=\"%s\" target=\"_blank\">pristupite svojim fajlovima putem WebDAV-a</a>",
-    "New" : "Novi",
-    "New text file" : "Novi tekstualni fajl",
-    "Text file" : "Tekstualni fajl",
-    "New folder" : "Novi direktorijum",
-    "Folder" : "Direktorijum",
-    "Upload" : "Pošalji",
+    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Koristite ovu adresu da <a href=\"%s\" target=\"_blank\"> pristupite fajlovima preko WebDAV-a</a>",
+    "New" : "Novo",
+    "New text file" : "Nov tekstualni fajl",
+    "Text file" : "tekstualni fajl",
+    "New folder" : "Nova fascikla",
+    "Folder" : "fascikla",
+    "Upload" : "Otpremi",
     "Cancel upload" : "Otkaži otpremanje",
-    "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa svojim uređajima!",
-    "No entries found in this folder" : "Nema pronađenih unosa u ovom direktorijumu",
-    "Select all" : "Odaberi sve",
-    "Upload too large" : "Pošiljka je prevelika",
-    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru.",
-    "Files are being scanned, please wait." : "Fajlovi se skeniraju, molimo sačekajte.",
+    "No files in here" : "Ovde nema fajlova",
+    "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa vašim uređajima!",
+    "No entries found in this folder" : "Nema ničega u ovoj fascikli",
+    "Select all" : "Označi sve",
+    "Upload too large" : "Otpremanje je preveliko",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da otpremite prevazilaze ograničenje otpremanja na ovom serveru.",
+    "Files are being scanned, please wait." : "Skeniram fajlove, sačekajte.",
     "Currently scanning" : "Trenutno skeniram",
     "No favorites" : "Nema omiljenih",
-    "Files and folders you mark as favorite will show up here" : "Fajlovi i direktorijumi koje ste obeležili kao omiljene će biti prikazani ovde"
+    "Files and folders you mark as favorite will show up here" : "Fajlovi i fascikle koje obeležite kao omiljene pojaviće se ovde"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/sv.js b/apps/files/l10n/sv.js
index 4bf977e1e77..9af440dcbce 100644
--- a/apps/files/l10n/sv.js
+++ b/apps/files/l10n/sv.js
@@ -62,9 +62,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Filnamn kan inte vara tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ogiltig privat nyckel i krypteringsprogrammet. Vänligen uppdatera lösenordet till din privata nyckel under dina personliga inställningar för att återfå tillgång till dina krypterade filer.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer.",
     "{dirs} and {files}" : "{dirs} och {files}",
     "Favorited" : "Favoritiserad",
     "Favorite" : "Favorit",
diff --git a/apps/files/l10n/sv.json b/apps/files/l10n/sv.json
index 95a1978a0a5..0da4cbe5f50 100644
--- a/apps/files/l10n/sv.json
+++ b/apps/files/l10n/sv.json
@@ -60,9 +60,6 @@
     "File name cannot be empty." : "Filnamn kan inte vara tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ogiltig privat nyckel i krypteringsprogrammet. Vänligen uppdatera lösenordet till din privata nyckel under dina personliga inställningar för att återfå tillgång till dina krypterade filer.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer.",
     "{dirs} and {files}" : "{dirs} och {files}",
     "Favorited" : "Favoritiserad",
     "Favorite" : "Favorit",
diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js
index add6d671a84..5e42cf4c6ae 100644
--- a/apps/files/l10n/tr.js
+++ b/apps/files/l10n/tr.js
@@ -55,7 +55,7 @@ OC.L10N.register(
     "Name" : "İsim",
     "Size" : "Boyut",
     "Modified" : "Değiştirilme",
-    "_%n folder_::_%n folders_" : ["%n dizin","%n dizin"],
+    "_%n folder_::_%n folders_" : ["%n klasör","%n klasör"],
     "_%n file_::_%n files_" : ["%n dosya","%n dosya"],
     "You don’t have permission to upload or create files here" : "Buraya dosya yükleme veya oluşturma izniniz yok",
     "_Uploading %n file_::_Uploading %n files_" : ["%n dosya yükleniyor","%n dosya yükleniyor"],
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Dosya adı boş olamaz.",
     "Your storage is full, files can not be updated or synced anymore!" : "Depolama alanınız dolu, artık dosyalar güncellenmeyecek veya eşitlenmeyecek.",
     "Your storage is almost full ({usedSpacePercent}%)" : "Depolama alanınız neredeyse dolu (%{usedSpacePercent})",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifreleme Uygulaması için geçersiz özel anahtar. Lütfen şifreli dosyalarınıza erişimi tekrar kazanabilmek için kişisel ayarlarınızdan özel anahtar parolanızı güncelleyin.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Şifreleme işlemi durduruldu ancak dosyalarınız hala şifreli. Dosyalarınızın şifrelemesini kaldırmak için lütfen kişisel ayarlar kısmına geçin.",
     "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}' ile eşleşiyor","'{filter}' ile eşleşiyor"],
     "{dirs} and {files}" : "{dirs} ve {files}",
     "Favorited" : "Sık kullanılanlara eklendi",
@@ -73,6 +70,7 @@ OC.L10N.register(
     "An error occurred while trying to update the tags" : "Etiketler güncellenmeye çalışılırken bir hata oluştu",
     "A new file or folder has been <strong>created</strong>" : "Yeni bir dosya veya klasör <strong>oluşturuldu</strong>",
     "A file or folder has been <strong>changed</strong>" : "Bir dosya veya klasör <strong>değiştirildi</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "<strong>Favori dosyalarınızın</strong> <em>(Sadece akış olanların)</em> oluşturulması ve değiştirilmesi hakkında ki bildirimleri sınırla",
     "A file or folder has been <strong>deleted</strong>" : "Bir dosya veya klasör <strong>silindi</strong>",
     "A file or folder has been <strong>restored</strong>" : "Bir dosya veya klasör <strong>geri alındı</strong>",
     "You created %1$s" : "%1$s dosyasını oluşturdunuz",
diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json
index 9f16990140f..34a26f72389 100644
--- a/apps/files/l10n/tr.json
+++ b/apps/files/l10n/tr.json
@@ -53,7 +53,7 @@
     "Name" : "İsim",
     "Size" : "Boyut",
     "Modified" : "Değiştirilme",
-    "_%n folder_::_%n folders_" : ["%n dizin","%n dizin"],
+    "_%n folder_::_%n folders_" : ["%n klasör","%n klasör"],
     "_%n file_::_%n files_" : ["%n dosya","%n dosya"],
     "You don’t have permission to upload or create files here" : "Buraya dosya yükleme veya oluşturma izniniz yok",
     "_Uploading %n file_::_Uploading %n files_" : ["%n dosya yükleniyor","%n dosya yükleniyor"],
@@ -61,9 +61,6 @@
     "File name cannot be empty." : "Dosya adı boş olamaz.",
     "Your storage is full, files can not be updated or synced anymore!" : "Depolama alanınız dolu, artık dosyalar güncellenmeyecek veya eşitlenmeyecek.",
     "Your storage is almost full ({usedSpacePercent}%)" : "Depolama alanınız neredeyse dolu (%{usedSpacePercent})",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifreleme Uygulaması için geçersiz özel anahtar. Lütfen şifreli dosyalarınıza erişimi tekrar kazanabilmek için kişisel ayarlarınızdan özel anahtar parolanızı güncelleyin.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Şifreleme işlemi durduruldu ancak dosyalarınız hala şifreli. Dosyalarınızın şifrelemesini kaldırmak için lütfen kişisel ayarlar kısmına geçin.",
     "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}' ile eşleşiyor","'{filter}' ile eşleşiyor"],
     "{dirs} and {files}" : "{dirs} ve {files}",
     "Favorited" : "Sık kullanılanlara eklendi",
@@ -71,6 +68,7 @@
     "An error occurred while trying to update the tags" : "Etiketler güncellenmeye çalışılırken bir hata oluştu",
     "A new file or folder has been <strong>created</strong>" : "Yeni bir dosya veya klasör <strong>oluşturuldu</strong>",
     "A file or folder has been <strong>changed</strong>" : "Bir dosya veya klasör <strong>değiştirildi</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "<strong>Favori dosyalarınızın</strong> <em>(Sadece akış olanların)</em> oluşturulması ve değiştirilmesi hakkında ki bildirimleri sınırla",
     "A file or folder has been <strong>deleted</strong>" : "Bir dosya veya klasör <strong>silindi</strong>",
     "A file or folder has been <strong>restored</strong>" : "Bir dosya veya klasör <strong>geri alındı</strong>",
     "You created %1$s" : "%1$s dosyasını oluşturdunuz",
diff --git a/apps/files/l10n/uk.js b/apps/files/l10n/uk.js
index a72e4ce3972..ee509490a6c 100644
--- a/apps/files/l10n/uk.js
+++ b/apps/files/l10n/uk.js
@@ -63,9 +63,6 @@ OC.L10N.register(
     "File name cannot be empty." : " Ім'я файлу не може бути порожнім.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ваше сховище майже повне ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Шифрування було вимкнено, але ваші файли все ще зашифровано. Для розшифрування перейдіть до персональних налаштувань.",
     "_matches '{filter}'_::_match '{filter}'_" : ["знайдено '{filter}'","знайдено '{filter}'","знайдено '{filter}'"],
     "{dirs} and {files}" : "{dirs} і {files}",
     "Favorited" : "Улюблений",
diff --git a/apps/files/l10n/uk.json b/apps/files/l10n/uk.json
index e104cbbd721..fde1b788506 100644
--- a/apps/files/l10n/uk.json
+++ b/apps/files/l10n/uk.json
@@ -61,9 +61,6 @@
     "File name cannot be empty." : " Ім'я файлу не може бути порожнім.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ваше сховище майже повне ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Шифрування було вимкнено, але ваші файли все ще зашифровано. Для розшифрування перейдіть до персональних налаштувань.",
     "_matches '{filter}'_::_match '{filter}'_" : ["знайдено '{filter}'","знайдено '{filter}'","знайдено '{filter}'"],
     "{dirs} and {files}" : "{dirs} і {files}",
     "Favorited" : "Улюблений",
diff --git a/apps/files/l10n/vi.js b/apps/files/l10n/vi.js
index df4d2e7a1ca..d0fda488921 100644
--- a/apps/files/l10n/vi.js
+++ b/apps/files/l10n/vi.js
@@ -51,8 +51,6 @@ OC.L10N.register(
     "File name cannot be empty." : "Tên file không được rỗng",
     "Your storage is full, files can not be updated or synced anymore!" : "Your storage is full, files can not be updated or synced anymore!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Your storage is almost full ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Mã hóa đã bị vô hiệu nhưng những tập tin của bạn vẫn được mã hóa. Vui lòng vào phần thiết lập cá nhân để giải mã chúng.",
     "{dirs} and {files}" : "{dirs} và {files}",
     "Favorite" : "Ưu thích",
     "%s could not be renamed" : "%s không thể đổi tên",
diff --git a/apps/files/l10n/vi.json b/apps/files/l10n/vi.json
index eee5928ab63..e6581323d89 100644
--- a/apps/files/l10n/vi.json
+++ b/apps/files/l10n/vi.json
@@ -49,8 +49,6 @@
     "File name cannot be empty." : "Tên file không được rỗng",
     "Your storage is full, files can not be updated or synced anymore!" : "Your storage is full, files can not be updated or synced anymore!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Your storage is almost full ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Mã hóa đã bị vô hiệu nhưng những tập tin của bạn vẫn được mã hóa. Vui lòng vào phần thiết lập cá nhân để giải mã chúng.",
     "{dirs} and {files}" : "{dirs} và {files}",
     "Favorite" : "Ưu thích",
     "%s could not be renamed" : "%s không thể đổi tên",
diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js
index 40f1a591dda..66b638df86f 100644
--- a/apps/files/l10n/zh_CN.js
+++ b/apps/files/l10n/zh_CN.js
@@ -62,9 +62,6 @@ OC.L10N.register(
     "File name cannot be empty." : "文件名不能为空。",
     "Your storage is full, files can not be updated or synced anymore!" : "您的存储空间已满，文件将无法更新或同步！",
     "Your storage is almost full ({usedSpacePercent}%)" : "您的存储空间即将用完 ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "加密是被禁用的，但是您的文件还是被加密了。请到您的个人配置里设置文件加密选项。",
     "{dirs} and {files}" : "{dirs} 和 {files}",
     "Favorited" : "已收藏",
     "Favorite" : "收藏",
diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json
index e2e62b93959..eb27d81060d 100644
--- a/apps/files/l10n/zh_CN.json
+++ b/apps/files/l10n/zh_CN.json
@@ -60,9 +60,6 @@
     "File name cannot be empty." : "文件名不能为空。",
     "Your storage is full, files can not be updated or synced anymore!" : "您的存储空间已满，文件将无法更新或同步！",
     "Your storage is almost full ({usedSpacePercent}%)" : "您的存储空间即将用完 ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "加密是被禁用的，但是您的文件还是被加密了。请到您的个人配置里设置文件加密选项。",
     "{dirs} and {files}" : "{dirs} 和 {files}",
     "Favorited" : "已收藏",
     "Favorite" : "收藏",
diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js
index 4360aeaa9f2..194020ef9b7 100644
--- a/apps/files/l10n/zh_TW.js
+++ b/apps/files/l10n/zh_TW.js
@@ -61,9 +61,6 @@ OC.L10N.register(
     "File name cannot be empty." : "檔名不能為空",
     "Your storage is full, files can not be updated or synced anymore!" : "您的儲存空間已滿，沒有辦法再更新或是同步檔案！",
     "Your storage is almost full ({usedSpacePercent}%)" : "您的儲存空間快要滿了 ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的檔案加密私鑰，請在個人設定中更新您的私鑰密語以存取加密的檔案。",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "加密已經被停用，但是您的舊檔案還是處於已加密的狀態，請前往個人設定以解密這些檔案。",
     "{dirs} and {files}" : "{dirs} 和 {files}",
     "Favorite" : "我的最愛",
     "A new file or folder has been <strong>created</strong>" : "新的檔案或目錄已被 <strong>建立</strong>",
diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json
index d5bc48c0030..1a0b187498a 100644
--- a/apps/files/l10n/zh_TW.json
+++ b/apps/files/l10n/zh_TW.json
@@ -59,9 +59,6 @@
     "File name cannot be empty." : "檔名不能為空",
     "Your storage is full, files can not be updated or synced anymore!" : "您的儲存空間已滿，沒有辦法再更新或是同步檔案！",
     "Your storage is almost full ({usedSpacePercent}%)" : "您的儲存空間快要滿了 ({usedSpacePercent}%)",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的檔案加密私鑰，請在個人設定中更新您的私鑰密語以存取加密的檔案。",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "加密已經被停用，但是您的舊檔案還是處於已加密的狀態，請前往個人設定以解密這些檔案。",
     "{dirs} and {files}" : "{dirs} 和 {files}",
     "Favorite" : "我的最愛",
     "A new file or folder has been <strong>created</strong>" : "新的檔案或目錄已被 <strong>建立</strong>",
diff --git a/apps/files_external/l10n/ca.js b/apps/files_external/l10n/ca.js
index c3778c50aa0..56f6be8f28d 100644
--- a/apps/files_external/l10n/ca.js
+++ b/apps/files_external/l10n/ca.js
@@ -44,6 +44,9 @@ OC.L10N.register(
     "URL" : "URL",
     "Secure https://" : "Protocol segur https://",
     "Public key" : "Clau pública",
+    "Storage with id \"%i\" not found" : "No s'ha trobat emmagatzematge amb id \"%i\"",
+    "Invalid mount point" : "Punt de muntatge no vàlid",
+    "Invalid storage backend \"%s\"" : "Motor d'emmagatzematge no vàlid \"%s\"",
     "Access granted" : "S'ha concedit l'accés",
     "Error configuring Dropbox storage" : "Error en configurar l'emmagatzemament Dropbox",
     "Grant access" : "Concedeix accés",
@@ -61,6 +64,7 @@ OC.L10N.register(
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> %s no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
     "No external storage configured" : "Sense emmagatzematge extern configurat",
+    "You can add external storages in the personal settings" : "Pot agregar emmagatzematges externs en la configuració personal",
     "Name" : "Nom",
     "Storage type" : "Tipus d'emmagatzemament",
     "Scope" : "Abast",
@@ -69,6 +73,7 @@ OC.L10N.register(
     "Configuration" : "Configuració",
     "Available for" : "Disponible per",
     "Add storage" : "Afegeix emmagatzemament",
+    "Advanced settings" : "Configuració avançada",
     "Delete" : "Esborra",
     "Enable User External Storage" : "Habilita l'emmagatzemament extern d'usuari",
     "Allow users to mount the following external storage" : "Permet als usuaris muntar els dispositius externs següents"
diff --git a/apps/files_external/l10n/ca.json b/apps/files_external/l10n/ca.json
index dec76952d47..0bc21eb324b 100644
--- a/apps/files_external/l10n/ca.json
+++ b/apps/files_external/l10n/ca.json
@@ -42,6 +42,9 @@
     "URL" : "URL",
     "Secure https://" : "Protocol segur https://",
     "Public key" : "Clau pública",
+    "Storage with id \"%i\" not found" : "No s'ha trobat emmagatzematge amb id \"%i\"",
+    "Invalid mount point" : "Punt de muntatge no vàlid",
+    "Invalid storage backend \"%s\"" : "Motor d'emmagatzematge no vàlid \"%s\"",
     "Access granted" : "S'ha concedit l'accés",
     "Error configuring Dropbox storage" : "Error en configurar l'emmagatzemament Dropbox",
     "Grant access" : "Concedeix accés",
@@ -59,6 +62,7 @@
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> %s no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
     "No external storage configured" : "Sense emmagatzematge extern configurat",
+    "You can add external storages in the personal settings" : "Pot agregar emmagatzematges externs en la configuració personal",
     "Name" : "Nom",
     "Storage type" : "Tipus d'emmagatzemament",
     "Scope" : "Abast",
@@ -67,6 +71,7 @@
     "Configuration" : "Configuració",
     "Available for" : "Disponible per",
     "Add storage" : "Afegeix emmagatzemament",
+    "Advanced settings" : "Configuració avançada",
     "Delete" : "Esborra",
     "Enable User External Storage" : "Habilita l'emmagatzemament extern d'usuari",
     "Allow users to mount the following external storage" : "Permet als usuaris muntar els dispositius externs següents"
diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js
index 06a28afae1e..005af34371c 100644
--- a/apps/files_external/l10n/de.js
+++ b/apps/files_external/l10n/de.js
@@ -45,7 +45,7 @@ OC.L10N.register(
     "Secure https://" : "Sicherer HTTPS://",
     "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
-    "Invalid mount point" : "Ungültiger Einhängepunkt",
+    "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
     "Access granted" : "Zugriff gestattet",
     "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json
index 4f9376930b7..f655b00fe59 100644
--- a/apps/files_external/l10n/de.json
+++ b/apps/files_external/l10n/de.json
@@ -43,7 +43,7 @@
     "Secure https://" : "Sicherer HTTPS://",
     "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
-    "Invalid mount point" : "Ungültiger Einhängepunkt",
+    "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
     "Access granted" : "Zugriff gestattet",
     "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js
index 9cc7b4d283e..4bdbc88cfd5 100644
--- a/apps/files_external/l10n/de_DE.js
+++ b/apps/files_external/l10n/de_DE.js
@@ -26,7 +26,7 @@ OC.L10N.register(
     "Host" : "Host",
     "Username" : "Benutzername",
     "Password" : "Passwort",
-    "Remote subfolder" : "Entfernter Unterordner:",
+    "Remote subfolder" : "Remote Subfolder",
     "Secure ftps://" : "Sicheres ftps://",
     "Client ID" : "Client-ID",
     "Client secret" : "Geheime Zeichenkette des Client",
@@ -38,14 +38,14 @@ OC.L10N.register(
     "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
     "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
     "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-    "Share" : "Teilen",
+    "Share" : "Share",
     "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
     "Username as share" : "Benutzername als Freigabe",
     "URL" : "Adresse",
     "Secure https://" : "Sicheres https://",
     "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
-    "Invalid mount point" : "Ungültiger Einhängepunkt",
+    "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
     "Access granted" : "Zugriff gestattet",
     "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json
index 4c9d2cae523..b6c95f3983e 100644
--- a/apps/files_external/l10n/de_DE.json
+++ b/apps/files_external/l10n/de_DE.json
@@ -24,7 +24,7 @@
     "Host" : "Host",
     "Username" : "Benutzername",
     "Password" : "Passwort",
-    "Remote subfolder" : "Entfernter Unterordner:",
+    "Remote subfolder" : "Remote Subfolder",
     "Secure ftps://" : "Sicheres ftps://",
     "Client ID" : "Client-ID",
     "Client secret" : "Geheime Zeichenkette des Client",
@@ -36,14 +36,14 @@
     "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
     "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
     "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-    "Share" : "Teilen",
+    "Share" : "Share",
     "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
     "Username as share" : "Benutzername als Freigabe",
     "URL" : "Adresse",
     "Secure https://" : "Sicheres https://",
     "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
-    "Invalid mount point" : "Ungültiger Einhängepunkt",
+    "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
     "Access granted" : "Zugriff gestattet",
     "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
diff --git a/apps/files_sharing/l10n/ca.js b/apps/files_sharing/l10n/ca.js
index c722183f4ea..cf9aff4c2fe 100644
--- a/apps/files_sharing/l10n/ca.js
+++ b/apps/files_sharing/l10n/ca.js
@@ -24,6 +24,7 @@ OC.L10N.register(
     "This share is password-protected" : "Aquest compartit està protegit amb contrasenya",
     "The password is wrong. Try again." : "la contrasenya és incorrecta. Intenteu-ho de nou.",
     "Password" : "Contrasenya",
+    "No entries found in this folder" : "No hi ha entrades en aquesta carpeta",
     "Name" : "Nom",
     "Share time" : "Temps de compartició",
     "Sorry, this link doesn’t seem to work anymore." : "Aquest enllaç sembla que no funciona.",
diff --git a/apps/files_sharing/l10n/ca.json b/apps/files_sharing/l10n/ca.json
index 33a1d77c090..68112765278 100644
--- a/apps/files_sharing/l10n/ca.json
+++ b/apps/files_sharing/l10n/ca.json
@@ -22,6 +22,7 @@
     "This share is password-protected" : "Aquest compartit està protegit amb contrasenya",
     "The password is wrong. Try again." : "la contrasenya és incorrecta. Intenteu-ho de nou.",
     "Password" : "Contrasenya",
+    "No entries found in this folder" : "No hi ha entrades en aquesta carpeta",
     "Name" : "Nom",
     "Share time" : "Temps de compartició",
     "Sorry, this link doesn’t seem to work anymore." : "Aquest enllaç sembla que no funciona.",
diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js
index f9df11e4c53..d6bd498ce52 100644
--- a/apps/files_sharing/l10n/cs_CZ.js
+++ b/apps/files_sharing/l10n/cs_CZ.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Download %s" : "Stáhnout %s",
     "Direct link" : "Přímý odkaz",
     "Federated Cloud Sharing" : "Propojené cloudové sdílení",
+    "Open documentation" : "Otevřít dokumentaci",
     "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery",
     "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů"
 },
diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json
index 23228d94bb9..be42df94b7b 100644
--- a/apps/files_sharing/l10n/cs_CZ.json
+++ b/apps/files_sharing/l10n/cs_CZ.json
@@ -54,6 +54,7 @@
     "Download %s" : "Stáhnout %s",
     "Direct link" : "Přímý odkaz",
     "Federated Cloud Sharing" : "Propojené cloudové sdílení",
+    "Open documentation" : "Otevřít dokumentaci",
     "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery",
     "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js
index cfedb6eae54..89b8e980372 100644
--- a/apps/files_sharing/l10n/da.js
+++ b/apps/files_sharing/l10n/da.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Download %s" : "Hent %s",
     "Direct link" : "Direkte link",
     "Federated Cloud Sharing" : "Sammensluttet Cloud deling",
+    "Open documentation" : "Åben dokumentation",
     "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere",
     "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere"
 },
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
index 88151116fdc..158d782b729 100644
--- a/apps/files_sharing/l10n/da.json
+++ b/apps/files_sharing/l10n/da.json
@@ -54,6 +54,7 @@
     "Download %s" : "Hent %s",
     "Direct link" : "Direkte link",
     "Federated Cloud Sharing" : "Sammensluttet Cloud deling",
+    "Open documentation" : "Åben dokumentation",
     "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere",
     "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index 3d07c149b93..8022b53bc97 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Download %s" : "Download %s",
     "Direct link" : "Direkter Link",
     "Federated Cloud Sharing" : "Federated-Cloud-Sharing",
+    "Open documentation" : "Offene Dokumentation",
     "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
     "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
 },
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index 9dd6fe31d9b..4bc9eaee223 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -54,6 +54,7 @@
     "Download %s" : "Download %s",
     "Direct link" : "Direkter Link",
     "Federated Cloud Sharing" : "Federated-Cloud-Sharing",
+    "Open documentation" : "Offene Dokumentation",
     "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
     "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
index 7079a70f4b5..c95941de665 100644
--- a/apps/files_sharing/l10n/de_DE.js
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Download %s" : "Download %s",
     "Direct link" : "Direkte Verlinkung",
     "Federated Cloud Sharing" : "Federated-Cloud-Sharing",
+    "Open documentation" : "Offene Dokumentation",
     "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
     "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
 },
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
index 35ab01aac7f..75d99afb019 100644
--- a/apps/files_sharing/l10n/de_DE.json
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -54,6 +54,7 @@
     "Download %s" : "Download %s",
     "Direct link" : "Direkte Verlinkung",
     "Federated Cloud Sharing" : "Federated-Cloud-Sharing",
+    "Open documentation" : "Offene Dokumentation",
     "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
     "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index 99f1eb27907..293641b8a08 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Download %s" : "Λήψη %s",
     "Direct link" : "Άμεσος σύνδεσμος",
     "Federated Cloud Sharing" : "Διαμοιρασμός σε ομόσπονδα σύννεφα ",
+    "Open documentation" : "Ανοιχτή τεκμηρίωση.",
     "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές",
     "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές"
 },
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index ce0a94bd39d..702ef8fc650 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -54,6 +54,7 @@
     "Download %s" : "Λήψη %s",
     "Direct link" : "Άμεσος σύνδεσμος",
     "Federated Cloud Sharing" : "Διαμοιρασμός σε ομόσπονδα σύννεφα ",
+    "Open documentation" : "Ανοιχτή τεκμηρίωση.",
     "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές",
     "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
index de390cb48e4..951ca5338c3 100644
--- a/apps/files_sharing/l10n/fi_FI.js
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Download %s" : "Lataa %s",
     "Direct link" : "Suora linkki",
     "Federated Cloud Sharing" : "Federoitu pilvijakaminen",
+    "Open documentation" : "Avaa dokumentaatio",
     "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille",
     "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta"
 },
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
index 7cf98b9ae6a..f2ae2c47418 100644
--- a/apps/files_sharing/l10n/fi_FI.json
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -54,6 +54,7 @@
     "Download %s" : "Lataa %s",
     "Direct link" : "Suora linkki",
     "Federated Cloud Sharing" : "Federoitu pilvijakaminen",
+    "Open documentation" : "Avaa dokumentaatio",
     "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille",
     "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js
index 8609377e8d7..6198fd4365c 100644
--- a/apps/files_sharing/l10n/gl.js
+++ b/apps/files_sharing/l10n/gl.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Download %s" : "Descargar %s",
     "Direct link" : "Ligazón directa",
     "Federated Cloud Sharing" : "Compartición de nube federada",
+    "Open documentation" : "Abrir a documentación",
     "Allow users on this server to send shares to other servers" : "Permitir aos usuarios deste servidor enviar comparticións a outros servidores",
     "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores"
 },
diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json
index 70fafc24346..6bb428cb372 100644
--- a/apps/files_sharing/l10n/gl.json
+++ b/apps/files_sharing/l10n/gl.json
@@ -54,6 +54,7 @@
     "Download %s" : "Descargar %s",
     "Direct link" : "Ligazón directa",
     "Federated Cloud Sharing" : "Compartición de nube federada",
+    "Open documentation" : "Abrir a documentación",
     "Allow users on this server to send shares to other servers" : "Permitir aos usuarios deste servidor enviar comparticións a outros servidores",
     "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index e8775f3fcb0..720902b8764 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Download %s" : "Scarica %s",
     "Direct link" : "Collegamento diretto",
     "Federated Cloud Sharing" : "Condivisione cloud federata",
+    "Open documentation" : "Apri la documentazione",
     "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server",
     "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server"
 },
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index e9dc74a379f..a2e73bd8949 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -54,6 +54,7 @@
     "Download %s" : "Scarica %s",
     "Direct link" : "Collegamento diretto",
     "Federated Cloud Sharing" : "Condivisione cloud federata",
+    "Open documentation" : "Apri la documentazione",
     "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server",
     "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js
index 37799f5a86d..1118713257b 100644
--- a/apps/files_sharing/l10n/ja.js
+++ b/apps/files_sharing/l10n/ja.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Download %s" : "%s をダウンロード",
     "Direct link" : "リンク",
     "Federated Cloud Sharing" : "統合されたクラウド共有",
+    "Open documentation" : "ドキュメントを開く",
     "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する",
     "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する"
 },
diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json
index de42c09bbcd..960cc59e0ed 100644
--- a/apps/files_sharing/l10n/ja.json
+++ b/apps/files_sharing/l10n/ja.json
@@ -54,6 +54,7 @@
     "Download %s" : "%s をダウンロード",
     "Direct link" : "リンク",
     "Federated Cloud Sharing" : "統合されたクラウド共有",
+    "Open documentation" : "ドキュメントを開く",
     "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する",
     "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index b50c5c94180..73e0ef6a802 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Download %s" : "Download %s",
     "Direct link" : "Directe link",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
+    "Open documentation" : "Open documentatie",
     "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers",
     "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers"
 },
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index d35a97146e3..30446fbb20b 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -54,6 +54,7 @@
     "Download %s" : "Download %s",
     "Direct link" : "Directe link",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
+    "Open documentation" : "Open documentatie",
     "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers",
     "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index 2bc562cc8ac..ece7742d2ce 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Download %s" : "Baixar %s",
     "Direct link" : "Link direto",
     "Federated Cloud Sharing" : "Núvem de Compartilhamento Federada",
+    "Open documentation" : "Abrir documentação",
     "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores",
     "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores"
 },
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index e9399118cf2..b2c4db8007f 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -54,6 +54,7 @@
     "Download %s" : "Baixar %s",
     "Direct link" : "Link direto",
     "Federated Cloud Sharing" : "Núvem de Compartilhamento Federada",
+    "Open documentation" : "Abrir documentação",
     "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores",
     "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js
index 92d0820aa12..7ba25212c58 100644
--- a/apps/files_sharing/l10n/ru.js
+++ b/apps/files_sharing/l10n/ru.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Download %s" : "Скачать %s",
     "Direct link" : "Прямая ссылка",
     "Federated Cloud Sharing" : "Объединение облачных хранилищ",
+    "Open documentation" : "Открыть документацию",
     "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов",
     "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов"
 },
diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json
index c27c5bcc03a..d735f17d2b5 100644
--- a/apps/files_sharing/l10n/ru.json
+++ b/apps/files_sharing/l10n/ru.json
@@ -54,6 +54,7 @@
     "Download %s" : "Скачать %s",
     "Direct link" : "Прямая ссылка",
     "Federated Cloud Sharing" : "Объединение облачных хранилищ",
+    "Open documentation" : "Открыть документацию",
     "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов",
     "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/files_sharing/l10n/sr.js b/apps/files_sharing/l10n/sr.js
index 4c1562c0c46..a71286a10c3 100644
--- a/apps/files_sharing/l10n/sr.js
+++ b/apps/files_sharing/l10n/sr.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Download %s" : "Преузми %s",
     "Direct link" : "Директна веза",
     "Federated Cloud Sharing" : "Здружено дељење у облаку",
+    "Open documentation" : "Отвори документацију",
     "Allow users on this server to send shares to other servers" : "Дозвољава корисницима овог сервера да шаљу дељења на друге сервере",
     "Allow users on this server to receive shares from other servers" : "Дозвољава корисницима овог сервера да примају дељења са других сервера"
 },
diff --git a/apps/files_sharing/l10n/sr.json b/apps/files_sharing/l10n/sr.json
index 9736b0deabe..711ceade23f 100644
--- a/apps/files_sharing/l10n/sr.json
+++ b/apps/files_sharing/l10n/sr.json
@@ -54,6 +54,7 @@
     "Download %s" : "Преузми %s",
     "Direct link" : "Директна веза",
     "Federated Cloud Sharing" : "Здружено дељење у облаку",
+    "Open documentation" : "Отвори документацију",
     "Allow users on this server to send shares to other servers" : "Дозвољава корисницима овог сервера да шаљу дељења на друге сервере",
     "Allow users on this server to receive shares from other servers" : "Дозвољава корисницима овог сервера да примају дељења са других сервера"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/files_trashbin/l10n/ca.js b/apps/files_trashbin/l10n/ca.js
index 450358c851f..356e525b73c 100644
--- a/apps/files_trashbin/l10n/ca.js
+++ b/apps/files_trashbin/l10n/ca.js
@@ -8,6 +8,10 @@ OC.L10N.register(
     "Delete permanently" : "Esborra permanentment",
     "Error" : "Error",
     "restored" : "restaurat",
+    "No deleted files" : "No hi ha cap arxiu eliminat",
+    "You will be able to recover deleted files from here" : "Des d'aquí es podran recuperar arxius eliminats",
+    "No entries found in this folder" : "No hi ha entrades en aquesta carpeta",
+    "Select all" : "Seleccionar tot",
     "Name" : "Nom",
     "Deleted" : "Eliminat",
     "Delete" : "Esborra"
diff --git a/apps/files_trashbin/l10n/ca.json b/apps/files_trashbin/l10n/ca.json
index eb11197b630..dfdec62d7d1 100644
--- a/apps/files_trashbin/l10n/ca.json
+++ b/apps/files_trashbin/l10n/ca.json
@@ -6,6 +6,10 @@
     "Delete permanently" : "Esborra permanentment",
     "Error" : "Error",
     "restored" : "restaurat",
+    "No deleted files" : "No hi ha cap arxiu eliminat",
+    "You will be able to recover deleted files from here" : "Des d'aquí es podran recuperar arxius eliminats",
+    "No entries found in this folder" : "No hi ha entrades en aquesta carpeta",
+    "Select all" : "Seleccionar tot",
     "Name" : "Nom",
     "Deleted" : "Eliminat",
     "Delete" : "Esborra"
diff --git a/apps/files_trashbin/l10n/sr@latin.js b/apps/files_trashbin/l10n/sr@latin.js
index ab9f86c8d37..24b57789fdb 100644
--- a/apps/files_trashbin/l10n/sr@latin.js
+++ b/apps/files_trashbin/l10n/sr@latin.js
@@ -1,18 +1,18 @@
 OC.L10N.register(
     "files_trashbin",
     {
-    "Couldn't delete %s permanently" : "Nije bilo moguće obrisati %s za stalno",
-    "Couldn't restore %s" : "Nije bilo moguće povratiti %s",
+    "Couldn't delete %s permanently" : "Ne mogu zauvek da obrišem %s",
+    "Couldn't restore %s" : "Ne mogu da vratim %s",
     "Deleted files" : "Obrisani fajlovi",
-    "Restore" : "Povrati",
-    "Delete permanently" : "Obriši za stalno",
+    "Restore" : "Vrati",
+    "Delete permanently" : "Obriši zauvek",
     "Error" : "Greška",
-    "restored" : "povraćeno",
+    "restored" : "vraćeno",
     "No deleted files" : "Nema obrisanih fajlova",
     "You will be able to recover deleted files from here" : "Odavde ćete moći da povratite obrisane fajlove",
-    "No entries found in this folder" : "Nema unosa u ovom direktorijumu",
-    "Select all" : "Odaberi sve",
-    "Name" : "Ime",
+    "No entries found in this folder" : "Nema ničega u ovoj fascikli",
+    "Select all" : "Označi sve",
+    "Name" : "Naziv",
     "Deleted" : "Obrisano",
     "Delete" : "Obriši"
 },
diff --git a/apps/files_trashbin/l10n/sr@latin.json b/apps/files_trashbin/l10n/sr@latin.json
index 8e2d627c3e7..9351affd2a9 100644
--- a/apps/files_trashbin/l10n/sr@latin.json
+++ b/apps/files_trashbin/l10n/sr@latin.json
@@ -1,16 +1,16 @@
 { "translations": {
-    "Couldn't delete %s permanently" : "Nije bilo moguće obrisati %s za stalno",
-    "Couldn't restore %s" : "Nije bilo moguće povratiti %s",
+    "Couldn't delete %s permanently" : "Ne mogu zauvek da obrišem %s",
+    "Couldn't restore %s" : "Ne mogu da vratim %s",
     "Deleted files" : "Obrisani fajlovi",
-    "Restore" : "Povrati",
-    "Delete permanently" : "Obriši za stalno",
+    "Restore" : "Vrati",
+    "Delete permanently" : "Obriši zauvek",
     "Error" : "Greška",
-    "restored" : "povraćeno",
+    "restored" : "vraćeno",
     "No deleted files" : "Nema obrisanih fajlova",
     "You will be able to recover deleted files from here" : "Odavde ćete moći da povratite obrisane fajlove",
-    "No entries found in this folder" : "Nema unosa u ovom direktorijumu",
-    "Select all" : "Odaberi sve",
-    "Name" : "Ime",
+    "No entries found in this folder" : "Nema ničega u ovoj fascikli",
+    "Select all" : "Označi sve",
+    "Name" : "Naziv",
     "Deleted" : "Obrisano",
     "Delete" : "Obriši"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/files_versions/l10n/sr.js b/apps/files_versions/l10n/sr.js
index 5a7bb5fcbf7..09b047a563a 100644
--- a/apps/files_versions/l10n/sr.js
+++ b/apps/files_versions/l10n/sr.js
@@ -3,7 +3,7 @@ OC.L10N.register(
     {
     "Could not revert: %s" : "Не могу да вратим: %s",
     "Versions" : "Верзије",
-    "Failed to revert {file} to revision {timestamp}." : "Не могу давратим {file} на ревизију {timestamp}.",
+    "Failed to revert {file} to revision {timestamp}." : "Не могу да вратим {file} на ревизију {timestamp}.",
     "More versions..." : "Још верзија...",
     "No other versions available" : "Нема других верзија",
     "Restore" : "Врати"
diff --git a/apps/files_versions/l10n/sr.json b/apps/files_versions/l10n/sr.json
index b3d1c084aea..8dfb6c37748 100644
--- a/apps/files_versions/l10n/sr.json
+++ b/apps/files_versions/l10n/sr.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Could not revert: %s" : "Не могу да вратим: %s",
     "Versions" : "Верзије",
-    "Failed to revert {file} to revision {timestamp}." : "Не могу давратим {file} на ревизију {timestamp}.",
+    "Failed to revert {file} to revision {timestamp}." : "Не могу да вратим {file} на ревизију {timestamp}.",
     "More versions..." : "Још верзија...",
     "No other versions available" : "Нема других верзија",
     "Restore" : "Врати"
diff --git a/apps/files_versions/l10n/sr@latin.js b/apps/files_versions/l10n/sr@latin.js
index 54215cc4d38..7b6f750d1a6 100644
--- a/apps/files_versions/l10n/sr@latin.js
+++ b/apps/files_versions/l10n/sr@latin.js
@@ -1,11 +1,11 @@
 OC.L10N.register(
     "files_versions",
     {
-    "Could not revert: %s" : "Nemoguće povratiti: %s",
+    "Could not revert: %s" : "Ne mogu da vratim: %s",
     "Versions" : "Verzije",
-    "Failed to revert {file} to revision {timestamp}." : "Neuspelo vraćanje {file} na reviziju {timestamp}.",
+    "Failed to revert {file} to revision {timestamp}." : "Ne mogu da vratim {file} na reviziju {timestamp}.",
     "More versions..." : "Još verzija...",
-    "No other versions available" : "Nema drugih dostupnih verzija.",
-    "Restore" : "Povrati"
+    "No other versions available" : "Nema drugih verzija",
+    "Restore" : "Vrati"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_versions/l10n/sr@latin.json b/apps/files_versions/l10n/sr@latin.json
index 3e74cb9762c..b7a0eb3b398 100644
--- a/apps/files_versions/l10n/sr@latin.json
+++ b/apps/files_versions/l10n/sr@latin.json
@@ -1,9 +1,9 @@
 { "translations": {
-    "Could not revert: %s" : "Nemoguće povratiti: %s",
+    "Could not revert: %s" : "Ne mogu da vratim: %s",
     "Versions" : "Verzije",
-    "Failed to revert {file} to revision {timestamp}." : "Neuspelo vraćanje {file} na reviziju {timestamp}.",
+    "Failed to revert {file} to revision {timestamp}." : "Ne mogu da vratim {file} na reviziju {timestamp}.",
     "More versions..." : "Još verzija...",
-    "No other versions available" : "Nema drugih dostupnih verzija.",
-    "Restore" : "Povrati"
+    "No other versions available" : "Nema drugih verzija",
+    "Restore" : "Vrati"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/af_ZA.js b/apps/user_ldap/l10n/af_ZA.js
index 32c064489ec..e6f685c3c7f 100644
--- a/apps/user_ldap/l10n/af_ZA.js
+++ b/apps/user_ldap/l10n/af_ZA.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "Fout",
+    "Users" : "Gebruikers",
     "Help" : "Hulp",
     "Password" : "Wagwoord",
     "Continue" : "Gaan voort",
diff --git a/apps/user_ldap/l10n/af_ZA.json b/apps/user_ldap/l10n/af_ZA.json
index 79993ee299a..0e4852cb650 100644
--- a/apps/user_ldap/l10n/af_ZA.json
+++ b/apps/user_ldap/l10n/af_ZA.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Error" : "Fout",
+    "Users" : "Gebruikers",
     "Help" : "Hulp",
     "Password" : "Wagwoord",
     "Continue" : "Gaan voort",
diff --git a/apps/user_ldap/l10n/ar.js b/apps/user_ldap/l10n/ar.js
index d73ab8cde44..b940b69a1a7 100644
--- a/apps/user_ldap/l10n/ar.js
+++ b/apps/user_ldap/l10n/ar.js
@@ -10,30 +10,19 @@ OC.L10N.register(
     "No configuration specified" : "لم يتم تحديد الإعدادات.",
     "No data specified" : "لم يتم تحديد البيانات.",
     " Could not set configuration %s" : "تعذر تنفيذ الإعداد %s",
-    "Deletion failed" : "فشل الحذف",
-    "Take over settings from recent server configuration?" : "الحصول على الخصائص من آخر إعدادات في الخادم؟",
-    "Keep settings?" : "الاحتفاظ بالخصائص والإعدادات؟",
-    "{nthServer}. Server" : "الخادم {nthServer}.",
-    "Cannot add server configuration" : "تعذر إضافة الإعدادات للخادم.",
-    "mappings cleared" : "تم مسح الارتباطات (mappings)",
-    "Success" : "نجاح",
-    "Error" : "خطأ",
-    "Please specify a Base DN" : "يرجى تحديد اسم نطاق أساسي Base DN",
-    "Could not determine Base DN" : "تعذر التحقق من اسم النطاق الأساسي Base DN",
-    "Please specify the port" : "يرجى تحديد المنفذ",
-    "Configuration OK" : "الإعدادات صحيحة",
     "Configuration incorrect" : "الإعدادات غير صحيحة",
     "Configuration incomplete" : "الإعدادات غير مكتملة",
+    "Configuration OK" : "الإعدادات صحيحة",
     "Select groups" : "إختر مجموعة",
     "Select object classes" : "اختر أصناف المكونات",
-    "Select attributes" : "اختر الخصائص",
-    "Connection test succeeded" : "تم اختبار الاتصال بنجاح",
-    "Connection test failed" : "فشل اختبار الاتصال",
+    "{nthServer}. Server" : "الخادم {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "هل ترغب فعلاً في حذف إعدادات الخادم الحالي؟",
     "Confirm Deletion" : "تأكيد الحذف",
+    "Select attributes" : "اختر الخصائص",
     "_%s group found_::_%s groups found_" : ["لا توجد مجموعات: %s","تم إيجاد %s مجموعة واحدة","تم إيجاد %s مجموعتين","تم إيجاد %s مجموعات","تم إيجاد %s مجموعة","تم إيجاد %s مجموعة/مجموعات"],
     "Server" : "خادم",
-    "Save" : "حفظ",
+    "Users" : "المستخدمين",
+    "Groups" : "مجموعات",
     "Help" : "المساعدة",
     "Host" : "المضيف",
     "Port" : "المنفذ",
diff --git a/apps/user_ldap/l10n/ar.json b/apps/user_ldap/l10n/ar.json
index 735e7a6e141..20ba16d1481 100644
--- a/apps/user_ldap/l10n/ar.json
+++ b/apps/user_ldap/l10n/ar.json
@@ -8,30 +8,19 @@
     "No configuration specified" : "لم يتم تحديد الإعدادات.",
     "No data specified" : "لم يتم تحديد البيانات.",
     " Could not set configuration %s" : "تعذر تنفيذ الإعداد %s",
-    "Deletion failed" : "فشل الحذف",
-    "Take over settings from recent server configuration?" : "الحصول على الخصائص من آخر إعدادات في الخادم؟",
-    "Keep settings?" : "الاحتفاظ بالخصائص والإعدادات؟",
-    "{nthServer}. Server" : "الخادم {nthServer}.",
-    "Cannot add server configuration" : "تعذر إضافة الإعدادات للخادم.",
-    "mappings cleared" : "تم مسح الارتباطات (mappings)",
-    "Success" : "نجاح",
-    "Error" : "خطأ",
-    "Please specify a Base DN" : "يرجى تحديد اسم نطاق أساسي Base DN",
-    "Could not determine Base DN" : "تعذر التحقق من اسم النطاق الأساسي Base DN",
-    "Please specify the port" : "يرجى تحديد المنفذ",
-    "Configuration OK" : "الإعدادات صحيحة",
     "Configuration incorrect" : "الإعدادات غير صحيحة",
     "Configuration incomplete" : "الإعدادات غير مكتملة",
+    "Configuration OK" : "الإعدادات صحيحة",
     "Select groups" : "إختر مجموعة",
     "Select object classes" : "اختر أصناف المكونات",
-    "Select attributes" : "اختر الخصائص",
-    "Connection test succeeded" : "تم اختبار الاتصال بنجاح",
-    "Connection test failed" : "فشل اختبار الاتصال",
+    "{nthServer}. Server" : "الخادم {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "هل ترغب فعلاً في حذف إعدادات الخادم الحالي؟",
     "Confirm Deletion" : "تأكيد الحذف",
+    "Select attributes" : "اختر الخصائص",
     "_%s group found_::_%s groups found_" : ["لا توجد مجموعات: %s","تم إيجاد %s مجموعة واحدة","تم إيجاد %s مجموعتين","تم إيجاد %s مجموعات","تم إيجاد %s مجموعة","تم إيجاد %s مجموعة/مجموعات"],
     "Server" : "خادم",
-    "Save" : "حفظ",
+    "Users" : "المستخدمين",
+    "Groups" : "مجموعات",
     "Help" : "المساعدة",
     "Host" : "المضيف",
     "Port" : "المنفذ",
diff --git a/apps/user_ldap/l10n/ast.js b/apps/user_ldap/l10n/ast.js
index df63f758307..1ae219b25e6 100644
--- a/apps/user_ldap/l10n/ast.js
+++ b/apps/user_ldap/l10n/ast.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Nun s'especificó la configuración",
     "No data specified" : "Nun s'especificaron los datos",
     " Could not set configuration %s" : "Nun pudo afitase la configuración %s",
-    "Deletion failed" : "Falló'l borráu",
-    "Take over settings from recent server configuration?" : "¿Asumir los axustes actuales de la configuración del sirvidor?",
-    "Keep settings?" : "¿Caltener los axustes?",
-    "{nthServer}. Server" : "{nthServer}. Sirvidor",
-    "Cannot add server configuration" : "Nun pue amestase la configuración del sirvidor",
-    "mappings cleared" : "Asignaciones desaniciaes",
-    "Success" : "Con ésitu",
-    "Error" : "Fallu",
-    "Please specify a Base DN" : "Especifica un DN base",
-    "Could not determine Base DN" : "Nun pudo determinase un DN base",
-    "Please specify the port" : "Especifica'l puertu",
-    "Configuration OK" : "Configuración correuta",
     "Configuration incorrect" : "Configuración incorreuta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración correuta",
     "Select groups" : "Esbillar grupos",
     "Select object classes" : "Seleicionar la clas d'oxetu",
-    "Select attributes" : "Esbillar atributos",
-    "Connection test succeeded" : "Test de conexón esitosu",
-    "Connection test failed" : "Falló'l test de conexón",
+    "{nthServer}. Server" : "{nthServer}. Sirvidor",
     "Do you really want to delete the current Server Configuration?" : "¿Daveres que quies desaniciar la configuración actual del sirvidor?",
     "Confirm Deletion" : "Confirmar desaniciu",
+    "Select attributes" : "Esbillar atributos",
     "_%s group found_::_%s groups found_" : ["%s grupu alcontráu","%s grupos alcontraos"],
     "_%s user found_::_%s users found_" : ["%s usuariu alcontráu","%s usuarios alcontraos"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nun deteutamos el nome  d'atributu na pantalla d'usuariu. Por favor  especifícalu nos axustes avanzaos de ldap",
     "Could not find the desired feature" : "Nun pudo alcontrase la carauterística deseyada",
     "Invalid Host" : "Host inválidu",
     "Server" : "Sirvidor",
-    "User Filter" : "Filtru d'usuariu",
-    "Login Filter" : "Filtru de login",
-    "Group Filter" : "Filtru de Grupu",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Configuración de prueba",
     "Help" : "Ayuda",
     "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen estos criterios tán disponibles en %s:",
-    "only those object classes:" : "namái d'estes clases d'oxetu:",
-    "only from those groups:" : "manái d'estos grupos:",
-    "Edit raw filter instead" : "Editar el filtru en brutu en so llugar",
-    "Raw LDAP filter" : "Filtru LDAP en brutu",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtru especifica qué grupos LDAP van tener accesu a %s.",
     "Test Filter" : "Filtru de preba",
-    "groups found" : "grupos alcontraos",
-    "Users login with this attribute:" : "Aniciu de sesión d'usuarios con esti atributu:",
-    "LDAP Username:" : "Nome d'usuariu LDAP",
-    "LDAP Email Address:" : "Direición e-mail LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define'l filtru a aplicar cuando s'intenta identificar. %%uid va trocar al nome d'usuariu nel procesu d'identificación. Por exemplu: \"uid=%%uid\"",
     "1. Server" : "1. Sirvidor",
     "%s. Server:" : "%s. Sirvidor:",
-    "Add Server Configuration" : "Amestar configuración del sirvidor",
-    "Delete Configuration" : "Desaniciar configuración",
     "Host" : "Equipu",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pues omitir el protocolu, sacantes si necesites SSL. Nesi casu, entama con ldaps://",
     "Port" : "Puertu",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Inxerta manualmente los filtros de LDAP (recomendáu pa direutorios llargos)",
     "Limit %s access to users meeting these criteria:" : "Llendar l'accesu a %s a los usuarios que cumplan estos criterios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtru especifica qué usuarios LDAP puen tener accesu a %s.",
-    "users found" : "usuarios alcontraos",
     "Saving" : "Guardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/ast.json b/apps/user_ldap/l10n/ast.json
index 23c9bcebe8b..408febfb899 100644
--- a/apps/user_ldap/l10n/ast.json
+++ b/apps/user_ldap/l10n/ast.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Nun s'especificó la configuración",
     "No data specified" : "Nun s'especificaron los datos",
     " Could not set configuration %s" : "Nun pudo afitase la configuración %s",
-    "Deletion failed" : "Falló'l borráu",
-    "Take over settings from recent server configuration?" : "¿Asumir los axustes actuales de la configuración del sirvidor?",
-    "Keep settings?" : "¿Caltener los axustes?",
-    "{nthServer}. Server" : "{nthServer}. Sirvidor",
-    "Cannot add server configuration" : "Nun pue amestase la configuración del sirvidor",
-    "mappings cleared" : "Asignaciones desaniciaes",
-    "Success" : "Con ésitu",
-    "Error" : "Fallu",
-    "Please specify a Base DN" : "Especifica un DN base",
-    "Could not determine Base DN" : "Nun pudo determinase un DN base",
-    "Please specify the port" : "Especifica'l puertu",
-    "Configuration OK" : "Configuración correuta",
     "Configuration incorrect" : "Configuración incorreuta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración correuta",
     "Select groups" : "Esbillar grupos",
     "Select object classes" : "Seleicionar la clas d'oxetu",
-    "Select attributes" : "Esbillar atributos",
-    "Connection test succeeded" : "Test de conexón esitosu",
-    "Connection test failed" : "Falló'l test de conexón",
+    "{nthServer}. Server" : "{nthServer}. Sirvidor",
     "Do you really want to delete the current Server Configuration?" : "¿Daveres que quies desaniciar la configuración actual del sirvidor?",
     "Confirm Deletion" : "Confirmar desaniciu",
+    "Select attributes" : "Esbillar atributos",
     "_%s group found_::_%s groups found_" : ["%s grupu alcontráu","%s grupos alcontraos"],
     "_%s user found_::_%s users found_" : ["%s usuariu alcontráu","%s usuarios alcontraos"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nun deteutamos el nome  d'atributu na pantalla d'usuariu. Por favor  especifícalu nos axustes avanzaos de ldap",
     "Could not find the desired feature" : "Nun pudo alcontrase la carauterística deseyada",
     "Invalid Host" : "Host inválidu",
     "Server" : "Sirvidor",
-    "User Filter" : "Filtru d'usuariu",
-    "Login Filter" : "Filtru de login",
-    "Group Filter" : "Filtru de Grupu",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Configuración de prueba",
     "Help" : "Ayuda",
     "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen estos criterios tán disponibles en %s:",
-    "only those object classes:" : "namái d'estes clases d'oxetu:",
-    "only from those groups:" : "manái d'estos grupos:",
-    "Edit raw filter instead" : "Editar el filtru en brutu en so llugar",
-    "Raw LDAP filter" : "Filtru LDAP en brutu",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtru especifica qué grupos LDAP van tener accesu a %s.",
     "Test Filter" : "Filtru de preba",
-    "groups found" : "grupos alcontraos",
-    "Users login with this attribute:" : "Aniciu de sesión d'usuarios con esti atributu:",
-    "LDAP Username:" : "Nome d'usuariu LDAP",
-    "LDAP Email Address:" : "Direición e-mail LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define'l filtru a aplicar cuando s'intenta identificar. %%uid va trocar al nome d'usuariu nel procesu d'identificación. Por exemplu: \"uid=%%uid\"",
     "1. Server" : "1. Sirvidor",
     "%s. Server:" : "%s. Sirvidor:",
-    "Add Server Configuration" : "Amestar configuración del sirvidor",
-    "Delete Configuration" : "Desaniciar configuración",
     "Host" : "Equipu",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pues omitir el protocolu, sacantes si necesites SSL. Nesi casu, entama con ldaps://",
     "Port" : "Puertu",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Inxerta manualmente los filtros de LDAP (recomendáu pa direutorios llargos)",
     "Limit %s access to users meeting these criteria:" : "Llendar l'accesu a %s a los usuarios que cumplan estos criterios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtru especifica qué usuarios LDAP puen tener accesu a %s.",
-    "users found" : "usuarios alcontraos",
     "Saving" : "Guardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/az.js b/apps/user_ldap/l10n/az.js
index a4a190de240..b431ba72723 100644
--- a/apps/user_ldap/l10n/az.js
+++ b/apps/user_ldap/l10n/az.js
@@ -10,37 +10,23 @@ OC.L10N.register(
     "No configuration specified" : "Təyin edilmiş konfiqurasiya yoxdur",
     "No data specified" : "Təyin edilmiş data yoxdur",
     " Could not set configuration %s" : "%s configi təyin etmək mümkün olmadı",
-    "Deletion failed" : "Silinmədə səhv baş verdi",
-    "Take over settings from recent server configuration?" : "Biraz onceki konfiqlərən server konfiqini alaq?",
-    "Keep settings?" : "Ayarlar qalsın?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Server quraşdırmalarını əlavə etmək mümkün olmadı",
-    "mappings cleared" : "xəritələnmələr təmizləndi",
-    "Success" : "Uğur",
-    "Error" : "Səhv",
-    "Please specify a Base DN" : "Xahiş olunur Base DN təyin edəsiniz",
-    "Could not determine Base DN" : "Base DN-i təyin etmək olmur",
-    "Please specify the port" : "Xahiş olunur portu təyin edəsiniz",
-    "Configuration OK" : "Konfiqurasiya OK-dir",
     "Configuration incorrect" : "Konfiqurasiya düzgün deyil",
     "Configuration incomplete" : "Konfiqruasiya bitmiş deyil",
+    "Configuration OK" : "Konfiqurasiya OK-dir",
     "Select groups" : "Qrupları seç",
     "Select object classes" : "object class-larını seç",
-    "Select attributes" : "Atributları seç",
-    "Connection test succeeded" : "Qoşulma testi uğurlu oldu",
-    "Connection test failed" : "Qoşulma testi uğursuz oldu",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Siz hal-hazırki server konfiqini silmək istədiyinizdən həqiqətən əminsinizmi?",
     "Confirm Deletion" : "Silinmənin təsdiqi",
+    "Select attributes" : "Atributları seç",
     "_%s group found_::_%s groups found_" : ["%s qruplar tapıldı","%s qruplar tapıldı"],
     "_%s user found_::_%s users found_" : ["%s istifadəçilər tapıldı","%s istifadəçilər tapıldı"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "İstifadəçinin ekran atributu adını təyin etmək mümkün deyil. Xahiş olunur sizin özünüz onu əllə ldap konfiqində təyin edəsiniz.",
     "Could not find the desired feature" : "Arzulanılan imkanı tapmaq mümkün deyil",
     "Invalid Host" : "Yalnış Host",
     "Server" : "Server",
-    "User Filter" : "İstifadəçi süzgəci",
-    "Login Filter" : "Giriş süzgəci",
-    "Group Filter" : "Qrup süzgəci",
-    "Save" : "Saxlamaq",
+    "Users" : "İstifadəçilər",
+    "Groups" : "Qruplar",
     "Test Configuration" : "Konfiqurasiya testi",
     "Help" : "Kömək",
     "Host" : "Şəbəkədə ünvan",
diff --git a/apps/user_ldap/l10n/az.json b/apps/user_ldap/l10n/az.json
index 0e2afa6765d..aa5e52cb346 100644
--- a/apps/user_ldap/l10n/az.json
+++ b/apps/user_ldap/l10n/az.json
@@ -8,37 +8,23 @@
     "No configuration specified" : "Təyin edilmiş konfiqurasiya yoxdur",
     "No data specified" : "Təyin edilmiş data yoxdur",
     " Could not set configuration %s" : "%s configi təyin etmək mümkün olmadı",
-    "Deletion failed" : "Silinmədə səhv baş verdi",
-    "Take over settings from recent server configuration?" : "Biraz onceki konfiqlərən server konfiqini alaq?",
-    "Keep settings?" : "Ayarlar qalsın?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Server quraşdırmalarını əlavə etmək mümkün olmadı",
-    "mappings cleared" : "xəritələnmələr təmizləndi",
-    "Success" : "Uğur",
-    "Error" : "Səhv",
-    "Please specify a Base DN" : "Xahiş olunur Base DN təyin edəsiniz",
-    "Could not determine Base DN" : "Base DN-i təyin etmək olmur",
-    "Please specify the port" : "Xahiş olunur portu təyin edəsiniz",
-    "Configuration OK" : "Konfiqurasiya OK-dir",
     "Configuration incorrect" : "Konfiqurasiya düzgün deyil",
     "Configuration incomplete" : "Konfiqruasiya bitmiş deyil",
+    "Configuration OK" : "Konfiqurasiya OK-dir",
     "Select groups" : "Qrupları seç",
     "Select object classes" : "object class-larını seç",
-    "Select attributes" : "Atributları seç",
-    "Connection test succeeded" : "Qoşulma testi uğurlu oldu",
-    "Connection test failed" : "Qoşulma testi uğursuz oldu",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Siz hal-hazırki server konfiqini silmək istədiyinizdən həqiqətən əminsinizmi?",
     "Confirm Deletion" : "Silinmənin təsdiqi",
+    "Select attributes" : "Atributları seç",
     "_%s group found_::_%s groups found_" : ["%s qruplar tapıldı","%s qruplar tapıldı"],
     "_%s user found_::_%s users found_" : ["%s istifadəçilər tapıldı","%s istifadəçilər tapıldı"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "İstifadəçinin ekran atributu adını təyin etmək mümkün deyil. Xahiş olunur sizin özünüz onu əllə ldap konfiqində təyin edəsiniz.",
     "Could not find the desired feature" : "Arzulanılan imkanı tapmaq mümkün deyil",
     "Invalid Host" : "Yalnış Host",
     "Server" : "Server",
-    "User Filter" : "İstifadəçi süzgəci",
-    "Login Filter" : "Giriş süzgəci",
-    "Group Filter" : "Qrup süzgəci",
-    "Save" : "Saxlamaq",
+    "Users" : "İstifadəçilər",
+    "Groups" : "Qruplar",
     "Test Configuration" : "Konfiqurasiya testi",
     "Help" : "Kömək",
     "Host" : "Şəbəkədə ünvan",
diff --git a/apps/user_ldap/l10n/be.js b/apps/user_ldap/l10n/be.js
index b066b1be44f..dda51e8ac42 100644
--- a/apps/user_ldap/l10n/be.js
+++ b/apps/user_ldap/l10n/be.js
@@ -1,7 +1,6 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "Памылка",
     "Advanced" : "Дасведчаны"
 },
 "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_ldap/l10n/be.json b/apps/user_ldap/l10n/be.json
index 199294660f1..f70adabdbe1 100644
--- a/apps/user_ldap/l10n/be.json
+++ b/apps/user_ldap/l10n/be.json
@@ -1,5 +1,4 @@
 { "translations": {
-    "Error" : "Памылка",
     "Advanced" : "Дасведчаны"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/bg_BG.js b/apps/user_ldap/l10n/bg_BG.js
index 32752119b90..42f1a3759f2 100644
--- a/apps/user_ldap/l10n/bg_BG.js
+++ b/apps/user_ldap/l10n/bg_BG.js
@@ -10,55 +10,31 @@ OC.L10N.register(
     "No configuration specified" : "Не е посочена конфигурация",
     "No data specified" : "Не са посочени данни",
     " Could not set configuration %s" : "Неуспешно задаване на конфигруацията %s",
-    "Deletion failed" : "Неуспешно изтриване",
-    "Take over settings from recent server configuration?" : "Използвай настройките от скорошна сървърна конфигурация?",
-    "Keep settings?" : "Запази настройките?",
-    "{nthServer}. Server" : "{nthServer}. Сървър",
-    "Cannot add server configuration" : "Неуспешно добавяне на сървърна конфигурация.",
-    "mappings cleared" : "mapping-и създадени.",
-    "Success" : "Успех",
-    "Error" : "Грешка",
-    "Please specify a Base DN" : "Моля, посочи Base DN",
-    "Could not determine Base DN" : "Неуспешно установяване на Base DN",
-    "Please specify the port" : "Mоля, посочи портът",
-    "Configuration OK" : "Конфигурацията е ОК",
     "Configuration incorrect" : "Конфигурацията е грешна",
     "Configuration incomplete" : "Конфигурацията не е завършена",
+    "Configuration OK" : "Конфигурацията е ОК",
     "Select groups" : "Избери Групи",
     "Select object classes" : "Избери типове обекти",
-    "Select attributes" : "Избери атрибути",
-    "Connection test succeeded" : "Успешен тест на връзката.",
-    "Connection test failed" : "Неуспешен тест на връзката.",
+    "{nthServer}. Server" : "{nthServer}. Сървър",
     "Do you really want to delete the current Server Configuration?" : "Наистина ли искаш да изтриеш текущата Сървърна Конфигурация?",
     "Confirm Deletion" : "Потвърди Изтриването",
+    "Select attributes" : "Избери атрибути",
     "_%s group found_::_%s groups found_" : ["%s открита група","%s открити групи"],
     "_%s user found_::_%s users found_" : ["%s октрит потребител","%s октрити потребители"],
     "Could not find the desired feature" : "Не е открита желанта функция",
     "Invalid Host" : "Невалиден Сървър",
     "Server" : "Сървър",
-    "User Filter" : "User Filter",
-    "Login Filter" : "Login Filter",
-    "Group Filter" : "Group Filter",
-    "Save" : "Запиши",
+    "Users" : "Потребители",
+    "Groups" : "Групи",
     "Test Configuration" : "Тествай Конфигурацията",
     "Help" : "Помощ",
     "Groups meeting these criteria are available in %s:" : "Групи спазващи тези критерии са разположени в %s:",
-    "only those object classes:" : "само следните типове обекти:",
-    "only from those groups:" : "само от следните групи:",
-    "Edit raw filter instead" : "Промени raw филтъра",
-    "Raw LDAP filter" : "Raw LDAP филтър",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтърът посочва кои LDAP групи ще имат достъп до %s инсталацията.",
     "Test Filter" : "Тестов Филтър",
-    "groups found" : "открити групи",
-    "Users login with this attribute:" : "Потребителски профили с този атрибут:",
-    "LDAP Username:" : "LDAP Потребителско Име:",
-    "LDAP Email Address:" : "LDAP Имел Адрес:",
     "Other Attributes:" : "Други Атрибути:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Заявява филтърът, който да бъде приложен при опит за вписване. %%uid замества потребителското име в полето login action. Пример: \"uid=%%uid\".",
     "1. Server" : "1. Сървър",
     "%s. Server:" : "%s. Сървър:",
-    "Add Server Configuration" : "Добави Сървърна Конфигурация",
-    "Delete Configuration" : "Изтрий Конфигурацията",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Протоколът не задължителен освен ако не изискваш SLL. В такъв случай започни с ldaps://",
     "Port" : "Порт",
@@ -72,7 +48,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ръчно въвеждана на LDAP филтри(препоръчано за по-големи папки)",
     "Limit %s access to users meeting these criteria:" : "Ограничи достъпа на %s до потребители покриващи следните критерии:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Филтърът посочва кои LDAP потребители ще имат достъп до %s инсталацията.",
-    "users found" : "открити потребители",
     "Saving" : "Записване",
     "Back" : "Назад",
     "Continue" : "Продължи",
diff --git a/apps/user_ldap/l10n/bg_BG.json b/apps/user_ldap/l10n/bg_BG.json
index 9db25e037a1..f10290c783c 100644
--- a/apps/user_ldap/l10n/bg_BG.json
+++ b/apps/user_ldap/l10n/bg_BG.json
@@ -8,55 +8,31 @@
     "No configuration specified" : "Не е посочена конфигурация",
     "No data specified" : "Не са посочени данни",
     " Could not set configuration %s" : "Неуспешно задаване на конфигруацията %s",
-    "Deletion failed" : "Неуспешно изтриване",
-    "Take over settings from recent server configuration?" : "Използвай настройките от скорошна сървърна конфигурация?",
-    "Keep settings?" : "Запази настройките?",
-    "{nthServer}. Server" : "{nthServer}. Сървър",
-    "Cannot add server configuration" : "Неуспешно добавяне на сървърна конфигурация.",
-    "mappings cleared" : "mapping-и създадени.",
-    "Success" : "Успех",
-    "Error" : "Грешка",
-    "Please specify a Base DN" : "Моля, посочи Base DN",
-    "Could not determine Base DN" : "Неуспешно установяване на Base DN",
-    "Please specify the port" : "Mоля, посочи портът",
-    "Configuration OK" : "Конфигурацията е ОК",
     "Configuration incorrect" : "Конфигурацията е грешна",
     "Configuration incomplete" : "Конфигурацията не е завършена",
+    "Configuration OK" : "Конфигурацията е ОК",
     "Select groups" : "Избери Групи",
     "Select object classes" : "Избери типове обекти",
-    "Select attributes" : "Избери атрибути",
-    "Connection test succeeded" : "Успешен тест на връзката.",
-    "Connection test failed" : "Неуспешен тест на връзката.",
+    "{nthServer}. Server" : "{nthServer}. Сървър",
     "Do you really want to delete the current Server Configuration?" : "Наистина ли искаш да изтриеш текущата Сървърна Конфигурация?",
     "Confirm Deletion" : "Потвърди Изтриването",
+    "Select attributes" : "Избери атрибути",
     "_%s group found_::_%s groups found_" : ["%s открита група","%s открити групи"],
     "_%s user found_::_%s users found_" : ["%s октрит потребител","%s октрити потребители"],
     "Could not find the desired feature" : "Не е открита желанта функция",
     "Invalid Host" : "Невалиден Сървър",
     "Server" : "Сървър",
-    "User Filter" : "User Filter",
-    "Login Filter" : "Login Filter",
-    "Group Filter" : "Group Filter",
-    "Save" : "Запиши",
+    "Users" : "Потребители",
+    "Groups" : "Групи",
     "Test Configuration" : "Тествай Конфигурацията",
     "Help" : "Помощ",
     "Groups meeting these criteria are available in %s:" : "Групи спазващи тези критерии са разположени в %s:",
-    "only those object classes:" : "само следните типове обекти:",
-    "only from those groups:" : "само от следните групи:",
-    "Edit raw filter instead" : "Промени raw филтъра",
-    "Raw LDAP filter" : "Raw LDAP филтър",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтърът посочва кои LDAP групи ще имат достъп до %s инсталацията.",
     "Test Filter" : "Тестов Филтър",
-    "groups found" : "открити групи",
-    "Users login with this attribute:" : "Потребителски профили с този атрибут:",
-    "LDAP Username:" : "LDAP Потребителско Име:",
-    "LDAP Email Address:" : "LDAP Имел Адрес:",
     "Other Attributes:" : "Други Атрибути:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Заявява филтърът, който да бъде приложен при опит за вписване. %%uid замества потребителското име в полето login action. Пример: \"uid=%%uid\".",
     "1. Server" : "1. Сървър",
     "%s. Server:" : "%s. Сървър:",
-    "Add Server Configuration" : "Добави Сървърна Конфигурация",
-    "Delete Configuration" : "Изтрий Конфигурацията",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Протоколът не задължителен освен ако не изискваш SLL. В такъв случай започни с ldaps://",
     "Port" : "Порт",
@@ -70,7 +46,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ръчно въвеждана на LDAP филтри(препоръчано за по-големи папки)",
     "Limit %s access to users meeting these criteria:" : "Ограничи достъпа на %s до потребители покриващи следните критерии:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Филтърът посочва кои LDAP потребители ще имат достъп до %s инсталацията.",
-    "users found" : "открити потребители",
     "Saving" : "Записване",
     "Back" : "Назад",
     "Continue" : "Продължи",
diff --git a/apps/user_ldap/l10n/bn_BD.js b/apps/user_ldap/l10n/bn_BD.js
index d52c5eb953a..3ee845c475f 100644
--- a/apps/user_ldap/l10n/bn_BD.js
+++ b/apps/user_ldap/l10n/bn_BD.js
@@ -10,54 +10,30 @@ OC.L10N.register(
     "No configuration specified" : " কোন কনফিগারেসন সুনির্দিষ্ট নয়",
     "No data specified" : "কোন ডাটা সুনির্দিষ্ট নয়",
     " Could not set configuration %s" : "%s কনফিগারেসন ঠিক করা গেল না",
-    "Deletion failed" : "মুছার আদেশ ব্যার্থ হলো",
-    "Take over settings from recent server configuration?" : "সদ্য সার্ভার কনফিগারেসন থেকে নিয়ামকসমূহ নিতে হবে?",
-    "Keep settings?" : "নিয়ামকসমূহ সংরক্ষণ করবো?",
-    "{nthServer}. Server" : "{nthServer}. সার্ভার",
-    "Cannot add server configuration" : "সার্ভার কনফিগারেসন যোগ করা যাবেনা",
-    "mappings cleared" : "মানচিত্রায়ন মোছা হলো",
-    "Success" : "সাফল্য",
-    "Error" : "সমস্যা",
-    "Please specify a Base DN" : "দয়া করে একটি Base DN নির্দিষ্ট করুন",
-    "Could not determine Base DN" : "Base DN নির্ধারণ করা গেলনা",
-    "Please specify the port" : "পোর্ট সুনির্দিষ্ট করুন",
-    "Configuration OK" : "কনফিগারেসন ঠিক আছে",
     "Configuration incorrect" : "ভুল কনফিগারেসন",
     "Configuration incomplete" : "অসম্পূর্ণ কনফিগারেসন",
+    "Configuration OK" : "কনফিগারেসন ঠিক আছে",
     "Select groups" : "গ্রুপ নির্ধারণ",
     "Select object classes" : "অবজেক্ট ক্লাস নির্ধারণ",
-    "Select attributes" : "বৈশিষ্ট্য নির্ধারণ",
-    "Connection test succeeded" : "যোগাযোগ পরীক্ষা সার্থক",
-    "Connection test failed" : "যোগাযোগ পরীক্ষা ব্যার্থ",
+    "{nthServer}. Server" : "{nthServer}. সার্ভার",
     "Do you really want to delete the current Server Configuration?" : "আপনি কি সত্যিই চলতি সার্ভার কনফিগারেসন মুছতে চান?",
     "Confirm Deletion" : "মোছার আদেশ নিশ্চিত করুন",
+    "Select attributes" : "বৈশিষ্ট্য নির্ধারণ",
     "_%s group found_::_%s groups found_" : ["%s গ্রুপ পাওয়া গেছে","%s গ্রুপ পাওয়া গেছে"],
     "_%s user found_::_%s users found_" : ["%s ব্যাবহারকারী পাওয়া গেছে","%s ব্যাবহারকারী পাওয়া গেছে"],
     "Could not find the desired feature" : "চাহিদামাফিক ফিচারটি পাওয়া গেলনা",
     "Invalid Host" : "অবৈধ হোস্ট",
     "Server" : "সার্ভার",
-    "User Filter" : "ব্যবহারকারী তালিকা ছাঁকনী",
-    "Login Filter" : "প্রবেশ ছাঁকনী",
-    "Group Filter" : "গোষ্ঠী ছাঁকনী",
-    "Save" : "সংরক্ষণ",
+    "Users" : "ব্যবহারকারী",
+    "Groups" : "গোষ্ঠীসমূহ",
     "Test Configuration" : "পরীক্ষামূলক কনফিগারেসন",
     "Help" : "সহায়িকা",
     "Groups meeting these criteria are available in %s:" : "প্রদত্ত বৈশিষ্ট্য অনুযায়ী %s এ প্রাপ্তব্য গ্রুপসমূহ:",
-    "only those object classes:" : "শুধুমাত্র সেইসব অবজেক্ট ক্লাস:",
-    "only from those groups:" : "শুধুমাত্র বর্ণিত গ্রুপসমূহ হতে:",
-    "Edit raw filter instead" : "অসম্পূর্ণ ফিল্টার সম্পাদনা করুন",
-    "Raw LDAP filter" : "অসম্পূর্ণ LDAP ফিল্টার",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "ফিল্টারটি %s সার্ভারে কোন কোন LDAP গ্রুপ প্রবেশাধিকার পাবে তা নির্ধারণ করে।",
-    "groups found" : "গ্রুপ পাওয়া গেছে",
-    "Users login with this attribute:" : "এই বৈশিষ্ট্য নিয়ে ব্যবহারকারী প্রবেশ করতে পারেন:",
-    "LDAP Username:" : "LDAP ব্যাবহারকারী নাম:",
-    "LDAP Email Address:" : "LDAP ই-মেইল ঠিকানা:",
     "Other Attributes:" : "অন্যান্য বৈশিষ্ট্য:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "প্রবেশ প্রচেষ্টা নিলে প্রযোজ্য ফিল্টার নির্ধারণ করে। প্রবেশকালে %%uid ব্যাবহারকারীর নামকে প্রতিস্থাপন করে। ঊদাহরণ: \"uid=%%uid\"",
     "1. Server" : "1. সার্ভার",
     "%s. Server:" : "%s. সার্ভার:",
-    "Add Server Configuration" : "সার্ভার কনফিগারেসন যোগ কর",
-    "Delete Configuration" : "কনফিগারেসন মুছে ফেল",
     "Host" : "হোস্ট",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL আবশ্যক  না হলে  আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://",
     "Port" : "পোর্ট",
@@ -69,7 +45,6 @@ OC.L10N.register(
     "You can specify Base DN for users and groups in the Advanced tab" : "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।",
     "Limit %s access to users meeting these criteria:" : "%s এ প্রবেশাধিকার এই শর্তধারী ব্যবহারকারীর মাঝে সীমিত রাখ:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "এই ফিল্টারটি কোন কোন LDAP ব্যবহারকারী %s সার্ভারে প্রবেশ করবেন তা বাছাই করে।",
-    "users found" : "ব্যাবহারকারী পাওয়া গেছে",
     "Back" : "পেছনে যাও",
     "Continue" : "চালিয়ে যাও",
     "Expert" : "দক্ষ",
diff --git a/apps/user_ldap/l10n/bn_BD.json b/apps/user_ldap/l10n/bn_BD.json
index 0c21103de4f..250565a3a82 100644
--- a/apps/user_ldap/l10n/bn_BD.json
+++ b/apps/user_ldap/l10n/bn_BD.json
@@ -8,54 +8,30 @@
     "No configuration specified" : " কোন কনফিগারেসন সুনির্দিষ্ট নয়",
     "No data specified" : "কোন ডাটা সুনির্দিষ্ট নয়",
     " Could not set configuration %s" : "%s কনফিগারেসন ঠিক করা গেল না",
-    "Deletion failed" : "মুছার আদেশ ব্যার্থ হলো",
-    "Take over settings from recent server configuration?" : "সদ্য সার্ভার কনফিগারেসন থেকে নিয়ামকসমূহ নিতে হবে?",
-    "Keep settings?" : "নিয়ামকসমূহ সংরক্ষণ করবো?",
-    "{nthServer}. Server" : "{nthServer}. সার্ভার",
-    "Cannot add server configuration" : "সার্ভার কনফিগারেসন যোগ করা যাবেনা",
-    "mappings cleared" : "মানচিত্রায়ন মোছা হলো",
-    "Success" : "সাফল্য",
-    "Error" : "সমস্যা",
-    "Please specify a Base DN" : "দয়া করে একটি Base DN নির্দিষ্ট করুন",
-    "Could not determine Base DN" : "Base DN নির্ধারণ করা গেলনা",
-    "Please specify the port" : "পোর্ট সুনির্দিষ্ট করুন",
-    "Configuration OK" : "কনফিগারেসন ঠিক আছে",
     "Configuration incorrect" : "ভুল কনফিগারেসন",
     "Configuration incomplete" : "অসম্পূর্ণ কনফিগারেসন",
+    "Configuration OK" : "কনফিগারেসন ঠিক আছে",
     "Select groups" : "গ্রুপ নির্ধারণ",
     "Select object classes" : "অবজেক্ট ক্লাস নির্ধারণ",
-    "Select attributes" : "বৈশিষ্ট্য নির্ধারণ",
-    "Connection test succeeded" : "যোগাযোগ পরীক্ষা সার্থক",
-    "Connection test failed" : "যোগাযোগ পরীক্ষা ব্যার্থ",
+    "{nthServer}. Server" : "{nthServer}. সার্ভার",
     "Do you really want to delete the current Server Configuration?" : "আপনি কি সত্যিই চলতি সার্ভার কনফিগারেসন মুছতে চান?",
     "Confirm Deletion" : "মোছার আদেশ নিশ্চিত করুন",
+    "Select attributes" : "বৈশিষ্ট্য নির্ধারণ",
     "_%s group found_::_%s groups found_" : ["%s গ্রুপ পাওয়া গেছে","%s গ্রুপ পাওয়া গেছে"],
     "_%s user found_::_%s users found_" : ["%s ব্যাবহারকারী পাওয়া গেছে","%s ব্যাবহারকারী পাওয়া গেছে"],
     "Could not find the desired feature" : "চাহিদামাফিক ফিচারটি পাওয়া গেলনা",
     "Invalid Host" : "অবৈধ হোস্ট",
     "Server" : "সার্ভার",
-    "User Filter" : "ব্যবহারকারী তালিকা ছাঁকনী",
-    "Login Filter" : "প্রবেশ ছাঁকনী",
-    "Group Filter" : "গোষ্ঠী ছাঁকনী",
-    "Save" : "সংরক্ষণ",
+    "Users" : "ব্যবহারকারী",
+    "Groups" : "গোষ্ঠীসমূহ",
     "Test Configuration" : "পরীক্ষামূলক কনফিগারেসন",
     "Help" : "সহায়িকা",
     "Groups meeting these criteria are available in %s:" : "প্রদত্ত বৈশিষ্ট্য অনুযায়ী %s এ প্রাপ্তব্য গ্রুপসমূহ:",
-    "only those object classes:" : "শুধুমাত্র সেইসব অবজেক্ট ক্লাস:",
-    "only from those groups:" : "শুধুমাত্র বর্ণিত গ্রুপসমূহ হতে:",
-    "Edit raw filter instead" : "অসম্পূর্ণ ফিল্টার সম্পাদনা করুন",
-    "Raw LDAP filter" : "অসম্পূর্ণ LDAP ফিল্টার",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "ফিল্টারটি %s সার্ভারে কোন কোন LDAP গ্রুপ প্রবেশাধিকার পাবে তা নির্ধারণ করে।",
-    "groups found" : "গ্রুপ পাওয়া গেছে",
-    "Users login with this attribute:" : "এই বৈশিষ্ট্য নিয়ে ব্যবহারকারী প্রবেশ করতে পারেন:",
-    "LDAP Username:" : "LDAP ব্যাবহারকারী নাম:",
-    "LDAP Email Address:" : "LDAP ই-মেইল ঠিকানা:",
     "Other Attributes:" : "অন্যান্য বৈশিষ্ট্য:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "প্রবেশ প্রচেষ্টা নিলে প্রযোজ্য ফিল্টার নির্ধারণ করে। প্রবেশকালে %%uid ব্যাবহারকারীর নামকে প্রতিস্থাপন করে। ঊদাহরণ: \"uid=%%uid\"",
     "1. Server" : "1. সার্ভার",
     "%s. Server:" : "%s. সার্ভার:",
-    "Add Server Configuration" : "সার্ভার কনফিগারেসন যোগ কর",
-    "Delete Configuration" : "কনফিগারেসন মুছে ফেল",
     "Host" : "হোস্ট",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL আবশ্যক  না হলে  আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://",
     "Port" : "পোর্ট",
@@ -67,7 +43,6 @@
     "You can specify Base DN for users and groups in the Advanced tab" : "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।",
     "Limit %s access to users meeting these criteria:" : "%s এ প্রবেশাধিকার এই শর্তধারী ব্যবহারকারীর মাঝে সীমিত রাখ:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "এই ফিল্টারটি কোন কোন LDAP ব্যবহারকারী %s সার্ভারে প্রবেশ করবেন তা বাছাই করে।",
-    "users found" : "ব্যাবহারকারী পাওয়া গেছে",
     "Back" : "পেছনে যাও",
     "Continue" : "চালিয়ে যাও",
     "Expert" : "দক্ষ",
diff --git a/apps/user_ldap/l10n/bn_IN.js b/apps/user_ldap/l10n/bn_IN.js
index 88930252486..c0e75c83618 100644
--- a/apps/user_ldap/l10n/bn_IN.js
+++ b/apps/user_ldap/l10n/bn_IN.js
@@ -1,8 +1,6 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "ভুল",
-    "Save" : "সেভ",
     "Host" : "হোস্ট"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/bn_IN.json b/apps/user_ldap/l10n/bn_IN.json
index c9907ef3cae..e80623a1235 100644
--- a/apps/user_ldap/l10n/bn_IN.json
+++ b/apps/user_ldap/l10n/bn_IN.json
@@ -1,6 +1,4 @@
 { "translations": {
-    "Error" : "ভুল",
-    "Save" : "সেভ",
     "Host" : "হোস্ট"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/bs.js b/apps/user_ldap/l10n/bs.js
index 5d9a2405dc7..a30255595fe 100644
--- a/apps/user_ldap/l10n/bs.js
+++ b/apps/user_ldap/l10n/bs.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Brisanje nije uspjelo",
-    "Error" : "Greška",
-    "Save" : "Spasi",
+    "Users" : "Korisnici",
+    "Groups" : "Grupe",
     "Help" : "Pomoć",
     "Port" : "Priključak",
     "Password" : "Lozinka",
diff --git a/apps/user_ldap/l10n/bs.json b/apps/user_ldap/l10n/bs.json
index 4591e65fb91..3172f54cf89 100644
--- a/apps/user_ldap/l10n/bs.json
+++ b/apps/user_ldap/l10n/bs.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "Brisanje nije uspjelo",
-    "Error" : "Greška",
-    "Save" : "Spasi",
+    "Users" : "Korisnici",
+    "Groups" : "Grupe",
     "Help" : "Pomoć",
     "Port" : "Priključak",
     "Password" : "Lozinka",
diff --git a/apps/user_ldap/l10n/ca.js b/apps/user_ldap/l10n/ca.js
index 0a99e88517d..cf25823642b 100644
--- a/apps/user_ldap/l10n/ca.js
+++ b/apps/user_ldap/l10n/ca.js
@@ -10,54 +10,30 @@ OC.L10N.register(
     "No configuration specified" : "No heu especificat cap configuració",
     "No data specified" : "No heu especificat cap dada",
     " Could not set configuration %s" : "No s'ha pogut establir la configuració %s",
-    "Deletion failed" : "Eliminació fallida",
-    "Take over settings from recent server configuration?" : "Voleu prendre l'arranjament de la configuració actual del servidor?",
-    "Keep settings?" : "Voleu mantenir la configuració?",
-    "{nthServer}. Server" : "{nthServer}. Servidor",
-    "Cannot add server configuration" : "No es pot afegir la configuració del servidor",
-    "mappings cleared" : "s'han eliminat els mapatges",
-    "Success" : "Èxit",
-    "Error" : "Error",
-    "Please specify a Base DN" : "Especifiqueu una base DN",
-    "Could not determine Base DN" : "No s'ha pogut determinar la base DN",
-    "Please specify the port" : "Especifiqueu el port",
-    "Configuration OK" : "Configuració correcte",
     "Configuration incorrect" : "Configuració incorrecte",
     "Configuration incomplete" : "Configuració incompleta",
+    "Configuration OK" : "Configuració correcte",
     "Select groups" : "Selecciona els grups",
     "Select object classes" : "Seleccioneu les classes dels objectes",
-    "Select attributes" : "Seleccioneu els atributs",
-    "Connection test succeeded" : "La prova de connexió ha reeixit",
-    "Connection test failed" : "La prova de connexió ha fallat",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
     "Do you really want to delete the current Server Configuration?" : "Voleu eliminar la configuració actual del servidor?",
     "Confirm Deletion" : "Confirma l'eliminació",
+    "Select attributes" : "Seleccioneu els atributs",
     "_%s group found_::_%s groups found_" : ["S'ha trobat %s grup","S'han trobat %s grups"],
     "_%s user found_::_%s users found_" : ["S'ha trobat %s usuari","S'han trobat %s usuaris"],
     "Could not find the desired feature" : "La característica desitjada no s'ha trobat",
     "Invalid Host" : "Ordinador central no vàlid",
     "Server" : "Servidor",
-    "User Filter" : "Filtre d'usuari",
-    "Login Filter" : "Filtre d'acreditació",
-    "Group Filter" : "Filtre de grup",
-    "Save" : "Desa",
+    "Users" : "Usuaris",
+    "Groups" : "Grups",
     "Test Configuration" : "Comprovació de la configuració",
     "Help" : "Ajuda",
     "Groups meeting these criteria are available in %s:" : "Els grups que compleixen aquests criteris estan disponibles a %s:",
-    "only those object classes:" : "només aquestes classes d'objecte:",
-    "only from those groups:" : "només d'aquests grups",
-    "Edit raw filter instead" : "Edita filtre raw",
-    "Raw LDAP filter" : "Filtre raw LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtre especifica quins grups LDAP haurien de tenir accés a la instància %s.",
-    "groups found" : "grups trobats",
-    "Users login with this attribute:" : "Usuaris acreditats amb aquest atribut:",
-    "LDAP Username:" : "Nom d'usuari LDAP:",
-    "LDAP Email Address:" : "Adreça de correu electrònic LDAP:",
     "Other Attributes:" : "Altres atributs:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Defineix el filtre a aplicar quan s'intenta iniciar la sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió. Per exemple: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Afegeix la configuració del servidor",
-    "Delete Configuration" : "Esborra la configuració",
     "Host" : "Equip remot",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
     "Port" : "Port",
@@ -69,7 +45,6 @@ OC.L10N.register(
     "You can specify Base DN for users and groups in the Advanced tab" : "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat",
     "Limit %s access to users meeting these criteria:" : "Limita l'accés a %s usuaris que compleixin amb aquest criteri:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtre especifica quins usuaris LDAP haurien de tenir accés a la instància %s",
-    "users found" : "usuaris trobats",
     "Back" : "Enrera",
     "Continue" : "Continua",
     "Expert" : "Expert",
diff --git a/apps/user_ldap/l10n/ca.json b/apps/user_ldap/l10n/ca.json
index e34ab1e1256..87030688650 100644
--- a/apps/user_ldap/l10n/ca.json
+++ b/apps/user_ldap/l10n/ca.json
@@ -8,54 +8,30 @@
     "No configuration specified" : "No heu especificat cap configuració",
     "No data specified" : "No heu especificat cap dada",
     " Could not set configuration %s" : "No s'ha pogut establir la configuració %s",
-    "Deletion failed" : "Eliminació fallida",
-    "Take over settings from recent server configuration?" : "Voleu prendre l'arranjament de la configuració actual del servidor?",
-    "Keep settings?" : "Voleu mantenir la configuració?",
-    "{nthServer}. Server" : "{nthServer}. Servidor",
-    "Cannot add server configuration" : "No es pot afegir la configuració del servidor",
-    "mappings cleared" : "s'han eliminat els mapatges",
-    "Success" : "Èxit",
-    "Error" : "Error",
-    "Please specify a Base DN" : "Especifiqueu una base DN",
-    "Could not determine Base DN" : "No s'ha pogut determinar la base DN",
-    "Please specify the port" : "Especifiqueu el port",
-    "Configuration OK" : "Configuració correcte",
     "Configuration incorrect" : "Configuració incorrecte",
     "Configuration incomplete" : "Configuració incompleta",
+    "Configuration OK" : "Configuració correcte",
     "Select groups" : "Selecciona els grups",
     "Select object classes" : "Seleccioneu les classes dels objectes",
-    "Select attributes" : "Seleccioneu els atributs",
-    "Connection test succeeded" : "La prova de connexió ha reeixit",
-    "Connection test failed" : "La prova de connexió ha fallat",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
     "Do you really want to delete the current Server Configuration?" : "Voleu eliminar la configuració actual del servidor?",
     "Confirm Deletion" : "Confirma l'eliminació",
+    "Select attributes" : "Seleccioneu els atributs",
     "_%s group found_::_%s groups found_" : ["S'ha trobat %s grup","S'han trobat %s grups"],
     "_%s user found_::_%s users found_" : ["S'ha trobat %s usuari","S'han trobat %s usuaris"],
     "Could not find the desired feature" : "La característica desitjada no s'ha trobat",
     "Invalid Host" : "Ordinador central no vàlid",
     "Server" : "Servidor",
-    "User Filter" : "Filtre d'usuari",
-    "Login Filter" : "Filtre d'acreditació",
-    "Group Filter" : "Filtre de grup",
-    "Save" : "Desa",
+    "Users" : "Usuaris",
+    "Groups" : "Grups",
     "Test Configuration" : "Comprovació de la configuració",
     "Help" : "Ajuda",
     "Groups meeting these criteria are available in %s:" : "Els grups que compleixen aquests criteris estan disponibles a %s:",
-    "only those object classes:" : "només aquestes classes d'objecte:",
-    "only from those groups:" : "només d'aquests grups",
-    "Edit raw filter instead" : "Edita filtre raw",
-    "Raw LDAP filter" : "Filtre raw LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtre especifica quins grups LDAP haurien de tenir accés a la instància %s.",
-    "groups found" : "grups trobats",
-    "Users login with this attribute:" : "Usuaris acreditats amb aquest atribut:",
-    "LDAP Username:" : "Nom d'usuari LDAP:",
-    "LDAP Email Address:" : "Adreça de correu electrònic LDAP:",
     "Other Attributes:" : "Altres atributs:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Defineix el filtre a aplicar quan s'intenta iniciar la sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió. Per exemple: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Afegeix la configuració del servidor",
-    "Delete Configuration" : "Esborra la configuració",
     "Host" : "Equip remot",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
     "Port" : "Port",
@@ -67,7 +43,6 @@
     "You can specify Base DN for users and groups in the Advanced tab" : "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat",
     "Limit %s access to users meeting these criteria:" : "Limita l'accés a %s usuaris que compleixin amb aquest criteri:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtre especifica quins usuaris LDAP haurien de tenir accés a la instància %s",
-    "users found" : "usuaris trobats",
     "Back" : "Enrera",
     "Continue" : "Continua",
     "Expert" : "Expert",
diff --git a/apps/user_ldap/l10n/cs_CZ.js b/apps/user_ldap/l10n/cs_CZ.js
index 8af26f62def..1b0daba6559 100644
--- a/apps/user_ldap/l10n/cs_CZ.js
+++ b/apps/user_ldap/l10n/cs_CZ.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Neurčena žádná konfigurace",
     "No data specified" : "Neurčena žádná data",
     " Could not set configuration %s" : "Nelze nastavit konfiguraci %s",
-    "Deletion failed" : "Mazání selhalo",
-    "Take over settings from recent server configuration?" : "Převzít nastavení z nedávné konfigurace serveru?",
-    "Keep settings?" : "Ponechat nastavení?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Nelze přidat nastavení serveru",
-    "mappings cleared" : "mapování zrušeno",
-    "Success" : "Úspěch",
-    "Error" : "Chyba",
-    "Please specify a Base DN" : "Uveďte prosím Base DN",
-    "Could not determine Base DN" : "Nelze určit Base DN",
-    "Please specify the port" : "Prosím zadejte port",
-    "Configuration OK" : "Konfigurace v pořádku",
     "Configuration incorrect" : "Nesprávná konfigurace",
     "Configuration incomplete" : "Nekompletní konfigurace",
+    "Configuration OK" : "Konfigurace v pořádku",
     "Select groups" : "Vyberte skupiny",
     "Select object classes" : "Vyberte objektové třídy",
-    "Select attributes" : "Vyberte atributy",
-    "Connection test succeeded" : "Test spojení byl úspěšný",
-    "Connection test failed" : "Test spojení selhal",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Opravdu si přejete smazat současné nastavení serveru?",
     "Confirm Deletion" : "Potvrdit smazání",
+    "Select attributes" : "Vyberte atributy",
     "_%s group found_::_%s groups found_" : ["nalezena %s skupina","nalezeny %s skupiny","nalezeno %s skupin"],
     "_%s user found_::_%s users found_" : ["nalezen %s uživatel","nalezeni %s uživatelé","nalezeno %s uživatelů"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nelze detekovat atribut pro zobrazení jména uživatele. Upřesněte ho prosím sami v rozšířeném nastavení LDAP.",
     "Could not find the desired feature" : "Nelze nalézt požadovanou vlastnost",
     "Invalid Host" : "Neplatný hostitel",
     "Server" : "Server",
-    "User Filter" : "Uživatelský filtr",
-    "Login Filter" : "Přihlašovací filtr",
-    "Group Filter" : "Filtr skupin",
-    "Save" : "Uložit",
+    "Users" : "Uživatelé",
+    "Groups" : "Skupiny",
     "Test Configuration" : "Vyzkoušet nastavení",
     "Help" : "Nápověda",
     "Groups meeting these criteria are available in %s:" : "Skupiny splňující tyto podmínky jsou k dispozici v %s:",
-    "only those object classes:" : "pouze tyto objektové třídy:",
-    "only from those groups:" : "pouze z těchto skupin:",
-    "Edit raw filter instead" : "Edituj filtr přímo",
-    "Raw LDAP filter" : "Původní filtr LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
     "Test Filter" : "Otestovat filtr",
-    "groups found" : "nalezené skupiny",
-    "Users login with this attribute:" : "Uživatelé se přihlašují s tímto atributem:",
-    "LDAP Username:" : "LDAP uživatelské jméno:",
-    "LDAP Email Address:" : "LDAP emailová adresa:",
     "Other Attributes:" : "Další atributy:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Určuje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Přidat nastavení serveru",
-    "Delete Configuration" : "Odstranit konfiguraci",
     "Host" : "Počítač",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučeno pro obsáhlé adresáře)",
     "Limit %s access to users meeting these criteria:" : "Omezit přístup %s uživatelům splňujícím tyto podmínky:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
-    "users found" : "nalezení uživatelé",
     "Saving" : "Ukládá se",
     "Back" : "Zpět",
     "Continue" : "Pokračovat",
diff --git a/apps/user_ldap/l10n/cs_CZ.json b/apps/user_ldap/l10n/cs_CZ.json
index 2831a5689d6..44f27988475 100644
--- a/apps/user_ldap/l10n/cs_CZ.json
+++ b/apps/user_ldap/l10n/cs_CZ.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Neurčena žádná konfigurace",
     "No data specified" : "Neurčena žádná data",
     " Could not set configuration %s" : "Nelze nastavit konfiguraci %s",
-    "Deletion failed" : "Mazání selhalo",
-    "Take over settings from recent server configuration?" : "Převzít nastavení z nedávné konfigurace serveru?",
-    "Keep settings?" : "Ponechat nastavení?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Nelze přidat nastavení serveru",
-    "mappings cleared" : "mapování zrušeno",
-    "Success" : "Úspěch",
-    "Error" : "Chyba",
-    "Please specify a Base DN" : "Uveďte prosím Base DN",
-    "Could not determine Base DN" : "Nelze určit Base DN",
-    "Please specify the port" : "Prosím zadejte port",
-    "Configuration OK" : "Konfigurace v pořádku",
     "Configuration incorrect" : "Nesprávná konfigurace",
     "Configuration incomplete" : "Nekompletní konfigurace",
+    "Configuration OK" : "Konfigurace v pořádku",
     "Select groups" : "Vyberte skupiny",
     "Select object classes" : "Vyberte objektové třídy",
-    "Select attributes" : "Vyberte atributy",
-    "Connection test succeeded" : "Test spojení byl úspěšný",
-    "Connection test failed" : "Test spojení selhal",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Opravdu si přejete smazat současné nastavení serveru?",
     "Confirm Deletion" : "Potvrdit smazání",
+    "Select attributes" : "Vyberte atributy",
     "_%s group found_::_%s groups found_" : ["nalezena %s skupina","nalezeny %s skupiny","nalezeno %s skupin"],
     "_%s user found_::_%s users found_" : ["nalezen %s uživatel","nalezeni %s uživatelé","nalezeno %s uživatelů"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nelze detekovat atribut pro zobrazení jména uživatele. Upřesněte ho prosím sami v rozšířeném nastavení LDAP.",
     "Could not find the desired feature" : "Nelze nalézt požadovanou vlastnost",
     "Invalid Host" : "Neplatný hostitel",
     "Server" : "Server",
-    "User Filter" : "Uživatelský filtr",
-    "Login Filter" : "Přihlašovací filtr",
-    "Group Filter" : "Filtr skupin",
-    "Save" : "Uložit",
+    "Users" : "Uživatelé",
+    "Groups" : "Skupiny",
     "Test Configuration" : "Vyzkoušet nastavení",
     "Help" : "Nápověda",
     "Groups meeting these criteria are available in %s:" : "Skupiny splňující tyto podmínky jsou k dispozici v %s:",
-    "only those object classes:" : "pouze tyto objektové třídy:",
-    "only from those groups:" : "pouze z těchto skupin:",
-    "Edit raw filter instead" : "Edituj filtr přímo",
-    "Raw LDAP filter" : "Původní filtr LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
     "Test Filter" : "Otestovat filtr",
-    "groups found" : "nalezené skupiny",
-    "Users login with this attribute:" : "Uživatelé se přihlašují s tímto atributem:",
-    "LDAP Username:" : "LDAP uživatelské jméno:",
-    "LDAP Email Address:" : "LDAP emailová adresa:",
     "Other Attributes:" : "Další atributy:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Určuje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Přidat nastavení serveru",
-    "Delete Configuration" : "Odstranit konfiguraci",
     "Host" : "Počítač",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučeno pro obsáhlé adresáře)",
     "Limit %s access to users meeting these criteria:" : "Omezit přístup %s uživatelům splňujícím tyto podmínky:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
-    "users found" : "nalezení uživatelé",
     "Saving" : "Ukládá se",
     "Back" : "Zpět",
     "Continue" : "Pokračovat",
diff --git a/apps/user_ldap/l10n/cy_GB.js b/apps/user_ldap/l10n/cy_GB.js
index 95242960eff..3d47b3b4e66 100644
--- a/apps/user_ldap/l10n/cy_GB.js
+++ b/apps/user_ldap/l10n/cy_GB.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Methwyd dileu",
-    "Error" : "Gwall",
-    "Save" : "Cadw",
+    "Users" : "Defnyddwyr",
+    "Groups" : "Grwpiau",
     "Help" : "Cymorth",
     "Password" : "Cyfrinair",
     "Advanced" : "Uwch"
diff --git a/apps/user_ldap/l10n/cy_GB.json b/apps/user_ldap/l10n/cy_GB.json
index fccfbf1fb5d..8140e36f49d 100644
--- a/apps/user_ldap/l10n/cy_GB.json
+++ b/apps/user_ldap/l10n/cy_GB.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "Methwyd dileu",
-    "Error" : "Gwall",
-    "Save" : "Cadw",
+    "Users" : "Defnyddwyr",
+    "Groups" : "Grwpiau",
     "Help" : "Cymorth",
     "Password" : "Cyfrinair",
     "Advanced" : "Uwch"
diff --git a/apps/user_ldap/l10n/da.js b/apps/user_ldap/l10n/da.js
index aecaa21a614..6db29699fcf 100644
--- a/apps/user_ldap/l10n/da.js
+++ b/apps/user_ldap/l10n/da.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Der er ikke angivet en konfiguration",
     "No data specified" : "Der er ikke angivet data",
     " Could not set configuration %s" : "Kunne ikke indstille konfigurationen %s",
-    "Deletion failed" : "Fejl ved sletning",
-    "Take over settings from recent server configuration?" : "Overtag indstillinger fra nylig server konfiguration? ",
-    "Keep settings?" : "Behold indstillinger?",
-    "{nthServer}. Server" : "{nthServer}. server",
-    "Cannot add server configuration" : "Kan ikke tilføje serverkonfiguration",
-    "mappings cleared" : "forbindelser blev ryddet",
-    "Success" : "Succes",
-    "Error" : "Fejl",
-    "Please specify a Base DN" : "Angiv venligst en Base DN",
-    "Could not determine Base DN" : "Kunne ikke fastslå Base DN",
-    "Please specify the port" : "Angiv venligst porten",
-    "Configuration OK" : "Konfigurationen er OK",
     "Configuration incorrect" : "Konfigurationen er ikke korrekt",
     "Configuration incomplete" : "Konfigurationen er ikke komplet",
+    "Configuration OK" : "Konfigurationen er OK",
     "Select groups" : "Vælg grupper",
     "Select object classes" : "Vælg objektklasser",
-    "Select attributes" : "Vælg attributter",
-    "Connection test succeeded" : "Forbindelsestesten lykkedes",
-    "Connection test failed" : "Forbindelsestesten mislykkedes",
+    "{nthServer}. Server" : "{nthServer}. server",
     "Do you really want to delete the current Server Configuration?" : "Ønsker du virkelig at slette den nuværende Server Konfiguration?",
     "Confirm Deletion" : "Bekræft Sletning",
+    "Select attributes" : "Vælg attributter",
     "_%s group found_::_%s groups found_" : ["Der blev fundet %s gruppe","Der blev fundet %s grupper"],
     "_%s user found_::_%s users found_" : ["Der blev fundet %s bruger","Der blev fundet %s brugere"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunne ikke registrere navneattributten for visning af bruger. Angiv den venligst selv i de avancerede ldap-indstillinger.",
     "Could not find the desired feature" : "Fandt ikke den ønskede funktion",
     "Invalid Host" : "Ugyldig vært",
     "Server" : "Server",
-    "User Filter" : "Brugerfilter",
-    "Login Filter" : "Login-filter",
-    "Group Filter" : "Gruppe Filter",
-    "Save" : "Gem",
+    "Users" : "Brugere",
+    "Groups" : "Grupper",
     "Test Configuration" : "Test Konfiguration",
     "Help" : "Hjælp",
     "Groups meeting these criteria are available in %s:" : "Grupper som opfylder disse kriterier er tilgængelige i %s:",
-    "only those object classes:" : "kun disse objektklasser:",
-    "only from those groups:" : "kun fra disse grupper:",
-    "Edit raw filter instead" : "Redigér rå filter i stedet",
-    "Raw LDAP filter" : "Råt LDAP-filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filteret angiver hvilke LDAP-grupper, der skal have adgang til instansen %s.",
     "Test Filter" : "Test filter",
-    "groups found" : "grupper blev fundet",
-    "Users login with this attribute:" : "Brugeres login med dette attribut:",
-    "LDAP Username:" : "LDAP-brugernavn:",
-    "LDAP Email Address:" : "LDAP e-mailadresse:",
     "Other Attributes:" : "Andre attributter:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer dét filter der anvendes, når der er forsøg på at logge ind. %%uuid erstattter brugernavnet i login-handlingen. Eksempel: \"uid=%%uuid\"",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
-    "Add Server Configuration" : "Tilføj Server Konfiguration",
-    "Delete Configuration" : "Slet konfiguration",
     "Host" : "Vært",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Angiv LDAP-filtre manuelt (anbefales til større kataloger)",
     "Limit %s access to users meeting these criteria:" : "Begræns %s-adgangen til brugere som imødekommer disse kriterier:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret angiver hvilke LDAP-brugere, der skal have adgang til %s-instansen.",
-    "users found" : "brugere blev fundet",
     "Saving" : "Gemmer",
     "Back" : "Tilbage",
     "Continue" : "Videre",
diff --git a/apps/user_ldap/l10n/da.json b/apps/user_ldap/l10n/da.json
index 817af6fa381..ffbc502f76b 100644
--- a/apps/user_ldap/l10n/da.json
+++ b/apps/user_ldap/l10n/da.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Der er ikke angivet en konfiguration",
     "No data specified" : "Der er ikke angivet data",
     " Could not set configuration %s" : "Kunne ikke indstille konfigurationen %s",
-    "Deletion failed" : "Fejl ved sletning",
-    "Take over settings from recent server configuration?" : "Overtag indstillinger fra nylig server konfiguration? ",
-    "Keep settings?" : "Behold indstillinger?",
-    "{nthServer}. Server" : "{nthServer}. server",
-    "Cannot add server configuration" : "Kan ikke tilføje serverkonfiguration",
-    "mappings cleared" : "forbindelser blev ryddet",
-    "Success" : "Succes",
-    "Error" : "Fejl",
-    "Please specify a Base DN" : "Angiv venligst en Base DN",
-    "Could not determine Base DN" : "Kunne ikke fastslå Base DN",
-    "Please specify the port" : "Angiv venligst porten",
-    "Configuration OK" : "Konfigurationen er OK",
     "Configuration incorrect" : "Konfigurationen er ikke korrekt",
     "Configuration incomplete" : "Konfigurationen er ikke komplet",
+    "Configuration OK" : "Konfigurationen er OK",
     "Select groups" : "Vælg grupper",
     "Select object classes" : "Vælg objektklasser",
-    "Select attributes" : "Vælg attributter",
-    "Connection test succeeded" : "Forbindelsestesten lykkedes",
-    "Connection test failed" : "Forbindelsestesten mislykkedes",
+    "{nthServer}. Server" : "{nthServer}. server",
     "Do you really want to delete the current Server Configuration?" : "Ønsker du virkelig at slette den nuværende Server Konfiguration?",
     "Confirm Deletion" : "Bekræft Sletning",
+    "Select attributes" : "Vælg attributter",
     "_%s group found_::_%s groups found_" : ["Der blev fundet %s gruppe","Der blev fundet %s grupper"],
     "_%s user found_::_%s users found_" : ["Der blev fundet %s bruger","Der blev fundet %s brugere"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunne ikke registrere navneattributten for visning af bruger. Angiv den venligst selv i de avancerede ldap-indstillinger.",
     "Could not find the desired feature" : "Fandt ikke den ønskede funktion",
     "Invalid Host" : "Ugyldig vært",
     "Server" : "Server",
-    "User Filter" : "Brugerfilter",
-    "Login Filter" : "Login-filter",
-    "Group Filter" : "Gruppe Filter",
-    "Save" : "Gem",
+    "Users" : "Brugere",
+    "Groups" : "Grupper",
     "Test Configuration" : "Test Konfiguration",
     "Help" : "Hjælp",
     "Groups meeting these criteria are available in %s:" : "Grupper som opfylder disse kriterier er tilgængelige i %s:",
-    "only those object classes:" : "kun disse objektklasser:",
-    "only from those groups:" : "kun fra disse grupper:",
-    "Edit raw filter instead" : "Redigér rå filter i stedet",
-    "Raw LDAP filter" : "Råt LDAP-filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filteret angiver hvilke LDAP-grupper, der skal have adgang til instansen %s.",
     "Test Filter" : "Test filter",
-    "groups found" : "grupper blev fundet",
-    "Users login with this attribute:" : "Brugeres login med dette attribut:",
-    "LDAP Username:" : "LDAP-brugernavn:",
-    "LDAP Email Address:" : "LDAP e-mailadresse:",
     "Other Attributes:" : "Andre attributter:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer dét filter der anvendes, når der er forsøg på at logge ind. %%uuid erstattter brugernavnet i login-handlingen. Eksempel: \"uid=%%uuid\"",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
-    "Add Server Configuration" : "Tilføj Server Konfiguration",
-    "Delete Configuration" : "Slet konfiguration",
     "Host" : "Vært",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Angiv LDAP-filtre manuelt (anbefales til større kataloger)",
     "Limit %s access to users meeting these criteria:" : "Begræns %s-adgangen til brugere som imødekommer disse kriterier:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret angiver hvilke LDAP-brugere, der skal have adgang til %s-instansen.",
-    "users found" : "brugere blev fundet",
     "Saving" : "Gemmer",
     "Back" : "Tilbage",
     "Continue" : "Videre",
diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js
index ab9f2b65527..e77e664d904 100644
--- a/apps/user_ldap/l10n/de.js
+++ b/apps/user_ldap/l10n/de.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Keine Konfiguration angegeben",
     "No data specified" : "Keine Daten angegeben",
     " Could not set configuration %s" : "Die Konfiguration %s konnte nicht gesetzt werden",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
-    "Keep settings?" : "Einstellungen beibehalten?",
-    "{nthServer}. Server" : "{nthServer}. - Server",
-    "Cannot add server configuration" : "Die Serverkonfiguration kann nicht hinzugefügt werden",
-    "mappings cleared" : "Zuordnungen gelöscht",
-    "Success" : "Erfolgreich",
-    "Error" : "Fehler",
-    "Please specify a Base DN" : "Bitte einen Basis-DN angeben",
-    "Could not determine Base DN" : "Basis-DN konnte nicht ermittelt werden",
-    "Please specify the port" : "Bitte Port angeben",
-    "Configuration OK" : "Konfiguration OK",
     "Configuration incorrect" : "Konfiguration nicht korrekt",
     "Configuration incomplete" : "Konfiguration nicht vollständig",
+    "Configuration OK" : "Konfiguration OK",
     "Select groups" : "Gruppen auswählen",
     "Select object classes" : "Objektklassen auswählen",
-    "Select attributes" : "Attribute auswählen",
-    "Connection test succeeded" : "Verbindungstest erfolgreich",
-    "Connection test failed" : "Verbindungstest fehlgeschlagen",
+    "{nthServer}. Server" : "{nthServer}. - Server",
     "Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Select attributes" : "Attribute auswählen",
     "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
     "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Das Anzeigename-Attribut des Benutzers konnte nicht gefunden werden. Bitte gib es in den erweiterten LDAP-Einstellungen selber an.",
     "Could not find the desired feature" : "Die gewünschte Funktion konnte nicht gefunden werden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
-    "User Filter" : "Nutzer-Filter",
-    "Login Filter" : "Anmeldefilter",
-    "Group Filter" : "Gruppen-Filter",
-    "Save" : "Speichern",
+    "Users" : "Benutzer",
+    "Groups" : "Gruppen",
     "Test Configuration" : "Testkonfiguration",
     "Help" : "Hilfe",
     "Groups meeting these criteria are available in %s:" : "Gruppen, auf die diese Kriterien zutreffen, sind verfügbar in %s:",
-    "only those object classes:" : "Nur diese Objektklassen:",
-    "only from those groups:" : "Nur aus diesen Gruppen:",
-    "Edit raw filter instead" : "Original-Filter stattdessen bearbeiten",
-    "Raw LDAP filter" : "Original LDAP-Filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter bestimmt, welche LDAP-Gruppen Zugriff auf die %s-Instanz haben sollen.",
     "Test Filter" : "Testfilter",
-    "groups found" : "Gruppen gefunden",
-    "Users login with this attribute:" : "Nutzeranmeldung mit diesem Attribut:",
-    "LDAP Username:" : "LDAP-Benutzername:",
-    "LDAP Email Address:" : "LDAP-E-Mail-Adresse:",
     "Other Attributes:" : "Andere Attribute:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
-    "Delete Configuration" : "Konfiguration löschen",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://",
     "Port" : "Port",
@@ -68,12 +44,11 @@ OC.L10N.register(
     "Password" : "Passwort",
     "For anonymous access, leave DN and Password empty." : "Lasse die Felder DN und Passwort für anonymen Zugang leer.",
     "One Base DN per line" : "Einen Basis-DN pro Zeile",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Du kannst Basis-DN für Benutzer und Gruppen im „Erweitert“-Reiter angeben",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Du kannst die Basis-DN für Benutzer und Gruppen im Reiter „Fortgeschritten“ angeben",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.",
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)",
     "Limit %s access to users meeting these criteria:" : "Den %s-Zugriff auf Benutzer, die den folgenden Kriterien entsprechen, beschränken:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.",
-    "users found" : "Benutzer gefunden",
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json
index a5dc44d91b1..407e5bb73d4 100644
--- a/apps/user_ldap/l10n/de.json
+++ b/apps/user_ldap/l10n/de.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Keine Konfiguration angegeben",
     "No data specified" : "Keine Daten angegeben",
     " Could not set configuration %s" : "Die Konfiguration %s konnte nicht gesetzt werden",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
-    "Keep settings?" : "Einstellungen beibehalten?",
-    "{nthServer}. Server" : "{nthServer}. - Server",
-    "Cannot add server configuration" : "Die Serverkonfiguration kann nicht hinzugefügt werden",
-    "mappings cleared" : "Zuordnungen gelöscht",
-    "Success" : "Erfolgreich",
-    "Error" : "Fehler",
-    "Please specify a Base DN" : "Bitte einen Basis-DN angeben",
-    "Could not determine Base DN" : "Basis-DN konnte nicht ermittelt werden",
-    "Please specify the port" : "Bitte Port angeben",
-    "Configuration OK" : "Konfiguration OK",
     "Configuration incorrect" : "Konfiguration nicht korrekt",
     "Configuration incomplete" : "Konfiguration nicht vollständig",
+    "Configuration OK" : "Konfiguration OK",
     "Select groups" : "Gruppen auswählen",
     "Select object classes" : "Objektklassen auswählen",
-    "Select attributes" : "Attribute auswählen",
-    "Connection test succeeded" : "Verbindungstest erfolgreich",
-    "Connection test failed" : "Verbindungstest fehlgeschlagen",
+    "{nthServer}. Server" : "{nthServer}. - Server",
     "Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Select attributes" : "Attribute auswählen",
     "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
     "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Das Anzeigename-Attribut des Benutzers konnte nicht gefunden werden. Bitte gib es in den erweiterten LDAP-Einstellungen selber an.",
     "Could not find the desired feature" : "Die gewünschte Funktion konnte nicht gefunden werden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
-    "User Filter" : "Nutzer-Filter",
-    "Login Filter" : "Anmeldefilter",
-    "Group Filter" : "Gruppen-Filter",
-    "Save" : "Speichern",
+    "Users" : "Benutzer",
+    "Groups" : "Gruppen",
     "Test Configuration" : "Testkonfiguration",
     "Help" : "Hilfe",
     "Groups meeting these criteria are available in %s:" : "Gruppen, auf die diese Kriterien zutreffen, sind verfügbar in %s:",
-    "only those object classes:" : "Nur diese Objektklassen:",
-    "only from those groups:" : "Nur aus diesen Gruppen:",
-    "Edit raw filter instead" : "Original-Filter stattdessen bearbeiten",
-    "Raw LDAP filter" : "Original LDAP-Filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter bestimmt, welche LDAP-Gruppen Zugriff auf die %s-Instanz haben sollen.",
     "Test Filter" : "Testfilter",
-    "groups found" : "Gruppen gefunden",
-    "Users login with this attribute:" : "Nutzeranmeldung mit diesem Attribut:",
-    "LDAP Username:" : "LDAP-Benutzername:",
-    "LDAP Email Address:" : "LDAP-E-Mail-Adresse:",
     "Other Attributes:" : "Andere Attribute:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
-    "Delete Configuration" : "Konfiguration löschen",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://",
     "Port" : "Port",
@@ -66,12 +42,11 @@
     "Password" : "Passwort",
     "For anonymous access, leave DN and Password empty." : "Lasse die Felder DN und Passwort für anonymen Zugang leer.",
     "One Base DN per line" : "Einen Basis-DN pro Zeile",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Du kannst Basis-DN für Benutzer und Gruppen im „Erweitert“-Reiter angeben",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Du kannst die Basis-DN für Benutzer und Gruppen im Reiter „Fortgeschritten“ angeben",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.",
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)",
     "Limit %s access to users meeting these criteria:" : "Den %s-Zugriff auf Benutzer, die den folgenden Kriterien entsprechen, beschränken:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.",
-    "users found" : "Benutzer gefunden",
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
diff --git a/apps/user_ldap/l10n/de_AT.js b/apps/user_ldap/l10n/de_AT.js
index b7f72cb5bc9..5695ad9c987 100644
--- a/apps/user_ldap/l10n/de_AT.js
+++ b/apps/user_ldap/l10n/de_AT.js
@@ -10,48 +10,25 @@ OC.L10N.register(
     "No configuration specified" : "Keine Konfiguration angegeben",
     "No data specified" : "Keine Daten angegeben",
     " Could not set configuration %s" : "Konfiguration %s konnte nicht gespeichert werden",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Server-Einstellungen von letztem Server übernehmen?",
-    "Keep settings?" : "Einstellungen behalten?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Server-Konfiguration konnte nicht hinzugefügt werden",
-    "mappings cleared" : "Verbindungen gelöscht",
-    "Success" : "Erfolg",
-    "Error" : "Fehler",
-    "Please specify a Base DN" : "Bitte einen Basis DN angeben",
-    "Could not determine Base DN" : "Basis DN konnte nicht festgelegt werden",
-    "Please specify the port" : "Bitte den Port angeben",
-    "Configuration OK" : "Konfiguration OK",
     "Configuration incorrect" : "Konfiguration fehlerhaft",
     "Configuration incomplete" : "Konfiguration unvollständig",
+    "Configuration OK" : "Konfiguration OK",
     "Select groups" : "Gruppen wählen",
     "Select object classes" : "Objekt-Klassen wählen",
-    "Select attributes" : "Attribute wählen",
-    "Connection test succeeded" : "Verbindungsversuch erfolgreich",
-    "Connection test failed" : "Verbindungsversuch gescheitert",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Soll die momentane Server-Konfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Select attributes" : "Attribute wählen",
     "Could not find the desired feature" : "Funktion konnte nicht gefunden werden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
-    "User Filter" : "User Filter",
-    "Login Filter" : "Login Filter",
-    "Group Filter" : "Gruppen FIlter",
-    "Save" : "Speichern",
     "Test Configuration" : "Konfiguration testen",
     "Help" : "Hilfe",
     "Groups meeting these criteria are available in %s:" : "Gruppen die den Kriterien entsprechen sind verfügbar unter %s:",
-    "only those object classes:" : "nur diese Objektklassen:",
-    "only from those groups:" : "nur von diesen Gruppen:",
-    "groups found" : "Gruppen gefunden",
-    "LDAP Username:" : "LDAP Benutzername:",
-    "LDAP Email Address:" : "LDAP Email-Adresse:",
     "Other Attributes:" : "Andere Atribute:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Legt den beim Login verwendeten Filter fest. %%uid ersetzt den Benutzernamen beim Login. Beispiel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Server-Konfiguration hinzufügen",
-    "Delete Configuration" : "Konfiguration löschen",
     "Host" : "Host",
     "Port" : "Port",
     "User DN" : "User DN",
@@ -61,7 +38,6 @@ OC.L10N.register(
     "You can specify Base DN for users and groups in the Advanced tab" : "Basis DN für User und Gruppen können im Fortgeschritten-Tab festgelegt werden",
     "Limit %s access to users meeting these criteria:" : "Zugang auf %s für User die diese Kriterien erfüllen limitieren:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter spezifiziert welche LDAP User Zugang zu %s haben.",
-    "users found" : "User gefunden",
     "Back" : "Zurück",
     "Continue" : "Weiter",
     "Expert" : "Experte",
diff --git a/apps/user_ldap/l10n/de_AT.json b/apps/user_ldap/l10n/de_AT.json
index b6b305659c0..f9aabf1e4d4 100644
--- a/apps/user_ldap/l10n/de_AT.json
+++ b/apps/user_ldap/l10n/de_AT.json
@@ -8,48 +8,25 @@
     "No configuration specified" : "Keine Konfiguration angegeben",
     "No data specified" : "Keine Daten angegeben",
     " Could not set configuration %s" : "Konfiguration %s konnte nicht gespeichert werden",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Server-Einstellungen von letztem Server übernehmen?",
-    "Keep settings?" : "Einstellungen behalten?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Server-Konfiguration konnte nicht hinzugefügt werden",
-    "mappings cleared" : "Verbindungen gelöscht",
-    "Success" : "Erfolg",
-    "Error" : "Fehler",
-    "Please specify a Base DN" : "Bitte einen Basis DN angeben",
-    "Could not determine Base DN" : "Basis DN konnte nicht festgelegt werden",
-    "Please specify the port" : "Bitte den Port angeben",
-    "Configuration OK" : "Konfiguration OK",
     "Configuration incorrect" : "Konfiguration fehlerhaft",
     "Configuration incomplete" : "Konfiguration unvollständig",
+    "Configuration OK" : "Konfiguration OK",
     "Select groups" : "Gruppen wählen",
     "Select object classes" : "Objekt-Klassen wählen",
-    "Select attributes" : "Attribute wählen",
-    "Connection test succeeded" : "Verbindungsversuch erfolgreich",
-    "Connection test failed" : "Verbindungsversuch gescheitert",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Soll die momentane Server-Konfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Select attributes" : "Attribute wählen",
     "Could not find the desired feature" : "Funktion konnte nicht gefunden werden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
-    "User Filter" : "User Filter",
-    "Login Filter" : "Login Filter",
-    "Group Filter" : "Gruppen FIlter",
-    "Save" : "Speichern",
     "Test Configuration" : "Konfiguration testen",
     "Help" : "Hilfe",
     "Groups meeting these criteria are available in %s:" : "Gruppen die den Kriterien entsprechen sind verfügbar unter %s:",
-    "only those object classes:" : "nur diese Objektklassen:",
-    "only from those groups:" : "nur von diesen Gruppen:",
-    "groups found" : "Gruppen gefunden",
-    "LDAP Username:" : "LDAP Benutzername:",
-    "LDAP Email Address:" : "LDAP Email-Adresse:",
     "Other Attributes:" : "Andere Atribute:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Legt den beim Login verwendeten Filter fest. %%uid ersetzt den Benutzernamen beim Login. Beispiel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Server-Konfiguration hinzufügen",
-    "Delete Configuration" : "Konfiguration löschen",
     "Host" : "Host",
     "Port" : "Port",
     "User DN" : "User DN",
@@ -59,7 +36,6 @@
     "You can specify Base DN for users and groups in the Advanced tab" : "Basis DN für User und Gruppen können im Fortgeschritten-Tab festgelegt werden",
     "Limit %s access to users meeting these criteria:" : "Zugang auf %s für User die diese Kriterien erfüllen limitieren:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter spezifiziert welche LDAP User Zugang zu %s haben.",
-    "users found" : "User gefunden",
     "Back" : "Zurück",
     "Continue" : "Weiter",
     "Expert" : "Experte",
diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js
index 7690d619cd0..3290e715673 100644
--- a/apps/user_ldap/l10n/de_DE.js
+++ b/apps/user_ldap/l10n/de_DE.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Keine Konfiguration angegeben",
     "No data specified" : "Keine Daten angegeben",
     " Could not set configuration %s" : "Die Konfiguration %s konnte nicht gesetzt werden",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
-    "Keep settings?" : "Einstellungen beibehalten?",
-    "{nthServer}. Server" : "{nthServer}. - Server",
-    "Cannot add server configuration" : "Die Serverkonfiguration kann nicht hinzugefügt werden",
-    "mappings cleared" : "Zuordnungen gelöscht",
-    "Success" : "Erfolg",
-    "Error" : "Fehler",
-    "Please specify a Base DN" : "Bitte einen Basis-DN angeben",
-    "Could not determine Base DN" : "Basis-DN konnte nicht ermittelt werden",
-    "Please specify the port" : "Bitte Port angeben",
-    "Configuration OK" : "Konfiguration OK",
     "Configuration incorrect" : "Konfiguration nicht korrekt",
     "Configuration incomplete" : "Konfiguration nicht vollständig",
+    "Configuration OK" : "Konfiguration OK",
     "Select groups" : "Gruppen auswählen",
     "Select object classes" : "Objektklassen auswählen",
-    "Select attributes" : "Attribute auswählen",
-    "Connection test succeeded" : "Verbindungstest erfolgreich",
-    "Connection test failed" : "Verbindungstest fehlgeschlagen",
+    "{nthServer}. Server" : "{nthServer}. - Server",
     "Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Select attributes" : "Attribute auswählen",
     "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
     "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Das Anzeigename-Attribut des Benutzers konnte nicht gefunden werden. Bitte geben Sie es in den erweiterten LDAP-Einstellungen selber an.",
     "Could not find the desired feature" : "Die gewünschte Funktion konnte nicht gefunden werden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
-    "User Filter" : "Benutzer-Filter",
-    "Login Filter" : "Anmeldefilter",
-    "Group Filter" : "Gruppen-Filter",
-    "Save" : "Speichern",
+    "Users" : "Benutzer",
+    "Groups" : "Gruppen",
     "Test Configuration" : "Testkonfiguration",
     "Help" : "Hilfe",
     "Groups meeting these criteria are available in %s:" : "Gruppen, auf die diese Kriterien zutreffen, sind verfügbar in %s:",
-    "only those object classes:" : "Nur diese Objektklassen:",
-    "only from those groups:" : "Nur aus diesen Gruppen:",
-    "Edit raw filter instead" : "Original-Filter stattdessen bearbeiten",
-    "Raw LDAP filter" : "Original LDAP-Filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter bestimmt, welche LDAP-Gruppen Zugriff auf die %s-Instanz haben sollen.",
     "Test Filter" : "Testfilter",
-    "groups found" : "Gruppen gefunden",
-    "Users login with this attribute:" : "Benutzeranmeldung mit diesem Attribut:",
-    "LDAP Username:" : "LDAP-Benutzername:",
-    "LDAP Email Address:" : "LDAP-E-Mail-Adresse:",
     "Other Attributes:" : "Andere Attribute:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
-    "Delete Configuration" : "Konfiguration löschen",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
     "Port" : "Port",
@@ -68,19 +44,18 @@ OC.L10N.register(
     "Password" : "Passwort",
     "For anonymous access, leave DN and Password empty." : "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
     "One Base DN per line" : "Einen Basis-DN pro Zeile",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Sie können Basis-DN für Benutzer und Gruppen im „Erweitert“-Reiter angeben",
+    "You can specify Base DN for users and groups in the Advanced tab" : " Sie können die Basis-DN für Benutzer und Gruppen im Reiter „Fortgeschritten“ angeben",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.",
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)",
     "Limit %s access to users meeting these criteria:" : "Den %s-Zugriff auf Benutzer, die den folgenden Kriterien entsprechen, beschränken:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.",
-    "users found" : "Benutzer gefunden",
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
     "LDAP" : "LDAP",
     "Expert" : "Experte",
     "Advanced" : "Fortgeschritten",
-    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann deshalb zu unerwartetem Systemverhalten kommen. Bitten kontaktieren Sie Ihren Systemadministator und bitten Sie um die Deaktivierung einer der beiden Anwendungen.",
+    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann deshalb zu unerwartetem Systemverhalten kommen. Bitte kontaktieren Sie Ihren Systemadministator und bitten Sie um die Deaktivierung einer der beiden Anwendungen.",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte kontaktieren Sie Ihren Systemadministrator und bitten Sie um die Installation des Moduls.",
     "Connection Settings" : "Verbindungseinstellungen",
     "Configuration Active" : "Konfiguration aktiv",
diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json
index bdd5393bded..3467cbc6082 100644
--- a/apps/user_ldap/l10n/de_DE.json
+++ b/apps/user_ldap/l10n/de_DE.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Keine Konfiguration angegeben",
     "No data specified" : "Keine Daten angegeben",
     " Could not set configuration %s" : "Die Konfiguration %s konnte nicht gesetzt werden",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
-    "Keep settings?" : "Einstellungen beibehalten?",
-    "{nthServer}. Server" : "{nthServer}. - Server",
-    "Cannot add server configuration" : "Die Serverkonfiguration kann nicht hinzugefügt werden",
-    "mappings cleared" : "Zuordnungen gelöscht",
-    "Success" : "Erfolg",
-    "Error" : "Fehler",
-    "Please specify a Base DN" : "Bitte einen Basis-DN angeben",
-    "Could not determine Base DN" : "Basis-DN konnte nicht ermittelt werden",
-    "Please specify the port" : "Bitte Port angeben",
-    "Configuration OK" : "Konfiguration OK",
     "Configuration incorrect" : "Konfiguration nicht korrekt",
     "Configuration incomplete" : "Konfiguration nicht vollständig",
+    "Configuration OK" : "Konfiguration OK",
     "Select groups" : "Gruppen auswählen",
     "Select object classes" : "Objektklassen auswählen",
-    "Select attributes" : "Attribute auswählen",
-    "Connection test succeeded" : "Verbindungstest erfolgreich",
-    "Connection test failed" : "Verbindungstest fehlgeschlagen",
+    "{nthServer}. Server" : "{nthServer}. - Server",
     "Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Select attributes" : "Attribute auswählen",
     "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
     "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Das Anzeigename-Attribut des Benutzers konnte nicht gefunden werden. Bitte geben Sie es in den erweiterten LDAP-Einstellungen selber an.",
     "Could not find the desired feature" : "Die gewünschte Funktion konnte nicht gefunden werden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
-    "User Filter" : "Benutzer-Filter",
-    "Login Filter" : "Anmeldefilter",
-    "Group Filter" : "Gruppen-Filter",
-    "Save" : "Speichern",
+    "Users" : "Benutzer",
+    "Groups" : "Gruppen",
     "Test Configuration" : "Testkonfiguration",
     "Help" : "Hilfe",
     "Groups meeting these criteria are available in %s:" : "Gruppen, auf die diese Kriterien zutreffen, sind verfügbar in %s:",
-    "only those object classes:" : "Nur diese Objektklassen:",
-    "only from those groups:" : "Nur aus diesen Gruppen:",
-    "Edit raw filter instead" : "Original-Filter stattdessen bearbeiten",
-    "Raw LDAP filter" : "Original LDAP-Filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter bestimmt, welche LDAP-Gruppen Zugriff auf die %s-Instanz haben sollen.",
     "Test Filter" : "Testfilter",
-    "groups found" : "Gruppen gefunden",
-    "Users login with this attribute:" : "Benutzeranmeldung mit diesem Attribut:",
-    "LDAP Username:" : "LDAP-Benutzername:",
-    "LDAP Email Address:" : "LDAP-E-Mail-Adresse:",
     "Other Attributes:" : "Andere Attribute:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
-    "Delete Configuration" : "Konfiguration löschen",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
     "Port" : "Port",
@@ -66,19 +42,18 @@
     "Password" : "Passwort",
     "For anonymous access, leave DN and Password empty." : "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
     "One Base DN per line" : "Einen Basis-DN pro Zeile",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Sie können Basis-DN für Benutzer und Gruppen im „Erweitert“-Reiter angeben",
+    "You can specify Base DN for users and groups in the Advanced tab" : " Sie können die Basis-DN für Benutzer und Gruppen im Reiter „Fortgeschritten“ angeben",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.",
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)",
     "Limit %s access to users meeting these criteria:" : "Den %s-Zugriff auf Benutzer, die den folgenden Kriterien entsprechen, beschränken:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.",
-    "users found" : "Benutzer gefunden",
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
     "LDAP" : "LDAP",
     "Expert" : "Experte",
     "Advanced" : "Fortgeschritten",
-    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann deshalb zu unerwartetem Systemverhalten kommen. Bitten kontaktieren Sie Ihren Systemadministator und bitten Sie um die Deaktivierung einer der beiden Anwendungen.",
+    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann deshalb zu unerwartetem Systemverhalten kommen. Bitte kontaktieren Sie Ihren Systemadministator und bitten Sie um die Deaktivierung einer der beiden Anwendungen.",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte kontaktieren Sie Ihren Systemadministrator und bitten Sie um die Installation des Moduls.",
     "Connection Settings" : "Verbindungseinstellungen",
     "Configuration Active" : "Konfiguration aktiv",
diff --git a/apps/user_ldap/l10n/el.js b/apps/user_ldap/l10n/el.js
index f19d0023cd4..90d3258234c 100644
--- a/apps/user_ldap/l10n/el.js
+++ b/apps/user_ldap/l10n/el.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Καμμία διαμόρφωση δεν προσδιορίστηκε",
     "No data specified" : "Δεν προσδιορίστηκαν δεδομένα",
     " Could not set configuration %s" : "Αδυναμία ρύθμισης %s",
-    "Deletion failed" : "Η διαγραφή απέτυχε",
-    "Take over settings from recent server configuration?" : "Πάρτε πάνω από τις πρόσφατες ρυθμίσεις διαμόρφωσης του διακομιστή?",
-    "Keep settings?" : "Διατήρηση ρυθμίσεων;",
-    "{nthServer}. Server" : "{nthServer}. Διακομιστής",
-    "Cannot add server configuration" : "Αδυναμία προσθήκης ρυθμίσεων διακομιστή",
-    "mappings cleared" : "αντιστοιχίες εκκαθαρίστηκαν",
-    "Success" : "Επιτυχία",
-    "Error" : "Σφάλμα",
-    "Please specify a Base DN" : "Παρακαλώ ορίστε ένα βασικό Διακεκριμένο Όνομα",
-    "Could not determine Base DN" : "Δεν ήταν δυνατό να καθοριστεί το βασικό Διακεκριμένο Όνομα",
-    "Please specify the port" : "Παρακαλώ ορίστε την θύρα",
-    "Configuration OK" : "Η διαμόρφωση είναι εντάξει",
     "Configuration incorrect" : "Η διαμόρφωση είναι λανθασμένη",
     "Configuration incomplete" : "Η διαμόρφωση είναι ελλιπής",
+    "Configuration OK" : "Η διαμόρφωση είναι εντάξει",
     "Select groups" : "Επιλέξτε ομάδες",
     "Select object classes" : "Επιλογή κλάσης αντικειμένων",
-    "Select attributes" : "Επιλογή χαρακτηριστικών",
-    "Connection test succeeded" : "Επιτυχημένη δοκιμαστική σύνδεση",
-    "Connection test failed" : "Αποτυχημένη δοκιμαστική σύνδεσης.",
+    "{nthServer}. Server" : "{nthServer}. Διακομιστής",
     "Do you really want to delete the current Server Configuration?" : "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
     "Confirm Deletion" : "Επιβεβαίωση Διαγραφής",
+    "Select attributes" : "Επιλογή χαρακτηριστικών",
     "_%s group found_::_%s groups found_" : ["%s ομάδα βρέθηκε","%s ομάδες βρέθηκαν"],
     "_%s user found_::_%s users found_" : ["%s χρήστης βρέθηκε","%s χρήστες βρέθηκαν"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Δεν ήταν δυνατή η ανίχνευση της ιδιότητας του εμφανιζόμενου ονόματος χρήστη . Παρακαλείστε να το προσδιορίσετε στις προηγμένες ρυθμίσεις LDAP",
     "Could not find the desired feature" : "Αδυναμία εύρεσης επιθυμητου χαρακτηριστικού",
     "Invalid Host" : "Άκυρος εξυπηρετητής",
     "Server" : "Διακομιστής",
-    "User Filter" : "Φίλτρο χρηστών",
-    "Login Filter" : "Φίλτρο Εισόδου",
-    "Group Filter" : "Group Filter",
-    "Save" : "Αποθήκευση",
+    "Users" : "Χρήστες",
+    "Groups" : "Ομάδες",
     "Test Configuration" : "Δοκιμαστικες ρυθμισεις",
     "Help" : "Βοήθεια",
     "Groups meeting these criteria are available in %s:" : "Οι ομάδες που πληρούν τα κριτήρια είναι διαθέσιμες σε %s:",
-    "only those object classes:" : "μόνο αυτές οι κλάσεις αντικειμένων:",
-    "only from those groups:" : "μόνο από αυτές τις ομάδες:",
-    "Edit raw filter instead" : "Επεξεργασία πρωτογενούς φίλτρου αντί αυτού",
-    "Raw LDAP filter" : "Πρωτογενές φίλτρο ",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιες ομάδες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
     "Test Filter" : "Φίλτρο Ελέγχου",
-    "groups found" : "ομάδες βρέθηκαν",
-    "Users login with this attribute:" : "Οι χρήστες εισέρχονται με αυτό το χαρακτηριστικό:",
-    "LDAP Username:" : "Όνομα χρήστη LDAP:",
-    "LDAP Email Address:" : "Διεύθυνση ηλ. ταχυδρομείου LDAP:",
     "Other Attributes:" : "Άλλες Ιδιότητες:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Ορίζει το φίλτρο που θα εφαρμοστεί, όταν επιχειριθεί σύνδεση. Το %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. Παράδειγμα: \"uid=%%uid\"",
     "1. Server" : "1. Διακομιστής",
     "%s. Server:" : "%s. Διακομιστής:",
-    "Add Server Configuration" : "Προσθήκη Ρυθμίσεων Διακομιστή",
-    "Delete Configuration" : "Απαλοιφή ρυθμίσεων",
     "Host" : "Διακομιστής",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://",
     "Port" : "Θύρα",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Εισάγετε με μη αυτόματο τρόπο φίλτρα LDAP (προτείνεται για μεγάλους καταλόγους)",
     "Limit %s access to users meeting these criteria:" : "Περιορισμός της πρόσβασης %s σε χρήστες που πληρούν τα κριτήρια:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιοι χρήστες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
-    "users found" : "χρήστες βρέθηκαν",
     "Saving" : "Αποθήκευση",
     "Back" : "Επιστροφή",
     "Continue" : "Συνέχεια",
diff --git a/apps/user_ldap/l10n/el.json b/apps/user_ldap/l10n/el.json
index 49a4813b0a4..b6fbb731b2b 100644
--- a/apps/user_ldap/l10n/el.json
+++ b/apps/user_ldap/l10n/el.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Καμμία διαμόρφωση δεν προσδιορίστηκε",
     "No data specified" : "Δεν προσδιορίστηκαν δεδομένα",
     " Could not set configuration %s" : "Αδυναμία ρύθμισης %s",
-    "Deletion failed" : "Η διαγραφή απέτυχε",
-    "Take over settings from recent server configuration?" : "Πάρτε πάνω από τις πρόσφατες ρυθμίσεις διαμόρφωσης του διακομιστή?",
-    "Keep settings?" : "Διατήρηση ρυθμίσεων;",
-    "{nthServer}. Server" : "{nthServer}. Διακομιστής",
-    "Cannot add server configuration" : "Αδυναμία προσθήκης ρυθμίσεων διακομιστή",
-    "mappings cleared" : "αντιστοιχίες εκκαθαρίστηκαν",
-    "Success" : "Επιτυχία",
-    "Error" : "Σφάλμα",
-    "Please specify a Base DN" : "Παρακαλώ ορίστε ένα βασικό Διακεκριμένο Όνομα",
-    "Could not determine Base DN" : "Δεν ήταν δυνατό να καθοριστεί το βασικό Διακεκριμένο Όνομα",
-    "Please specify the port" : "Παρακαλώ ορίστε την θύρα",
-    "Configuration OK" : "Η διαμόρφωση είναι εντάξει",
     "Configuration incorrect" : "Η διαμόρφωση είναι λανθασμένη",
     "Configuration incomplete" : "Η διαμόρφωση είναι ελλιπής",
+    "Configuration OK" : "Η διαμόρφωση είναι εντάξει",
     "Select groups" : "Επιλέξτε ομάδες",
     "Select object classes" : "Επιλογή κλάσης αντικειμένων",
-    "Select attributes" : "Επιλογή χαρακτηριστικών",
-    "Connection test succeeded" : "Επιτυχημένη δοκιμαστική σύνδεση",
-    "Connection test failed" : "Αποτυχημένη δοκιμαστική σύνδεσης.",
+    "{nthServer}. Server" : "{nthServer}. Διακομιστής",
     "Do you really want to delete the current Server Configuration?" : "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
     "Confirm Deletion" : "Επιβεβαίωση Διαγραφής",
+    "Select attributes" : "Επιλογή χαρακτηριστικών",
     "_%s group found_::_%s groups found_" : ["%s ομάδα βρέθηκε","%s ομάδες βρέθηκαν"],
     "_%s user found_::_%s users found_" : ["%s χρήστης βρέθηκε","%s χρήστες βρέθηκαν"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Δεν ήταν δυνατή η ανίχνευση της ιδιότητας του εμφανιζόμενου ονόματος χρήστη . Παρακαλείστε να το προσδιορίσετε στις προηγμένες ρυθμίσεις LDAP",
     "Could not find the desired feature" : "Αδυναμία εύρεσης επιθυμητου χαρακτηριστικού",
     "Invalid Host" : "Άκυρος εξυπηρετητής",
     "Server" : "Διακομιστής",
-    "User Filter" : "Φίλτρο χρηστών",
-    "Login Filter" : "Φίλτρο Εισόδου",
-    "Group Filter" : "Group Filter",
-    "Save" : "Αποθήκευση",
+    "Users" : "Χρήστες",
+    "Groups" : "Ομάδες",
     "Test Configuration" : "Δοκιμαστικες ρυθμισεις",
     "Help" : "Βοήθεια",
     "Groups meeting these criteria are available in %s:" : "Οι ομάδες που πληρούν τα κριτήρια είναι διαθέσιμες σε %s:",
-    "only those object classes:" : "μόνο αυτές οι κλάσεις αντικειμένων:",
-    "only from those groups:" : "μόνο από αυτές τις ομάδες:",
-    "Edit raw filter instead" : "Επεξεργασία πρωτογενούς φίλτρου αντί αυτού",
-    "Raw LDAP filter" : "Πρωτογενές φίλτρο ",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιες ομάδες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
     "Test Filter" : "Φίλτρο Ελέγχου",
-    "groups found" : "ομάδες βρέθηκαν",
-    "Users login with this attribute:" : "Οι χρήστες εισέρχονται με αυτό το χαρακτηριστικό:",
-    "LDAP Username:" : "Όνομα χρήστη LDAP:",
-    "LDAP Email Address:" : "Διεύθυνση ηλ. ταχυδρομείου LDAP:",
     "Other Attributes:" : "Άλλες Ιδιότητες:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Ορίζει το φίλτρο που θα εφαρμοστεί, όταν επιχειριθεί σύνδεση. Το %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. Παράδειγμα: \"uid=%%uid\"",
     "1. Server" : "1. Διακομιστής",
     "%s. Server:" : "%s. Διακομιστής:",
-    "Add Server Configuration" : "Προσθήκη Ρυθμίσεων Διακομιστή",
-    "Delete Configuration" : "Απαλοιφή ρυθμίσεων",
     "Host" : "Διακομιστής",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://",
     "Port" : "Θύρα",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Εισάγετε με μη αυτόματο τρόπο φίλτρα LDAP (προτείνεται για μεγάλους καταλόγους)",
     "Limit %s access to users meeting these criteria:" : "Περιορισμός της πρόσβασης %s σε χρήστες που πληρούν τα κριτήρια:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιοι χρήστες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
-    "users found" : "χρήστες βρέθηκαν",
     "Saving" : "Αποθήκευση",
     "Back" : "Επιστροφή",
     "Continue" : "Συνέχεια",
diff --git a/apps/user_ldap/l10n/en_GB.js b/apps/user_ldap/l10n/en_GB.js
index 3ddcd982d74..4cfbae15ced 100644
--- a/apps/user_ldap/l10n/en_GB.js
+++ b/apps/user_ldap/l10n/en_GB.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "No configuration specified",
     "No data specified" : "No data specified",
     " Could not set configuration %s" : " Could not set configuration %s",
-    "Deletion failed" : "Deletion failed",
-    "Take over settings from recent server configuration?" : "Take over settings from recent server configuration?",
-    "Keep settings?" : "Keep settings?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Cannot add server configuration",
-    "mappings cleared" : "mappings cleared",
-    "Success" : "Success",
-    "Error" : "Error",
-    "Please specify a Base DN" : "Please specify a Base DN",
-    "Could not determine Base DN" : "Could not determine Base DN",
-    "Please specify the port" : "Please specify the port",
-    "Configuration OK" : "Configuration OK",
     "Configuration incorrect" : "Configuration incorrect",
     "Configuration incomplete" : "Configuration incomplete",
+    "Configuration OK" : "Configuration OK",
     "Select groups" : "Select groups",
     "Select object classes" : "Select object classes",
-    "Select attributes" : "Select attributes",
-    "Connection test succeeded" : "Connection test succeeded",
-    "Connection test failed" : "Connection test failed",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Do you really want to delete the current Server Configuration?",
     "Confirm Deletion" : "Confirm Deletion",
+    "Select attributes" : "Select attributes",
     "_%s group found_::_%s groups found_" : ["%s group found","%s groups found"],
     "_%s user found_::_%s users found_" : ["%s user found","%s users found"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings.",
     "Could not find the desired feature" : "Could not find the desired feature",
     "Invalid Host" : "Invalid Host",
     "Server" : "Server",
-    "User Filter" : "User Filter",
-    "Login Filter" : "Login Filter",
-    "Group Filter" : "Group Filter",
-    "Save" : "Save",
+    "Users" : "Users",
+    "Groups" : "Groups",
     "Test Configuration" : "Test Configuration",
     "Help" : "Help",
     "Groups meeting these criteria are available in %s:" : "Groups meeting these criteria are available in %s:",
-    "only those object classes:" : "only those object classes:",
-    "only from those groups:" : "only from those groups:",
-    "Edit raw filter instead" : "Edit raw filter instead",
-    "Raw LDAP filter" : "Raw LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "The filter specifies which LDAP groups shall have access to the %s instance.",
     "Test Filter" : "Test Filter",
-    "groups found" : "groups found",
-    "Users login with this attribute:" : "Users login with this attribute:",
-    "LDAP Username:" : "LDAP Username:",
-    "LDAP Email Address:" : "LDAP Email Address:",
     "Other Attributes:" : "Other Attributes:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Add Server Configuration",
-    "Delete Configuration" : "Delete Configuration",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "You can omit the protocol, except you require SSL. Then start with ldaps://",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Manually enter LDAP filters (recommended for large directories)",
     "Limit %s access to users meeting these criteria:" : "Limit %s access to users meeting these criteria:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "The filter specifies which LDAP users shall have access to the %s instance.",
-    "users found" : "users found",
     "Saving" : "Saving",
     "Back" : "Back",
     "Continue" : "Continue",
diff --git a/apps/user_ldap/l10n/en_GB.json b/apps/user_ldap/l10n/en_GB.json
index fabe3d94764..5a352c0ffa6 100644
--- a/apps/user_ldap/l10n/en_GB.json
+++ b/apps/user_ldap/l10n/en_GB.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "No configuration specified",
     "No data specified" : "No data specified",
     " Could not set configuration %s" : " Could not set configuration %s",
-    "Deletion failed" : "Deletion failed",
-    "Take over settings from recent server configuration?" : "Take over settings from recent server configuration?",
-    "Keep settings?" : "Keep settings?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Cannot add server configuration",
-    "mappings cleared" : "mappings cleared",
-    "Success" : "Success",
-    "Error" : "Error",
-    "Please specify a Base DN" : "Please specify a Base DN",
-    "Could not determine Base DN" : "Could not determine Base DN",
-    "Please specify the port" : "Please specify the port",
-    "Configuration OK" : "Configuration OK",
     "Configuration incorrect" : "Configuration incorrect",
     "Configuration incomplete" : "Configuration incomplete",
+    "Configuration OK" : "Configuration OK",
     "Select groups" : "Select groups",
     "Select object classes" : "Select object classes",
-    "Select attributes" : "Select attributes",
-    "Connection test succeeded" : "Connection test succeeded",
-    "Connection test failed" : "Connection test failed",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Do you really want to delete the current Server Configuration?",
     "Confirm Deletion" : "Confirm Deletion",
+    "Select attributes" : "Select attributes",
     "_%s group found_::_%s groups found_" : ["%s group found","%s groups found"],
     "_%s user found_::_%s users found_" : ["%s user found","%s users found"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings.",
     "Could not find the desired feature" : "Could not find the desired feature",
     "Invalid Host" : "Invalid Host",
     "Server" : "Server",
-    "User Filter" : "User Filter",
-    "Login Filter" : "Login Filter",
-    "Group Filter" : "Group Filter",
-    "Save" : "Save",
+    "Users" : "Users",
+    "Groups" : "Groups",
     "Test Configuration" : "Test Configuration",
     "Help" : "Help",
     "Groups meeting these criteria are available in %s:" : "Groups meeting these criteria are available in %s:",
-    "only those object classes:" : "only those object classes:",
-    "only from those groups:" : "only from those groups:",
-    "Edit raw filter instead" : "Edit raw filter instead",
-    "Raw LDAP filter" : "Raw LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "The filter specifies which LDAP groups shall have access to the %s instance.",
     "Test Filter" : "Test Filter",
-    "groups found" : "groups found",
-    "Users login with this attribute:" : "Users login with this attribute:",
-    "LDAP Username:" : "LDAP Username:",
-    "LDAP Email Address:" : "LDAP Email Address:",
     "Other Attributes:" : "Other Attributes:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Add Server Configuration",
-    "Delete Configuration" : "Delete Configuration",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "You can omit the protocol, except you require SSL. Then start with ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Manually enter LDAP filters (recommended for large directories)",
     "Limit %s access to users meeting these criteria:" : "Limit %s access to users meeting these criteria:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "The filter specifies which LDAP users shall have access to the %s instance.",
-    "users found" : "users found",
     "Saving" : "Saving",
     "Back" : "Back",
     "Continue" : "Continue",
diff --git a/apps/user_ldap/l10n/eo.js b/apps/user_ldap/l10n/eo.js
index 4bd99570cfb..3d6461d4821 100644
--- a/apps/user_ldap/l10n/eo.js
+++ b/apps/user_ldap/l10n/eo.js
@@ -2,49 +2,31 @@ OC.L10N.register(
     "user_ldap",
     {
     "Failed to delete the server configuration" : "Malsukcesis forigo de la agordo de servilo",
-    "Deletion failed" : "Forigo malsukcesis",
-    "Keep settings?" : "Ĉu daŭrigi la agordon?",
-    "{nthServer}. Server" : "{nthServer}. Servilo",
-    "Cannot add server configuration" : "Ne eblas aldoni agordon de servilo",
-    "Success" : "Sukceso",
-    "Error" : "Eraro",
-    "Configuration OK" : "La agordaro ĝustas",
     "Configuration incorrect" : "La agordaro malĝustas",
     "Configuration incomplete" : "La agordaro neplenas",
+    "Configuration OK" : "La agordaro ĝustas",
     "Select groups" : "Elekti grupojn",
     "Select object classes" : "Elekti objektoklasojn",
-    "Select attributes" : "Elekti atribuojn",
-    "Connection test succeeded" : "Provo de konekto sukcesis",
-    "Connection test failed" : "Provo de konekto malsukcesis",
+    "{nthServer}. Server" : "{nthServer}. Servilo",
     "Confirm Deletion" : "Konfirmi forigon",
+    "Select attributes" : "Elekti atribuojn",
     "_%s group found_::_%s groups found_" : ["%s grupo troviĝis","%s grupoj troviĝis"],
     "_%s user found_::_%s users found_" : ["%s uzanto troviĝis","%s uzanto troviĝis"],
     "Invalid Host" : "Nevalida gastigo",
     "Server" : "Servilo",
-    "User Filter" : "Filtrilo de uzanto",
-    "Login Filter" : "Ensaluta filtrilo",
-    "Group Filter" : "Filtrilo de grupo",
-    "Save" : "Konservi",
+    "Users" : "Uzantoj",
+    "Groups" : "Grupoj",
     "Test Configuration" : "Provi agordon",
     "Help" : "Helpo",
-    "only those object classes:" : "nur tiuj objektoklasoj:",
-    "only from those groups:" : "nur el tiuj grupoj:",
-    "groups found" : "grupoj trovitaj",
-    "Users login with this attribute:" : "Uzantoj ensalutas kun ĉi tiu atributo:",
-    "LDAP Username:" : "LDAP-uzantonomo:",
-    "LDAP Email Address:" : "LDAP-retpoŝtadreso:",
     "Other Attributes:" : "Aliaj atribuoj:",
     "1. Server" : "1. Servilo",
     "%s. Server:" : "%s. Servilo:",
-    "Add Server Configuration" : "Aldoni agordon de servilo",
-    "Delete Configuration" : "Forigi agordaron",
     "Host" : "Gastigo",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
     "Port" : "Pordo",
     "User DN" : "Uzanto-DN",
     "Password" : "Pasvorto",
     "For anonymous access, leave DN and Password empty." : "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
-    "users found" : "uzantoj trovitaj",
     "Back" : "Antaŭen",
     "Expert" : "Sperta",
     "Advanced" : "Progresinta",
diff --git a/apps/user_ldap/l10n/eo.json b/apps/user_ldap/l10n/eo.json
index ffb3b06c9ce..efaef91d9b0 100644
--- a/apps/user_ldap/l10n/eo.json
+++ b/apps/user_ldap/l10n/eo.json
@@ -1,48 +1,30 @@
 { "translations": {
     "Failed to delete the server configuration" : "Malsukcesis forigo de la agordo de servilo",
-    "Deletion failed" : "Forigo malsukcesis",
-    "Keep settings?" : "Ĉu daŭrigi la agordon?",
-    "{nthServer}. Server" : "{nthServer}. Servilo",
-    "Cannot add server configuration" : "Ne eblas aldoni agordon de servilo",
-    "Success" : "Sukceso",
-    "Error" : "Eraro",
-    "Configuration OK" : "La agordaro ĝustas",
     "Configuration incorrect" : "La agordaro malĝustas",
     "Configuration incomplete" : "La agordaro neplenas",
+    "Configuration OK" : "La agordaro ĝustas",
     "Select groups" : "Elekti grupojn",
     "Select object classes" : "Elekti objektoklasojn",
-    "Select attributes" : "Elekti atribuojn",
-    "Connection test succeeded" : "Provo de konekto sukcesis",
-    "Connection test failed" : "Provo de konekto malsukcesis",
+    "{nthServer}. Server" : "{nthServer}. Servilo",
     "Confirm Deletion" : "Konfirmi forigon",
+    "Select attributes" : "Elekti atribuojn",
     "_%s group found_::_%s groups found_" : ["%s grupo troviĝis","%s grupoj troviĝis"],
     "_%s user found_::_%s users found_" : ["%s uzanto troviĝis","%s uzanto troviĝis"],
     "Invalid Host" : "Nevalida gastigo",
     "Server" : "Servilo",
-    "User Filter" : "Filtrilo de uzanto",
-    "Login Filter" : "Ensaluta filtrilo",
-    "Group Filter" : "Filtrilo de grupo",
-    "Save" : "Konservi",
+    "Users" : "Uzantoj",
+    "Groups" : "Grupoj",
     "Test Configuration" : "Provi agordon",
     "Help" : "Helpo",
-    "only those object classes:" : "nur tiuj objektoklasoj:",
-    "only from those groups:" : "nur el tiuj grupoj:",
-    "groups found" : "grupoj trovitaj",
-    "Users login with this attribute:" : "Uzantoj ensalutas kun ĉi tiu atributo:",
-    "LDAP Username:" : "LDAP-uzantonomo:",
-    "LDAP Email Address:" : "LDAP-retpoŝtadreso:",
     "Other Attributes:" : "Aliaj atribuoj:",
     "1. Server" : "1. Servilo",
     "%s. Server:" : "%s. Servilo:",
-    "Add Server Configuration" : "Aldoni agordon de servilo",
-    "Delete Configuration" : "Forigi agordaron",
     "Host" : "Gastigo",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
     "Port" : "Pordo",
     "User DN" : "Uzanto-DN",
     "Password" : "Pasvorto",
     "For anonymous access, leave DN and Password empty." : "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
-    "users found" : "uzantoj trovitaj",
     "Back" : "Antaŭen",
     "Expert" : "Sperta",
     "Advanced" : "Progresinta",
diff --git a/apps/user_ldap/l10n/es.js b/apps/user_ldap/l10n/es.js
index 5f0bae4e13b..45b29d6d20c 100644
--- a/apps/user_ldap/l10n/es.js
+++ b/apps/user_ldap/l10n/es.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "No se ha especificado la configuración",
     "No data specified" : "No se han especificado los datos",
     " Could not set configuration %s" : "No se pudo establecer la configuración %s",
-    "Deletion failed" : "Falló el borrado",
-    "Take over settings from recent server configuration?" : "¿Asumir los ajustes actuales de la configuración del servidor?",
-    "Keep settings?" : "¿Mantener la configuración?",
-    "{nthServer}. Server" : "{nthServer}. servidor",
-    "Cannot add server configuration" : "No se puede añadir la configuración del servidor",
-    "mappings cleared" : "Asignaciones borradas",
-    "Success" : "Éxito",
-    "Error" : "Error",
-    "Please specify a Base DN" : "Especifique un DN base",
-    "Could not determine Base DN" : "No se pudo determinar un DN base",
-    "Please specify the port" : "Especifique el puerto",
-    "Configuration OK" : "Configuración correcta",
     "Configuration incorrect" : "Configuración Incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración correcta",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccionar la clase de objeto",
-    "Select attributes" : "Seleccionar atributos",
-    "Connection test succeeded" : "La prueba de conexión fue exitosa",
-    "Connection test failed" : "La prueba de conexión falló",
+    "{nthServer}. Server" : "{nthServer}. servidor",
     "Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
     "Confirm Deletion" : "Confirmar eliminación",
+    "Select attributes" : "Seleccionar atributos",
     "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","Grupos %s encontrados"],
     "_%s user found_::_%s users found_" : ["Usuario %s encontrado","Usuarios %s encontrados"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "No se pudo detectar el atributo de nombre de usuario pantalla. Por favor especifique lo mismo en ajustes avanzados ldap.",
     "Could not find the desired feature" : "No se puede encontrar la función deseada.",
     "Invalid Host" : "Host inválido",
     "Server" : "Servidor",
-    "User Filter" : "Filtro de usuario",
-    "Login Filter" : "Filtro de login",
-    "Group Filter" : "Filtro de grupo",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Configuración de prueba",
     "Help" : "Ayuda",
     "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen estos criterios están disponibles en %s:",
-    "only those object classes:" : "solamente de estas clases de objeto:",
-    "only from those groups:" : "solamente de estos grupos:",
-    "Edit raw filter instead" : "Editar el filtro en bruto en su lugar",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica que grupos LDAP tendrán acceso a %s.",
     "Test Filter" : "Filtro de prueba",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Los usuarios inician sesión con este atributo:",
-    "LDAP Username:" : "Nombre de usuario LDAP:",
-    "LDAP Email Address:" : "Dirección e-mail LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Agregar configuracion del servidor",
-    "Delete Configuration" : "Borrar configuración",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
     "Port" : "Puerto",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)",
     "Limit %s access to users meeting these criteria:" : "Limitar el acceso a %s a los usuarios que cumplan estos criterios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
-    "users found" : "usuarios encontrados",
     "Saving" : "Guardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/es.json b/apps/user_ldap/l10n/es.json
index c9bd3e10266..b99bf215b8e 100644
--- a/apps/user_ldap/l10n/es.json
+++ b/apps/user_ldap/l10n/es.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "No se ha especificado la configuración",
     "No data specified" : "No se han especificado los datos",
     " Could not set configuration %s" : "No se pudo establecer la configuración %s",
-    "Deletion failed" : "Falló el borrado",
-    "Take over settings from recent server configuration?" : "¿Asumir los ajustes actuales de la configuración del servidor?",
-    "Keep settings?" : "¿Mantener la configuración?",
-    "{nthServer}. Server" : "{nthServer}. servidor",
-    "Cannot add server configuration" : "No se puede añadir la configuración del servidor",
-    "mappings cleared" : "Asignaciones borradas",
-    "Success" : "Éxito",
-    "Error" : "Error",
-    "Please specify a Base DN" : "Especifique un DN base",
-    "Could not determine Base DN" : "No se pudo determinar un DN base",
-    "Please specify the port" : "Especifique el puerto",
-    "Configuration OK" : "Configuración correcta",
     "Configuration incorrect" : "Configuración Incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración correcta",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccionar la clase de objeto",
-    "Select attributes" : "Seleccionar atributos",
-    "Connection test succeeded" : "La prueba de conexión fue exitosa",
-    "Connection test failed" : "La prueba de conexión falló",
+    "{nthServer}. Server" : "{nthServer}. servidor",
     "Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
     "Confirm Deletion" : "Confirmar eliminación",
+    "Select attributes" : "Seleccionar atributos",
     "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","Grupos %s encontrados"],
     "_%s user found_::_%s users found_" : ["Usuario %s encontrado","Usuarios %s encontrados"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "No se pudo detectar el atributo de nombre de usuario pantalla. Por favor especifique lo mismo en ajustes avanzados ldap.",
     "Could not find the desired feature" : "No se puede encontrar la función deseada.",
     "Invalid Host" : "Host inválido",
     "Server" : "Servidor",
-    "User Filter" : "Filtro de usuario",
-    "Login Filter" : "Filtro de login",
-    "Group Filter" : "Filtro de grupo",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Configuración de prueba",
     "Help" : "Ayuda",
     "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen estos criterios están disponibles en %s:",
-    "only those object classes:" : "solamente de estas clases de objeto:",
-    "only from those groups:" : "solamente de estos grupos:",
-    "Edit raw filter instead" : "Editar el filtro en bruto en su lugar",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica que grupos LDAP tendrán acceso a %s.",
     "Test Filter" : "Filtro de prueba",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Los usuarios inician sesión con este atributo:",
-    "LDAP Username:" : "Nombre de usuario LDAP:",
-    "LDAP Email Address:" : "Dirección e-mail LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Agregar configuracion del servidor",
-    "Delete Configuration" : "Borrar configuración",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
     "Port" : "Puerto",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)",
     "Limit %s access to users meeting these criteria:" : "Limitar el acceso a %s a los usuarios que cumplan estos criterios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
-    "users found" : "usuarios encontrados",
     "Saving" : "Guardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/es_AR.js b/apps/user_ldap/l10n/es_AR.js
index 6be422a0800..2c64848eee1 100644
--- a/apps/user_ldap/l10n/es_AR.js
+++ b/apps/user_ldap/l10n/es_AR.js
@@ -10,44 +10,26 @@ OC.L10N.register(
     "No configuration specified" : "No se ha especificado una configuración",
     "No data specified" : "No se ha especificado datos",
     " Could not set configuration %s" : "No se pudo asignar la configuración %s",
-    "Deletion failed" : "Error al borrar",
-    "Take over settings from recent server configuration?" : "Tomar los valores de la anterior configuración de servidor?",
-    "Keep settings?" : "¿Mantener preferencias?",
-    "Cannot add server configuration" : "No se pudo añadir la configuración del servidor",
-    "mappings cleared" : "Asignaciones borradas",
-    "Success" : "Éxito",
-    "Error" : "Error",
-    "Configuration OK" : "Configuración válida",
     "Configuration incorrect" : "Configuración incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración válida",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccionar las clases de objetos",
-    "Select attributes" : "Seleccionar atributos",
-    "Connection test succeeded" : "El este de conexión ha sido completado satisfactoriamente",
-    "Connection test failed" : "Falló es test de conexión",
     "Do you really want to delete the current Server Configuration?" : "¿Realmente desea borrar la configuración actual del servidor?",
     "Confirm Deletion" : "Confirmar borrado",
+    "Select attributes" : "Seleccionar atributos",
     "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
     "_%s user found_::_%s users found_" : ["%s usuario encontrado","%s usuarios encontrados"],
     "Could not find the desired feature" : "No se pudo encontrar la característica deseada",
     "Invalid Host" : "Host inválido",
-    "Group Filter" : "Filtro de grupo",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Probar configuración",
     "Help" : "Ayuda",
     "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen con estos criterios están disponibles en %s:",
-    "only those object classes:" : "solo estos objetos de clases:",
-    "only from those groups:" : "solo provenientes de estos grupos:",
-    "Edit raw filter instead" : "Editar filtro en bruto",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica qué grupos LDAP deben tener acceso a la instancia %s.",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Los usuarios inician sesión con este atributo:",
-    "LDAP Username:" : "Nombre de usuario LDAP:",
-    "LDAP Email Address:" : "Correo electrónico LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta ingresar. %%uid remplaza el nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
-    "Add Server Configuration" : "Añadir Configuración del Servidor",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://",
     "Port" : "Puerto",
@@ -59,7 +41,6 @@ OC.L10N.register(
     "You can specify Base DN for users and groups in the Advanced tab" : "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\"",
     "Limit %s access to users meeting these criteria:" : "Limitar acceso %s a los usuarios que cumplen con este criterio:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica cuáles usuarios LDAP deben tener acceso a la instancia %s.",
-    "users found" : "usuarios encontrados",
     "Back" : "Volver",
     "Continue" : "Continuar",
     "Advanced" : "Avanzado",
diff --git a/apps/user_ldap/l10n/es_AR.json b/apps/user_ldap/l10n/es_AR.json
index 5e70ef4390e..5fc5d320291 100644
--- a/apps/user_ldap/l10n/es_AR.json
+++ b/apps/user_ldap/l10n/es_AR.json
@@ -8,44 +8,26 @@
     "No configuration specified" : "No se ha especificado una configuración",
     "No data specified" : "No se ha especificado datos",
     " Could not set configuration %s" : "No se pudo asignar la configuración %s",
-    "Deletion failed" : "Error al borrar",
-    "Take over settings from recent server configuration?" : "Tomar los valores de la anterior configuración de servidor?",
-    "Keep settings?" : "¿Mantener preferencias?",
-    "Cannot add server configuration" : "No se pudo añadir la configuración del servidor",
-    "mappings cleared" : "Asignaciones borradas",
-    "Success" : "Éxito",
-    "Error" : "Error",
-    "Configuration OK" : "Configuración válida",
     "Configuration incorrect" : "Configuración incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración válida",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccionar las clases de objetos",
-    "Select attributes" : "Seleccionar atributos",
-    "Connection test succeeded" : "El este de conexión ha sido completado satisfactoriamente",
-    "Connection test failed" : "Falló es test de conexión",
     "Do you really want to delete the current Server Configuration?" : "¿Realmente desea borrar la configuración actual del servidor?",
     "Confirm Deletion" : "Confirmar borrado",
+    "Select attributes" : "Seleccionar atributos",
     "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
     "_%s user found_::_%s users found_" : ["%s usuario encontrado","%s usuarios encontrados"],
     "Could not find the desired feature" : "No se pudo encontrar la característica deseada",
     "Invalid Host" : "Host inválido",
-    "Group Filter" : "Filtro de grupo",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Probar configuración",
     "Help" : "Ayuda",
     "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen con estos criterios están disponibles en %s:",
-    "only those object classes:" : "solo estos objetos de clases:",
-    "only from those groups:" : "solo provenientes de estos grupos:",
-    "Edit raw filter instead" : "Editar filtro en bruto",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica qué grupos LDAP deben tener acceso a la instancia %s.",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Los usuarios inician sesión con este atributo:",
-    "LDAP Username:" : "Nombre de usuario LDAP:",
-    "LDAP Email Address:" : "Correo electrónico LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta ingresar. %%uid remplaza el nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
-    "Add Server Configuration" : "Añadir Configuración del Servidor",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://",
     "Port" : "Puerto",
@@ -57,7 +39,6 @@
     "You can specify Base DN for users and groups in the Advanced tab" : "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\"",
     "Limit %s access to users meeting these criteria:" : "Limitar acceso %s a los usuarios que cumplen con este criterio:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica cuáles usuarios LDAP deben tener acceso a la instancia %s.",
-    "users found" : "usuarios encontrados",
     "Back" : "Volver",
     "Continue" : "Continuar",
     "Advanced" : "Avanzado",
diff --git a/apps/user_ldap/l10n/es_CL.js b/apps/user_ldap/l10n/es_CL.js
index 699bbd8ff9e..1877d101731 100644
--- a/apps/user_ldap/l10n/es_CL.js
+++ b/apps/user_ldap/l10n/es_CL.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "Error",
+    "Users" : "Usuarios",
     "Help" : "Ayuda",
     "Password" : "Clave"
 },
diff --git a/apps/user_ldap/l10n/es_CL.json b/apps/user_ldap/l10n/es_CL.json
index 6f98a92cece..4d6eb54b727 100644
--- a/apps/user_ldap/l10n/es_CL.json
+++ b/apps/user_ldap/l10n/es_CL.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Error" : "Error",
+    "Users" : "Usuarios",
     "Help" : "Ayuda",
     "Password" : "Clave"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/user_ldap/l10n/es_MX.js b/apps/user_ldap/l10n/es_MX.js
index a2860ddd60e..0b7eb8085b9 100644
--- a/apps/user_ldap/l10n/es_MX.js
+++ b/apps/user_ldap/l10n/es_MX.js
@@ -10,41 +10,25 @@ OC.L10N.register(
     "No configuration specified" : "No se ha especificado la configuración",
     "No data specified" : "No se han especificado los datos",
     " Could not set configuration %s" : "No se pudo establecer la configuración %s",
-    "Deletion failed" : "Falló el borrado",
-    "Take over settings from recent server configuration?" : "¿Asumir los ajustes actuales de la configuración del servidor?",
-    "Keep settings?" : "¿Mantener la configuración?",
-    "Cannot add server configuration" : "No se puede añadir la configuración del servidor",
-    "mappings cleared" : "Asignaciones borradas",
-    "Success" : "Éxito",
-    "Error" : "Error",
-    "Configuration OK" : "Configuración OK",
     "Configuration incorrect" : "Configuración Incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración OK",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccionar la clase de objeto",
-    "Select attributes" : "Seleccionar atributos",
-    "Connection test succeeded" : "La prueba de conexión fue exitosa",
-    "Connection test failed" : "La prueba de conexión falló",
     "Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
     "Confirm Deletion" : "Confirmar eliminación",
+    "Select attributes" : "Seleccionar atributos",
     "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","Grupos %s encontrados"],
     "_%s user found_::_%s users found_" : ["Usuario %s encontrado","Usuarios %s encontrados"],
     "Could not find the desired feature" : "No se puede encontrar la función deseada.",
     "Invalid Host" : "Host inválido",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Configuración de prueba",
     "Help" : "Ayuda",
-    "only those object classes:" : "solamente de estas clases de objeto:",
-    "only from those groups:" : "solamente de estos grupos:",
-    "Edit raw filter instead" : "Editar el filtro en bruto en su lugar",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica que grupos LDAP tendrán acceso a %s.",
-    "groups found" : "grupos encontrados",
-    "LDAP Username:" : "Nombre de usuario LDAP:",
-    "LDAP Email Address:" : "Dirección e-mail LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
-    "Add Server Configuration" : "Agregar configuracion del servidor",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
     "Port" : "Puerto",
@@ -55,7 +39,6 @@ OC.L10N.register(
     "One Base DN per line" : "Un DN Base por línea",
     "You can specify Base DN for users and groups in the Advanced tab" : "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
-    "users found" : "usuarios encontrados",
     "Back" : "Atrás",
     "Continue" : "Continuar",
     "Advanced" : "Avanzado",
diff --git a/apps/user_ldap/l10n/es_MX.json b/apps/user_ldap/l10n/es_MX.json
index 0f25e3dec5f..d458644b137 100644
--- a/apps/user_ldap/l10n/es_MX.json
+++ b/apps/user_ldap/l10n/es_MX.json
@@ -8,41 +8,25 @@
     "No configuration specified" : "No se ha especificado la configuración",
     "No data specified" : "No se han especificado los datos",
     " Could not set configuration %s" : "No se pudo establecer la configuración %s",
-    "Deletion failed" : "Falló el borrado",
-    "Take over settings from recent server configuration?" : "¿Asumir los ajustes actuales de la configuración del servidor?",
-    "Keep settings?" : "¿Mantener la configuración?",
-    "Cannot add server configuration" : "No se puede añadir la configuración del servidor",
-    "mappings cleared" : "Asignaciones borradas",
-    "Success" : "Éxito",
-    "Error" : "Error",
-    "Configuration OK" : "Configuración OK",
     "Configuration incorrect" : "Configuración Incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración OK",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccionar la clase de objeto",
-    "Select attributes" : "Seleccionar atributos",
-    "Connection test succeeded" : "La prueba de conexión fue exitosa",
-    "Connection test failed" : "La prueba de conexión falló",
     "Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
     "Confirm Deletion" : "Confirmar eliminación",
+    "Select attributes" : "Seleccionar atributos",
     "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","Grupos %s encontrados"],
     "_%s user found_::_%s users found_" : ["Usuario %s encontrado","Usuarios %s encontrados"],
     "Could not find the desired feature" : "No se puede encontrar la función deseada.",
     "Invalid Host" : "Host inválido",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Configuración de prueba",
     "Help" : "Ayuda",
-    "only those object classes:" : "solamente de estas clases de objeto:",
-    "only from those groups:" : "solamente de estos grupos:",
-    "Edit raw filter instead" : "Editar el filtro en bruto en su lugar",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica que grupos LDAP tendrán acceso a %s.",
-    "groups found" : "grupos encontrados",
-    "LDAP Username:" : "Nombre de usuario LDAP:",
-    "LDAP Email Address:" : "Dirección e-mail LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
-    "Add Server Configuration" : "Agregar configuracion del servidor",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
     "Port" : "Puerto",
@@ -53,7 +37,6 @@
     "One Base DN per line" : "Un DN Base por línea",
     "You can specify Base DN for users and groups in the Advanced tab" : "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
-    "users found" : "usuarios encontrados",
     "Back" : "Atrás",
     "Continue" : "Continuar",
     "Advanced" : "Avanzado",
diff --git a/apps/user_ldap/l10n/et_EE.js b/apps/user_ldap/l10n/et_EE.js
index f726859e825..08c696977d8 100644
--- a/apps/user_ldap/l10n/et_EE.js
+++ b/apps/user_ldap/l10n/et_EE.js
@@ -10,55 +10,31 @@ OC.L10N.register(
     "No configuration specified" : "Seadistust pole määratletud",
     "No data specified" : "Andmeid pole määratletud",
     " Could not set configuration %s" : "Ei suutnud seadistada %s",
-    "Deletion failed" : "Kustutamine ebaõnnestus",
-    "Take over settings from recent server configuration?" : "Võta sätted viimasest serveri seadistusest?",
-    "Keep settings?" : "Säilitada seadistused?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Ei suuda lisada serveri seadistust",
-    "mappings cleared" : "vastendused puhastatud",
-    "Success" : "Korras",
-    "Error" : "Viga",
-    "Please specify a Base DN" : "Palun määra baas DN",
-    "Could not determine Base DN" : "Baas DN-i tuvastamine ebaõnnestus",
-    "Please specify the port" : "Palun määra post",
-    "Configuration OK" : "Seadistus on korras",
     "Configuration incorrect" : "Seadistus on vigane",
     "Configuration incomplete" : "Seadistus on puudulik",
+    "Configuration OK" : "Seadistus on korras",
     "Select groups" : "Vali grupid",
     "Select object classes" : "Vali objekti klassid",
-    "Select attributes" : "Vali atribuudid",
-    "Connection test succeeded" : "Ühenduse testimine õnnestus",
-    "Connection test failed" : "Ühenduse testimine ebaõnnestus",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Oled kindel, et tahad kustutada praegust serveri seadistust?",
     "Confirm Deletion" : "Kinnita kustutamine",
+    "Select attributes" : "Vali atribuudid",
     "_%s group found_::_%s groups found_" : ["%s grupp leitud","%s gruppi leitud"],
     "_%s user found_::_%s users found_" : ["%s kasutaja leitud","%s kasutajat leitud"],
     "Could not find the desired feature" : "Ei suuda leida soovitud funktsioonaalsust",
     "Invalid Host" : "Vigane server",
     "Server" : "Server",
-    "User Filter" : "Kasutaja filter",
-    "Login Filter" : "Kasutajanime filter",
-    "Group Filter" : "Grupi filter",
-    "Save" : "Salvesta",
+    "Users" : "Kasutajad",
+    "Groups" : "Grupid",
     "Test Configuration" : "Testi seadistust",
     "Help" : "Abiinfo",
     "Groups meeting these criteria are available in %s:" : "Kriteeriumiga sobivad grupid on saadaval %s:",
-    "only those object classes:" : "ainult need objektiklassid:",
-    "only from those groups:" : "ainult nendest gruppidest:",
-    "Edit raw filter instead" : "Selle asemel muuda filtrit",
-    "Raw LDAP filter" : "LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter määrab millised LDAP grupid saavad ligipääsu sellele %s instantsile.",
     "Test Filter" : "Testi filtrit",
-    "groups found" : "gruppi leitud",
-    "Users login with this attribute:" : "Logimiseks kasutatkse atribuuti: ",
-    "LDAP Username:" : "LDAP kasutajanimi:",
-    "LDAP Email Address:" : "LDAP e-posti aadress:",
     "Other Attributes:" : "Muud atribuudid:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime. Näide: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Lisa serveri seadistus",
-    "Delete Configuration" : "Kustuta seadistused",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://",
     "Port" : "Port",
@@ -72,7 +48,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Sisesta LDAP filtrid automaatselt (sooitatav suurtele kataloogidele)",
     "Limit %s access to users meeting these criteria:" : "Piira %s liigpääs kriteeriumiga sobivatele kasutajatele:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filter määrab millised LDAP kasutajad pääsevad ligi %s instantsile.",
-    "users found" : "kasutajat leitud",
     "Saving" : "Salvestamine",
     "Back" : "Tagasi",
     "Continue" : "Jätka",
diff --git a/apps/user_ldap/l10n/et_EE.json b/apps/user_ldap/l10n/et_EE.json
index 6994bacb485..21b25b52d1a 100644
--- a/apps/user_ldap/l10n/et_EE.json
+++ b/apps/user_ldap/l10n/et_EE.json
@@ -8,55 +8,31 @@
     "No configuration specified" : "Seadistust pole määratletud",
     "No data specified" : "Andmeid pole määratletud",
     " Could not set configuration %s" : "Ei suutnud seadistada %s",
-    "Deletion failed" : "Kustutamine ebaõnnestus",
-    "Take over settings from recent server configuration?" : "Võta sätted viimasest serveri seadistusest?",
-    "Keep settings?" : "Säilitada seadistused?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Ei suuda lisada serveri seadistust",
-    "mappings cleared" : "vastendused puhastatud",
-    "Success" : "Korras",
-    "Error" : "Viga",
-    "Please specify a Base DN" : "Palun määra baas DN",
-    "Could not determine Base DN" : "Baas DN-i tuvastamine ebaõnnestus",
-    "Please specify the port" : "Palun määra post",
-    "Configuration OK" : "Seadistus on korras",
     "Configuration incorrect" : "Seadistus on vigane",
     "Configuration incomplete" : "Seadistus on puudulik",
+    "Configuration OK" : "Seadistus on korras",
     "Select groups" : "Vali grupid",
     "Select object classes" : "Vali objekti klassid",
-    "Select attributes" : "Vali atribuudid",
-    "Connection test succeeded" : "Ühenduse testimine õnnestus",
-    "Connection test failed" : "Ühenduse testimine ebaõnnestus",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Oled kindel, et tahad kustutada praegust serveri seadistust?",
     "Confirm Deletion" : "Kinnita kustutamine",
+    "Select attributes" : "Vali atribuudid",
     "_%s group found_::_%s groups found_" : ["%s grupp leitud","%s gruppi leitud"],
     "_%s user found_::_%s users found_" : ["%s kasutaja leitud","%s kasutajat leitud"],
     "Could not find the desired feature" : "Ei suuda leida soovitud funktsioonaalsust",
     "Invalid Host" : "Vigane server",
     "Server" : "Server",
-    "User Filter" : "Kasutaja filter",
-    "Login Filter" : "Kasutajanime filter",
-    "Group Filter" : "Grupi filter",
-    "Save" : "Salvesta",
+    "Users" : "Kasutajad",
+    "Groups" : "Grupid",
     "Test Configuration" : "Testi seadistust",
     "Help" : "Abiinfo",
     "Groups meeting these criteria are available in %s:" : "Kriteeriumiga sobivad grupid on saadaval %s:",
-    "only those object classes:" : "ainult need objektiklassid:",
-    "only from those groups:" : "ainult nendest gruppidest:",
-    "Edit raw filter instead" : "Selle asemel muuda filtrit",
-    "Raw LDAP filter" : "LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter määrab millised LDAP grupid saavad ligipääsu sellele %s instantsile.",
     "Test Filter" : "Testi filtrit",
-    "groups found" : "gruppi leitud",
-    "Users login with this attribute:" : "Logimiseks kasutatkse atribuuti: ",
-    "LDAP Username:" : "LDAP kasutajanimi:",
-    "LDAP Email Address:" : "LDAP e-posti aadress:",
     "Other Attributes:" : "Muud atribuudid:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime. Näide: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Lisa serveri seadistus",
-    "Delete Configuration" : "Kustuta seadistused",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://",
     "Port" : "Port",
@@ -70,7 +46,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Sisesta LDAP filtrid automaatselt (sooitatav suurtele kataloogidele)",
     "Limit %s access to users meeting these criteria:" : "Piira %s liigpääs kriteeriumiga sobivatele kasutajatele:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filter määrab millised LDAP kasutajad pääsevad ligi %s instantsile.",
-    "users found" : "kasutajat leitud",
     "Saving" : "Salvestamine",
     "Back" : "Tagasi",
     "Continue" : "Jätka",
diff --git a/apps/user_ldap/l10n/eu.js b/apps/user_ldap/l10n/eu.js
index 3fb4c747006..b846dfa1e10 100644
--- a/apps/user_ldap/l10n/eu.js
+++ b/apps/user_ldap/l10n/eu.js
@@ -10,55 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Ez da konfiguraziorik zehaztu",
     "No data specified" : "Ez da daturik zehaztu",
     " Could not set configuration %s" : "Ezin izan da %s konfigurazioa ezarri",
-    "Deletion failed" : "Ezabaketak huts egin du",
-    "Take over settings from recent server configuration?" : "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?",
-    "Keep settings?" : "Mantendu ezarpenak?",
-    "{nthServer}. Server" : "{nthServer}. Zerbitzaria",
-    "Cannot add server configuration" : "Ezin da zerbitzariaren konfigurazioa gehitu",
-    "mappings cleared" : "Mapeatzeak garbi",
-    "Success" : "Arrakasta",
-    "Error" : "Errorea",
-    "Please specify a Base DN" : "Mesdez zehaztu Base DN",
-    "Could not determine Base DN" : "Ezin izan da zehaztu Base DN",
-    "Please specify the port" : "Mesdez zehaztu portua",
-    "Configuration OK" : "Konfigurazioa ongi dago",
     "Configuration incorrect" : "Konfigurazioa ez dago ongi",
     "Configuration incomplete" : "Konfigurazioa osatu gabe dago",
+    "Configuration OK" : "Konfigurazioa ongi dago",
     "Select groups" : "Hautatu taldeak",
     "Select object classes" : "Hautatu objektu klaseak",
-    "Select attributes" : "Hautatu atributuak",
-    "Connection test succeeded" : "Konexio froga ongi burutu da",
-    "Connection test failed" : "Konexio frogak huts egin du",
+    "{nthServer}. Server" : "{nthServer}. Zerbitzaria",
     "Do you really want to delete the current Server Configuration?" : "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?",
     "Confirm Deletion" : "Baieztatu Ezabatzea",
+    "Select attributes" : "Hautatu atributuak",
     "_%s group found_::_%s groups found_" : ["Talde %s aurkitu da","%s talde aurkitu dira"],
     "_%s user found_::_%s users found_" : ["Erabiltzaile %s aurkitu da","%s erabiltzaile aurkitu dira"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ezin izan da erabiltzailearen bistaratze izenaren atributua antzeman. Mesedez zehaztu ldap ezarpen aurreratuetan.",
     "Could not find the desired feature" : "Ezin izan da nahi zen ezaugarria aurkitu",
     "Invalid Host" : "Baliogabeko hostalaria",
     "Server" : "Zerbitzaria",
-    "User Filter" : "Erabiltzaileen iragazkia",
-    "Login Filter" : "Saioa hasteko Iragazkia",
-    "Group Filter" : "Taldeen iragazkia",
-    "Save" : "Gorde",
+    "Users" : "Erabiltzaileak",
+    "Groups" : "Taldeak",
     "Test Configuration" : "Egiaztatu Konfigurazioa",
     "Help" : "Laguntza",
     "Groups meeting these criteria are available in %s:" : "Baldintza horiek betetzen dituzten taldeak bertan eskuragarri %s:",
-    "only those object classes:" : "bakarrik objektu klase hauetakoak:",
-    "only from those groups:" : "bakarrik talde hauetakoak:",
-    "Raw LDAP filter" : "Raw LDAP iragazkia",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Iragazkiak zehazten du  ze LDAP taldek izango duten sarrera %s instantziara:",
     "Test Filter" : "Frogatu Iragazkia",
-    "groups found" : "talde aurkituta",
-    "Users login with this attribute:" : "Erabiltzaileak atributu honekin sartzen dira:",
-    "LDAP Username:" : "LDAP Erabiltzaile izena:",
-    "LDAP Email Address:" : "LDAP Eposta helbidea:",
     "Other Attributes:" : "Bestelako atributuak:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definitu aplikatu beharreko iragazkia sartzen saiatzean. %%uid erabiltzailearen izena ordezten du sartzeko ekintzan. Adibidez: \"uid=%%uid\"",
     "1. Server" : "1. Zerbitzaria",
     "%s. Server:" : "%s. Zerbitzaria:",
-    "Add Server Configuration" : "Gehitu Zerbitzariaren Konfigurazioa",
-    "Delete Configuration" : "Ezabatu Konfigurazioa",
     "Host" : "Hostalaria",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://",
     "Port" : "Portua",
@@ -71,7 +48,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Eskuz sartu LDAP iragazkiak (direktorio handietarako gomendatuta)",
     "Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du  ze LDAP erabiltzailek izango duten sarrera %s instantziara:",
-    "users found" : "erabiltzaile aurkituta",
     "Saving" : "Gordetzen",
     "Back" : "Atzera",
     "Continue" : "Jarraitu",
diff --git a/apps/user_ldap/l10n/eu.json b/apps/user_ldap/l10n/eu.json
index cd89875f96f..247618ea884 100644
--- a/apps/user_ldap/l10n/eu.json
+++ b/apps/user_ldap/l10n/eu.json
@@ -8,55 +8,32 @@
     "No configuration specified" : "Ez da konfiguraziorik zehaztu",
     "No data specified" : "Ez da daturik zehaztu",
     " Could not set configuration %s" : "Ezin izan da %s konfigurazioa ezarri",
-    "Deletion failed" : "Ezabaketak huts egin du",
-    "Take over settings from recent server configuration?" : "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?",
-    "Keep settings?" : "Mantendu ezarpenak?",
-    "{nthServer}. Server" : "{nthServer}. Zerbitzaria",
-    "Cannot add server configuration" : "Ezin da zerbitzariaren konfigurazioa gehitu",
-    "mappings cleared" : "Mapeatzeak garbi",
-    "Success" : "Arrakasta",
-    "Error" : "Errorea",
-    "Please specify a Base DN" : "Mesdez zehaztu Base DN",
-    "Could not determine Base DN" : "Ezin izan da zehaztu Base DN",
-    "Please specify the port" : "Mesdez zehaztu portua",
-    "Configuration OK" : "Konfigurazioa ongi dago",
     "Configuration incorrect" : "Konfigurazioa ez dago ongi",
     "Configuration incomplete" : "Konfigurazioa osatu gabe dago",
+    "Configuration OK" : "Konfigurazioa ongi dago",
     "Select groups" : "Hautatu taldeak",
     "Select object classes" : "Hautatu objektu klaseak",
-    "Select attributes" : "Hautatu atributuak",
-    "Connection test succeeded" : "Konexio froga ongi burutu da",
-    "Connection test failed" : "Konexio frogak huts egin du",
+    "{nthServer}. Server" : "{nthServer}. Zerbitzaria",
     "Do you really want to delete the current Server Configuration?" : "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?",
     "Confirm Deletion" : "Baieztatu Ezabatzea",
+    "Select attributes" : "Hautatu atributuak",
     "_%s group found_::_%s groups found_" : ["Talde %s aurkitu da","%s talde aurkitu dira"],
     "_%s user found_::_%s users found_" : ["Erabiltzaile %s aurkitu da","%s erabiltzaile aurkitu dira"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ezin izan da erabiltzailearen bistaratze izenaren atributua antzeman. Mesedez zehaztu ldap ezarpen aurreratuetan.",
     "Could not find the desired feature" : "Ezin izan da nahi zen ezaugarria aurkitu",
     "Invalid Host" : "Baliogabeko hostalaria",
     "Server" : "Zerbitzaria",
-    "User Filter" : "Erabiltzaileen iragazkia",
-    "Login Filter" : "Saioa hasteko Iragazkia",
-    "Group Filter" : "Taldeen iragazkia",
-    "Save" : "Gorde",
+    "Users" : "Erabiltzaileak",
+    "Groups" : "Taldeak",
     "Test Configuration" : "Egiaztatu Konfigurazioa",
     "Help" : "Laguntza",
     "Groups meeting these criteria are available in %s:" : "Baldintza horiek betetzen dituzten taldeak bertan eskuragarri %s:",
-    "only those object classes:" : "bakarrik objektu klase hauetakoak:",
-    "only from those groups:" : "bakarrik talde hauetakoak:",
-    "Raw LDAP filter" : "Raw LDAP iragazkia",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Iragazkiak zehazten du  ze LDAP taldek izango duten sarrera %s instantziara:",
     "Test Filter" : "Frogatu Iragazkia",
-    "groups found" : "talde aurkituta",
-    "Users login with this attribute:" : "Erabiltzaileak atributu honekin sartzen dira:",
-    "LDAP Username:" : "LDAP Erabiltzaile izena:",
-    "LDAP Email Address:" : "LDAP Eposta helbidea:",
     "Other Attributes:" : "Bestelako atributuak:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definitu aplikatu beharreko iragazkia sartzen saiatzean. %%uid erabiltzailearen izena ordezten du sartzeko ekintzan. Adibidez: \"uid=%%uid\"",
     "1. Server" : "1. Zerbitzaria",
     "%s. Server:" : "%s. Zerbitzaria:",
-    "Add Server Configuration" : "Gehitu Zerbitzariaren Konfigurazioa",
-    "Delete Configuration" : "Ezabatu Konfigurazioa",
     "Host" : "Hostalaria",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://",
     "Port" : "Portua",
@@ -69,7 +46,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Eskuz sartu LDAP iragazkiak (direktorio handietarako gomendatuta)",
     "Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du  ze LDAP erabiltzailek izango duten sarrera %s instantziara:",
-    "users found" : "erabiltzaile aurkituta",
     "Saving" : "Gordetzen",
     "Back" : "Atzera",
     "Continue" : "Jarraitu",
diff --git a/apps/user_ldap/l10n/fa.js b/apps/user_ldap/l10n/fa.js
index 9ce5edf8742..81f065ef7a4 100644
--- a/apps/user_ldap/l10n/fa.js
+++ b/apps/user_ldap/l10n/fa.js
@@ -8,45 +8,26 @@ OC.L10N.register(
     "No action specified" : "فعالیتی مشخص نشده است",
     "No configuration specified" : "هیچ پیکربندی مشخص نشده است",
     "No data specified" : "داده ای مشخص نشده است",
-    "Deletion failed" : "حذف کردن انجام نشد",
-    "Keep settings?" : "آیا تنظیمات ذخیره شود ؟",
-    "{nthServer}. Server" : "سرور {nthServer}.",
-    "Cannot add server configuration" : "نمی توان پیکربندی سرور را اضافه نمود",
-    "mappings cleared" : "نگاشت پاک شده است",
-    "Success" : "موفقیت",
-    "Error" : "خطا",
-    "Please specify a Base DN" : "لطفا نام دامنه (DN) پایه را مشخص کنید.",
-    "Could not determine Base DN" : "امکان تشخیص نام دامنه (DN) پایه وجود ندارد",
-    "Please specify the port" : "لطفا پورت مورد نظر را مشخص کنید.",
-    "Configuration OK" : "پیکربندی صحیح است",
     "Configuration incorrect" : "پیکربندی نادرست است",
     "Configuration incomplete" : "پیکربندی کامل نیست",
+    "Configuration OK" : "پیکربندی صحیح است",
     "Select groups" : "انتخاب گروه ها",
     "Select object classes" : "انتخاب کلاس های اشیا",
-    "Select attributes" : "انتخاب مشخصه ها",
-    "Connection test succeeded" : "تست اتصال با موفقیت انجام گردید",
-    "Connection test failed" : "تست اتصال ناموفق بود",
+    "{nthServer}. Server" : "سرور {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟",
     "Confirm Deletion" : "تایید حذف",
+    "Select attributes" : "انتخاب مشخصه ها",
     "_%s group found_::_%s groups found_" : ["%s گروه بافت شد"],
     "_%s user found_::_%s users found_" : ["%s کاربر بافت شد"],
     "Invalid Host" : "هاست نامعتبر است",
     "Server" : "سرور",
-    "User Filter" : "فیلتر کاربر",
-    "Login Filter" : "فیلتر لاگین",
-    "Group Filter" : "فیلتر گروه",
-    "Save" : "ذخیره",
+    "Users" : "کاربران",
+    "Groups" : "گروه ها",
     "Test Configuration" : "امتحان پیکربندی",
     "Help" : "راه‌نما",
-    "Raw LDAP filter" : "فیلتر ال.دپ خام",
-    "groups found" : "گروه های یافت شده",
-    "LDAP Username:" : "نام کاربری LDAP:",
-    "LDAP Email Address:" : "آدرس ایمیل LDAP:",
     "Other Attributes:" : "مشخصه های دیگر:",
     "1. Server" : "1. سرور",
     "%s. Server:" : "%s. سرور:",
-    "Add Server Configuration" : "افزودن پیکربندی سرور",
-    "Delete Configuration" : "حذف پیکربندی",
     "Host" : "میزبانی",
     "Port" : "درگاه",
     "User DN" : "کاربر DN",
@@ -54,7 +35,6 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "برای دسترسی ناشناس، DN را رها نموده و رمزعبور را خالی بگذارید.",
     "One Base DN per line" : "یک پایه DN در هر خط",
     "You can specify Base DN for users and groups in the Advanced tab" : "شما می توانید پایه DN را برای کاربران و گروه ها در زبانه Advanced مشخص کنید.",
-    "users found" : "کاربران یافت شده",
     "Back" : "بازگشت",
     "Continue" : "ادامه",
     "Expert" : "حرفه ای",
diff --git a/apps/user_ldap/l10n/fa.json b/apps/user_ldap/l10n/fa.json
index b8ac9269a52..2716f90e10f 100644
--- a/apps/user_ldap/l10n/fa.json
+++ b/apps/user_ldap/l10n/fa.json
@@ -6,45 +6,26 @@
     "No action specified" : "فعالیتی مشخص نشده است",
     "No configuration specified" : "هیچ پیکربندی مشخص نشده است",
     "No data specified" : "داده ای مشخص نشده است",
-    "Deletion failed" : "حذف کردن انجام نشد",
-    "Keep settings?" : "آیا تنظیمات ذخیره شود ؟",
-    "{nthServer}. Server" : "سرور {nthServer}.",
-    "Cannot add server configuration" : "نمی توان پیکربندی سرور را اضافه نمود",
-    "mappings cleared" : "نگاشت پاک شده است",
-    "Success" : "موفقیت",
-    "Error" : "خطا",
-    "Please specify a Base DN" : "لطفا نام دامنه (DN) پایه را مشخص کنید.",
-    "Could not determine Base DN" : "امکان تشخیص نام دامنه (DN) پایه وجود ندارد",
-    "Please specify the port" : "لطفا پورت مورد نظر را مشخص کنید.",
-    "Configuration OK" : "پیکربندی صحیح است",
     "Configuration incorrect" : "پیکربندی نادرست است",
     "Configuration incomplete" : "پیکربندی کامل نیست",
+    "Configuration OK" : "پیکربندی صحیح است",
     "Select groups" : "انتخاب گروه ها",
     "Select object classes" : "انتخاب کلاس های اشیا",
-    "Select attributes" : "انتخاب مشخصه ها",
-    "Connection test succeeded" : "تست اتصال با موفقیت انجام گردید",
-    "Connection test failed" : "تست اتصال ناموفق بود",
+    "{nthServer}. Server" : "سرور {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟",
     "Confirm Deletion" : "تایید حذف",
+    "Select attributes" : "انتخاب مشخصه ها",
     "_%s group found_::_%s groups found_" : ["%s گروه بافت شد"],
     "_%s user found_::_%s users found_" : ["%s کاربر بافت شد"],
     "Invalid Host" : "هاست نامعتبر است",
     "Server" : "سرور",
-    "User Filter" : "فیلتر کاربر",
-    "Login Filter" : "فیلتر لاگین",
-    "Group Filter" : "فیلتر گروه",
-    "Save" : "ذخیره",
+    "Users" : "کاربران",
+    "Groups" : "گروه ها",
     "Test Configuration" : "امتحان پیکربندی",
     "Help" : "راه‌نما",
-    "Raw LDAP filter" : "فیلتر ال.دپ خام",
-    "groups found" : "گروه های یافت شده",
-    "LDAP Username:" : "نام کاربری LDAP:",
-    "LDAP Email Address:" : "آدرس ایمیل LDAP:",
     "Other Attributes:" : "مشخصه های دیگر:",
     "1. Server" : "1. سرور",
     "%s. Server:" : "%s. سرور:",
-    "Add Server Configuration" : "افزودن پیکربندی سرور",
-    "Delete Configuration" : "حذف پیکربندی",
     "Host" : "میزبانی",
     "Port" : "درگاه",
     "User DN" : "کاربر DN",
@@ -52,7 +33,6 @@
     "For anonymous access, leave DN and Password empty." : "برای دسترسی ناشناس، DN را رها نموده و رمزعبور را خالی بگذارید.",
     "One Base DN per line" : "یک پایه DN در هر خط",
     "You can specify Base DN for users and groups in the Advanced tab" : "شما می توانید پایه DN را برای کاربران و گروه ها در زبانه Advanced مشخص کنید.",
-    "users found" : "کاربران یافت شده",
     "Back" : "بازگشت",
     "Continue" : "ادامه",
     "Expert" : "حرفه ای",
diff --git a/apps/user_ldap/l10n/fi_FI.js b/apps/user_ldap/l10n/fi_FI.js
index e36e2520462..ab7d74e0b41 100644
--- a/apps/user_ldap/l10n/fi_FI.js
+++ b/apps/user_ldap/l10n/fi_FI.js
@@ -3,44 +3,37 @@ OC.L10N.register(
     {
     "Failed to delete the server configuration" : "Palvelinmäärityksen poistaminen epäonnistui",
     "The configuration is valid and the connection could be established!" : "Määritys on kelvollinen ja yhteys kyettiin muodostamaan!",
-    "Deletion failed" : "Poisto epäonnistui",
-    "Take over settings from recent server configuration?" : "Otetaanko asetukset viimeisimmistä palvelinmäärityksistä?",
-    "Keep settings?" : "Säilytetäänkö asetukset?",
-    "Cannot add server configuration" : "Palvelinasetusten lisäys epäonnistui",
-    "Success" : "Onnistui!",
-    "Error" : "Virhe",
-    "Please specify the port" : "Määritä portti",
-    "Configuration OK" : "Määritykset OK",
+    "No action specified" : "Toimintoa ei määritetty",
+    "Action does not exist" : "Toimintoa ei ole olemassa.",
     "Configuration incorrect" : "Määritykset väärin",
     "Configuration incomplete" : "Määritykset puutteelliset",
+    "Configuration OK" : "Määritykset OK",
     "Select groups" : "Valitse ryhmät",
-    "Connection test succeeded" : "Yhteystesti onnistui",
-    "Connection test failed" : "Yhteystesti epäonnistui",
     "Do you really want to delete the current Server Configuration?" : "Haluatko varmasti poistaa nykyisen palvelinmäärityksen?",
     "Confirm Deletion" : "Vahvista poisto",
     "_%s group found_::_%s groups found_" : ["%s ryhmä löytynyt","%s ryhmää löytynyt"],
     "_%s user found_::_%s users found_" : ["%s käyttäjä löytynyt","%s käyttäjää löytynyt"],
     "Server" : "Palvelin",
-    "Group Filter" : "Ryhmien suodatus",
-    "Save" : "Tallenna",
+    "Users" : "Käyttäjät",
+    "Groups" : "Ryhmät",
     "Test Configuration" : "Testaa määritys",
     "Help" : "Ohje",
-    "groups found" : "ryhmää löytynyt",
-    "LDAP Username:" : "LDAP-käyttäjätunnus:",
-    "LDAP Email Address:" : "LDAP-sähköpostiosoite:",
+    "Search groups" : "Etsi ryhmiä",
+    "Available groups" : "Käytettävissä olevat ryhmät",
+    "Selected groups" : "Valitut ryhmät",
+    "LDAP Filter:" : "LDAP-suodatin:",
+    "Verify settings" : "Vahvista asetukset",
     "1. Server" : "1. Palvelin",
     "%s. Server:" : "%s. Palvelin:",
-    "Add Server Configuration" : "Lisää palvelinmääritys",
-    "Delete Configuration" : "Poista määritys",
     "Host" : "Isäntä",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://",
     "Port" : "Portti",
+    "Detect Port" : "Havaitse portti",
     "User DN" : "Käyttäjän DN",
     "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "Asiakasohjelman DN, jolla yhdistäminen tehdään, ts. uid=agent,dc=example,dc=com. Mahdollistaaksesi anonyymin yhteyden, jätä DN ja salasana tyhjäksi.",
     "Password" : "Salasana",
     "For anonymous access, leave DN and Password empty." : "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi ",
     "You can specify Base DN for users and groups in the Advanced tab" : "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-välilehdeltä  ",
-    "users found" : "käyttäjää löytynyt",
     "Saving" : "Tallennetaan",
     "Back" : "Takaisin",
     "Continue" : "Jatka",
diff --git a/apps/user_ldap/l10n/fi_FI.json b/apps/user_ldap/l10n/fi_FI.json
index 8081756a0e9..ce8e20c56ef 100644
--- a/apps/user_ldap/l10n/fi_FI.json
+++ b/apps/user_ldap/l10n/fi_FI.json
@@ -1,44 +1,37 @@
 { "translations": {
     "Failed to delete the server configuration" : "Palvelinmäärityksen poistaminen epäonnistui",
     "The configuration is valid and the connection could be established!" : "Määritys on kelvollinen ja yhteys kyettiin muodostamaan!",
-    "Deletion failed" : "Poisto epäonnistui",
-    "Take over settings from recent server configuration?" : "Otetaanko asetukset viimeisimmistä palvelinmäärityksistä?",
-    "Keep settings?" : "Säilytetäänkö asetukset?",
-    "Cannot add server configuration" : "Palvelinasetusten lisäys epäonnistui",
-    "Success" : "Onnistui!",
-    "Error" : "Virhe",
-    "Please specify the port" : "Määritä portti",
-    "Configuration OK" : "Määritykset OK",
+    "No action specified" : "Toimintoa ei määritetty",
+    "Action does not exist" : "Toimintoa ei ole olemassa.",
     "Configuration incorrect" : "Määritykset väärin",
     "Configuration incomplete" : "Määritykset puutteelliset",
+    "Configuration OK" : "Määritykset OK",
     "Select groups" : "Valitse ryhmät",
-    "Connection test succeeded" : "Yhteystesti onnistui",
-    "Connection test failed" : "Yhteystesti epäonnistui",
     "Do you really want to delete the current Server Configuration?" : "Haluatko varmasti poistaa nykyisen palvelinmäärityksen?",
     "Confirm Deletion" : "Vahvista poisto",
     "_%s group found_::_%s groups found_" : ["%s ryhmä löytynyt","%s ryhmää löytynyt"],
     "_%s user found_::_%s users found_" : ["%s käyttäjä löytynyt","%s käyttäjää löytynyt"],
     "Server" : "Palvelin",
-    "Group Filter" : "Ryhmien suodatus",
-    "Save" : "Tallenna",
+    "Users" : "Käyttäjät",
+    "Groups" : "Ryhmät",
     "Test Configuration" : "Testaa määritys",
     "Help" : "Ohje",
-    "groups found" : "ryhmää löytynyt",
-    "LDAP Username:" : "LDAP-käyttäjätunnus:",
-    "LDAP Email Address:" : "LDAP-sähköpostiosoite:",
+    "Search groups" : "Etsi ryhmiä",
+    "Available groups" : "Käytettävissä olevat ryhmät",
+    "Selected groups" : "Valitut ryhmät",
+    "LDAP Filter:" : "LDAP-suodatin:",
+    "Verify settings" : "Vahvista asetukset",
     "1. Server" : "1. Palvelin",
     "%s. Server:" : "%s. Palvelin:",
-    "Add Server Configuration" : "Lisää palvelinmääritys",
-    "Delete Configuration" : "Poista määritys",
     "Host" : "Isäntä",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://",
     "Port" : "Portti",
+    "Detect Port" : "Havaitse portti",
     "User DN" : "Käyttäjän DN",
     "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "Asiakasohjelman DN, jolla yhdistäminen tehdään, ts. uid=agent,dc=example,dc=com. Mahdollistaaksesi anonyymin yhteyden, jätä DN ja salasana tyhjäksi.",
     "Password" : "Salasana",
     "For anonymous access, leave DN and Password empty." : "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi ",
     "You can specify Base DN for users and groups in the Advanced tab" : "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-välilehdeltä  ",
-    "users found" : "käyttäjää löytynyt",
     "Saving" : "Tallennetaan",
     "Back" : "Takaisin",
     "Continue" : "Jatka",
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
index 75b8cd4d78e..cd71fa7905c 100644
--- a/apps/user_ldap/l10n/fr.js
+++ b/apps/user_ldap/l10n/fr.js
@@ -10,56 +10,49 @@ OC.L10N.register(
     "No configuration specified" : "Aucune configuration spécifiée",
     "No data specified" : "Aucune donnée spécifiée",
     " Could not set configuration %s" : "Impossible de spécifier la configuration %s",
-    "Deletion failed" : "La suppression a échoué",
-    "Take over settings from recent server configuration?" : "Récupérer les paramètres depuis une configuration récente du serveur ?",
-    "Keep settings?" : "Garder ces paramètres ?",
-    "{nthServer}. Server" : "{nthServer}. Serveur",
-    "Cannot add server configuration" : "Impossible d'ajouter la configuration du serveur",
-    "mappings cleared" : "associations supprimées",
-    "Success" : "Succès",
-    "Error" : "Erreur",
-    "Please specify a Base DN" : "Veuillez spécifier un DN de base",
-    "Could not determine Base DN" : "Impossible de déterminer le DN de base",
-    "Please specify the port" : "Veuillez indiquer le port",
-    "Configuration OK" : "Configuration OK",
+    "Action does not exist" : "L'action n'existe pas",
     "Configuration incorrect" : "Configuration incorrecte",
     "Configuration incomplete" : "Configuration incomplète",
+    "Configuration OK" : "Configuration OK",
     "Select groups" : "Sélectionnez les groupes",
     "Select object classes" : "Sélectionner les classes d'objet",
-    "Select attributes" : "Sélectionner les attributs",
-    "Connection test succeeded" : "Test de connexion réussi",
-    "Connection test failed" : "Test de connexion échoué",
+    "Please check the credentials, they seem to be wrong." : "Veuillez vérifier vos informations d'identification",
+    "Please specify the port, it could not be auto-detected." : "Veuillez spécifier le port, il n'a pu être détecté automatiquement",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Le DN de base n'a pu être détecté automatiquement. Vérifiez les informations d'identification, l'hôte et le port.",
+    "Could not detect Base DN, please enter it manually." : "Impossible de détecter le DN de base, veuillez le spécifier manuellement",
+    "{nthServer}. Server" : "{nthServer}. Serveur",
+    "No object found in the given Base DN. Please revise." : "Aucun objet trouvé dans le DN de base spécifié. Veuillez le vérifier.",
+    "More then 1.000 directory entries available." : "Plus de 1 000 entrées d'annuaire disponibles",
+    " entries available within the provided Base DN" : "entrées disponibles dans le DN de base spécifié",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Une erreur est survenue. Veuillez vérifier le DN de base, ainsi que les paramètres de connexion et les informations d'identification",
     "Do you really want to delete the current Server Configuration?" : "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?",
     "Confirm Deletion" : "Confirmer la suppression",
+    "Mappings cleared successfully!" : "Succès de la suppression des associations!",
+    "Error while clearing the mappings." : "Erreur lors de la suppression des associations.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "La sauvegarde a échoué. Veuillez vérifier que la base de données est opérationnelle. Rechargez avant de poursuivre.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Changer de mode activera les requêtes LDAP automatiques. Selon la taille de votre annuaire LDAP, cela peut prendre du temps. Voulez-vous toujours changer de mode ?",
+    "Mode switch" : "Changer de mode",
+    "Select attributes" : "Sélectionner les attributs",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Utilisateur introuvable. Veuillez vérifier les attributs de login et le nom d'utilisateur. Filtre effectif (à copier-coller pour valider en ligne de commande):<br/>",
+    "User found and settings verified." : "Utilisateur trouvé et paramètres vérifiés.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres vérifiés, mais seul le premier utilisateur pourra se connecter. Considérez utiliser un filtre plus restrictif.",
     "_%s group found_::_%s groups found_" : ["%s groupe trouvé","%s groupes trouvés"],
     "_%s user found_::_%s users found_" : ["%s utilisateur trouvé","%s utilisateurs trouvés"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossible de détecter l'attribut contenant le nom d'affichage des utilisateurs. Veuillez l'indiquer vous-même dans les paramètres ldap avancés.",
     "Could not find the desired feature" : "Impossible de trouver la fonction souhaitée",
     "Invalid Host" : "Hôte non valide",
     "Server" : "Serveur",
-    "User Filter" : "Filtre utilisateur",
-    "Login Filter" : "Filtre de login",
-    "Group Filter" : "Filtre de groupes",
-    "Save" : "Sauvegarder",
+    "Users" : "Utilisateurs",
+    "Groups" : "Groupes",
     "Test Configuration" : "Tester la configuration",
     "Help" : "Aide",
     "Groups meeting these criteria are available in %s:" : "Les groupes respectant ces critères sont disponibles dans %s :",
-    "only those object classes:" : "seulement ces classes d'objet :",
-    "only from those groups:" : "seulement de ces groupes :",
-    "Edit raw filter instead" : "Éditer le filtre raw à la place",
-    "Raw LDAP filter" : "Filtre Raw LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Le filtre spécifie quels groupes LDAP ont accès à l'instance %s.",
     "Test Filter" : "Test du filtre",
-    "groups found" : "groupes trouvés",
-    "Users login with this attribute:" : "Les utilisateurs se connectent en utilisant cet attribut :",
-    "LDAP Username:" : "Nom d'utilisateur LDAP :",
-    "LDAP Email Address:" : "Adresse email LDAP :",
     "Other Attributes:" : "Autres attributs :",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur. Exemple : \"uid=%%uid\"",
     "1. Server" : "1. Serveur",
     "%s. Server:" : "%s. Serveur :",
-    "Add Server Configuration" : "Ajouter une configuration de serveur",
-    "Delete Configuration" : "Suppression de la configuration",
     "Host" : "Hôte",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
     "Port" : "Port",
@@ -73,7 +66,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Entrée manuelle des filtres LDAP (recommandé pour les annuaires de grande ampleur)",
     "Limit %s access to users meeting these criteria:" : "Limiter l'accès à %s aux utilisateurs respectant ces critères :",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Le filtre spécifie quels utilisateurs LDAP doivent avoir accès à l'instance %s.",
-    "users found" : "utilisateurs trouvés",
     "Saving" : "Enregistrement...",
     "Back" : "Retour",
     "Continue" : "Poursuivre",
@@ -115,14 +107,14 @@ OC.L10N.register(
     "Special Attributes" : "Attributs spéciaux",
     "Quota Field" : "Champ du quota",
     "Quota Default" : "Quota par défaut",
-    "in bytes" : "en bytes",
+    "in bytes" : "en octets",
     "Email Field" : "Champ Email",
-    "User Home Folder Naming Rule" : "Convention de nommage du répertoire utilisateur",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide ",
+    "User Home Folder Naming Rule" : "Règle de nommage du répertoire utilisateur",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide pour user name (défaut). Vous pouvez aussi spécifier un attribut LDAP / AD.",
     "Internal Username" : "Nom d'utilisateur interne",
     "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est ajouté/incrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. Il fait aussi partie de certains URL de services, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
     "Internal Username Attribute:" : "Nom d'utilisateur interne :",
-    "Override UUID detection" : "Surcharger la détection d'UUID",
+    "Override UUID detection" : "Passer outre la détection d'UUID",
     "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Par défaut, l'attribut UUID est automatiquement  détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
     "UUID Attribute for Users:" : "Attribut UUID pour les Utilisateurs :",
     "UUID Attribute for Groups:" : "Attribut UUID pour les Groupes :",
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
index 40469d3fc9a..709fe2c7ceb 100644
--- a/apps/user_ldap/l10n/fr.json
+++ b/apps/user_ldap/l10n/fr.json
@@ -8,56 +8,49 @@
     "No configuration specified" : "Aucune configuration spécifiée",
     "No data specified" : "Aucune donnée spécifiée",
     " Could not set configuration %s" : "Impossible de spécifier la configuration %s",
-    "Deletion failed" : "La suppression a échoué",
-    "Take over settings from recent server configuration?" : "Récupérer les paramètres depuis une configuration récente du serveur ?",
-    "Keep settings?" : "Garder ces paramètres ?",
-    "{nthServer}. Server" : "{nthServer}. Serveur",
-    "Cannot add server configuration" : "Impossible d'ajouter la configuration du serveur",
-    "mappings cleared" : "associations supprimées",
-    "Success" : "Succès",
-    "Error" : "Erreur",
-    "Please specify a Base DN" : "Veuillez spécifier un DN de base",
-    "Could not determine Base DN" : "Impossible de déterminer le DN de base",
-    "Please specify the port" : "Veuillez indiquer le port",
-    "Configuration OK" : "Configuration OK",
+    "Action does not exist" : "L'action n'existe pas",
     "Configuration incorrect" : "Configuration incorrecte",
     "Configuration incomplete" : "Configuration incomplète",
+    "Configuration OK" : "Configuration OK",
     "Select groups" : "Sélectionnez les groupes",
     "Select object classes" : "Sélectionner les classes d'objet",
-    "Select attributes" : "Sélectionner les attributs",
-    "Connection test succeeded" : "Test de connexion réussi",
-    "Connection test failed" : "Test de connexion échoué",
+    "Please check the credentials, they seem to be wrong." : "Veuillez vérifier vos informations d'identification",
+    "Please specify the port, it could not be auto-detected." : "Veuillez spécifier le port, il n'a pu être détecté automatiquement",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Le DN de base n'a pu être détecté automatiquement. Vérifiez les informations d'identification, l'hôte et le port.",
+    "Could not detect Base DN, please enter it manually." : "Impossible de détecter le DN de base, veuillez le spécifier manuellement",
+    "{nthServer}. Server" : "{nthServer}. Serveur",
+    "No object found in the given Base DN. Please revise." : "Aucun objet trouvé dans le DN de base spécifié. Veuillez le vérifier.",
+    "More then 1.000 directory entries available." : "Plus de 1 000 entrées d'annuaire disponibles",
+    " entries available within the provided Base DN" : "entrées disponibles dans le DN de base spécifié",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Une erreur est survenue. Veuillez vérifier le DN de base, ainsi que les paramètres de connexion et les informations d'identification",
     "Do you really want to delete the current Server Configuration?" : "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?",
     "Confirm Deletion" : "Confirmer la suppression",
+    "Mappings cleared successfully!" : "Succès de la suppression des associations!",
+    "Error while clearing the mappings." : "Erreur lors de la suppression des associations.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "La sauvegarde a échoué. Veuillez vérifier que la base de données est opérationnelle. Rechargez avant de poursuivre.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Changer de mode activera les requêtes LDAP automatiques. Selon la taille de votre annuaire LDAP, cela peut prendre du temps. Voulez-vous toujours changer de mode ?",
+    "Mode switch" : "Changer de mode",
+    "Select attributes" : "Sélectionner les attributs",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Utilisateur introuvable. Veuillez vérifier les attributs de login et le nom d'utilisateur. Filtre effectif (à copier-coller pour valider en ligne de commande):<br/>",
+    "User found and settings verified." : "Utilisateur trouvé et paramètres vérifiés.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres vérifiés, mais seul le premier utilisateur pourra se connecter. Considérez utiliser un filtre plus restrictif.",
     "_%s group found_::_%s groups found_" : ["%s groupe trouvé","%s groupes trouvés"],
     "_%s user found_::_%s users found_" : ["%s utilisateur trouvé","%s utilisateurs trouvés"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossible de détecter l'attribut contenant le nom d'affichage des utilisateurs. Veuillez l'indiquer vous-même dans les paramètres ldap avancés.",
     "Could not find the desired feature" : "Impossible de trouver la fonction souhaitée",
     "Invalid Host" : "Hôte non valide",
     "Server" : "Serveur",
-    "User Filter" : "Filtre utilisateur",
-    "Login Filter" : "Filtre de login",
-    "Group Filter" : "Filtre de groupes",
-    "Save" : "Sauvegarder",
+    "Users" : "Utilisateurs",
+    "Groups" : "Groupes",
     "Test Configuration" : "Tester la configuration",
     "Help" : "Aide",
     "Groups meeting these criteria are available in %s:" : "Les groupes respectant ces critères sont disponibles dans %s :",
-    "only those object classes:" : "seulement ces classes d'objet :",
-    "only from those groups:" : "seulement de ces groupes :",
-    "Edit raw filter instead" : "Éditer le filtre raw à la place",
-    "Raw LDAP filter" : "Filtre Raw LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Le filtre spécifie quels groupes LDAP ont accès à l'instance %s.",
     "Test Filter" : "Test du filtre",
-    "groups found" : "groupes trouvés",
-    "Users login with this attribute:" : "Les utilisateurs se connectent en utilisant cet attribut :",
-    "LDAP Username:" : "Nom d'utilisateur LDAP :",
-    "LDAP Email Address:" : "Adresse email LDAP :",
     "Other Attributes:" : "Autres attributs :",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur. Exemple : \"uid=%%uid\"",
     "1. Server" : "1. Serveur",
     "%s. Server:" : "%s. Serveur :",
-    "Add Server Configuration" : "Ajouter une configuration de serveur",
-    "Delete Configuration" : "Suppression de la configuration",
     "Host" : "Hôte",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
     "Port" : "Port",
@@ -71,7 +64,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Entrée manuelle des filtres LDAP (recommandé pour les annuaires de grande ampleur)",
     "Limit %s access to users meeting these criteria:" : "Limiter l'accès à %s aux utilisateurs respectant ces critères :",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Le filtre spécifie quels utilisateurs LDAP doivent avoir accès à l'instance %s.",
-    "users found" : "utilisateurs trouvés",
     "Saving" : "Enregistrement...",
     "Back" : "Retour",
     "Continue" : "Poursuivre",
@@ -113,14 +105,14 @@
     "Special Attributes" : "Attributs spéciaux",
     "Quota Field" : "Champ du quota",
     "Quota Default" : "Quota par défaut",
-    "in bytes" : "en bytes",
+    "in bytes" : "en octets",
     "Email Field" : "Champ Email",
-    "User Home Folder Naming Rule" : "Convention de nommage du répertoire utilisateur",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide ",
+    "User Home Folder Naming Rule" : "Règle de nommage du répertoire utilisateur",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide pour user name (défaut). Vous pouvez aussi spécifier un attribut LDAP / AD.",
     "Internal Username" : "Nom d'utilisateur interne",
     "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est ajouté/incrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. Il fait aussi partie de certains URL de services, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
     "Internal Username Attribute:" : "Nom d'utilisateur interne :",
-    "Override UUID detection" : "Surcharger la détection d'UUID",
+    "Override UUID detection" : "Passer outre la détection d'UUID",
     "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Par défaut, l'attribut UUID est automatiquement  détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
     "UUID Attribute for Users:" : "Attribut UUID pour les Utilisateurs :",
     "UUID Attribute for Groups:" : "Attribut UUID pour les Groupes :",
diff --git a/apps/user_ldap/l10n/gl.js b/apps/user_ldap/l10n/gl.js
index db5e70e8bbb..7a89f87cfd1 100644
--- a/apps/user_ldap/l10n/gl.js
+++ b/apps/user_ldap/l10n/gl.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Non se especificou unha configuración",
     "No data specified" : "Non se especificaron datos",
     " Could not set configuration %s" : "Non foi posíbel estabelecer a configuración %s",
-    "Deletion failed" : "Produciuse un fallo ao eliminar",
-    "Take over settings from recent server configuration?" : "Tomar os recentes axustes de configuración do servidor?",
-    "Keep settings?" : "Manter os axustes?",
-    "{nthServer}. Server" : "{nthServer}. Servidor",
-    "Cannot add server configuration" : "Non é posíbel engadir a configuración do servidor",
-    "mappings cleared" : "limpadas as asignacións",
-    "Success" : "Correcto",
-    "Error" : "Erro",
-    "Please specify a Base DN" : "Indique un DN base",
-    "Could not determine Base DN" : "Non se puido determinar o DN base",
-    "Please specify the port" : "Especifique un porto",
-    "Configuration OK" : "Configuración correcta",
     "Configuration incorrect" : "Configuración incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración correcta",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccione as clases de obxectos",
-    "Select attributes" : "Seleccione os atributos",
-    "Connection test succeeded" : "A proba de conexión foi satisfactoria",
-    "Connection test failed" : "A proba de conexión fracasou",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
     "Do you really want to delete the current Server Configuration?" : "Confirma que quere eliminar a configuración actual do servidor?",
     "Confirm Deletion" : "Confirmar a eliminación",
+    "Select attributes" : "Seleccione os atributos",
     "_%s group found_::_%s groups found_" : ["Atopouse %s grupo","Atopáronse %s grupos"],
     "_%s user found_::_%s users found_" : ["Atopouse %s usuario","Atopáronse %s usuarios"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Non foi posíbel detectar o atributo nome de usuario que mostrar. Especifíqueo vostede mesmo nos axustes avanzados de LDAP.",
     "Could not find the desired feature" : "Non foi posíbel atopar a función desexada",
     "Invalid Host" : "Máquina incorrecta",
     "Server" : "Servidor",
-    "User Filter" : "Filtro do usuario",
-    "Login Filter" : "Filtro de acceso",
-    "Group Filter" : "Filtro de grupo",
-    "Save" : "Gardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Probar a configuración",
     "Help" : "Axuda",
     "Groups meeting these criteria are available in %s:" : "Os grupos que cumpren estes criterios están dispoñíbeis en %s:",
-    "only those object classes:" : "só as clases de obxecto:",
-    "only from those groups:" : "só dos grupos:",
-    "Edit raw filter instead" : "Editar, no seu canto, o filtro en bruto",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica que grupos LDAP teñen acceso á instancia %s.",
     "Test Filter" : "Filtro de probas",
-    "groups found" : "atopáronse grupos",
-    "Users login with this attribute:" : "Os usuarios inician sesión con este atributo:",
-    "LDAP Username:" : "Nome de usuario LDAP:",
-    "LDAP Email Address:" : "Enderezo de correo LDAP:",
     "Other Attributes:" : "Outros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso. Exemplo: «uid=%%uid»",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Engadir a configuración do servidor",
-    "Delete Configuration" : "Eliminar a configuración",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://",
     "Port" : "Porto",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Introduza manualmente os filtros LDAP (recomendado para directorios grandes)",
     "Limit %s access to users meeting these criteria:" : "Limitar o acceso a %s para os usuarios que cumpren con estes criterios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica que usuarios LDAP teñen acceso á instancia %s.",
-    "users found" : "atopáronse usuarios",
     "Saving" : "Gardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/gl.json b/apps/user_ldap/l10n/gl.json
index c2f209e1b25..9a19b3a0541 100644
--- a/apps/user_ldap/l10n/gl.json
+++ b/apps/user_ldap/l10n/gl.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Non se especificou unha configuración",
     "No data specified" : "Non se especificaron datos",
     " Could not set configuration %s" : "Non foi posíbel estabelecer a configuración %s",
-    "Deletion failed" : "Produciuse un fallo ao eliminar",
-    "Take over settings from recent server configuration?" : "Tomar os recentes axustes de configuración do servidor?",
-    "Keep settings?" : "Manter os axustes?",
-    "{nthServer}. Server" : "{nthServer}. Servidor",
-    "Cannot add server configuration" : "Non é posíbel engadir a configuración do servidor",
-    "mappings cleared" : "limpadas as asignacións",
-    "Success" : "Correcto",
-    "Error" : "Erro",
-    "Please specify a Base DN" : "Indique un DN base",
-    "Could not determine Base DN" : "Non se puido determinar o DN base",
-    "Please specify the port" : "Especifique un porto",
-    "Configuration OK" : "Configuración correcta",
     "Configuration incorrect" : "Configuración incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración correcta",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccione as clases de obxectos",
-    "Select attributes" : "Seleccione os atributos",
-    "Connection test succeeded" : "A proba de conexión foi satisfactoria",
-    "Connection test failed" : "A proba de conexión fracasou",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
     "Do you really want to delete the current Server Configuration?" : "Confirma que quere eliminar a configuración actual do servidor?",
     "Confirm Deletion" : "Confirmar a eliminación",
+    "Select attributes" : "Seleccione os atributos",
     "_%s group found_::_%s groups found_" : ["Atopouse %s grupo","Atopáronse %s grupos"],
     "_%s user found_::_%s users found_" : ["Atopouse %s usuario","Atopáronse %s usuarios"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Non foi posíbel detectar o atributo nome de usuario que mostrar. Especifíqueo vostede mesmo nos axustes avanzados de LDAP.",
     "Could not find the desired feature" : "Non foi posíbel atopar a función desexada",
     "Invalid Host" : "Máquina incorrecta",
     "Server" : "Servidor",
-    "User Filter" : "Filtro do usuario",
-    "Login Filter" : "Filtro de acceso",
-    "Group Filter" : "Filtro de grupo",
-    "Save" : "Gardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Probar a configuración",
     "Help" : "Axuda",
     "Groups meeting these criteria are available in %s:" : "Os grupos que cumpren estes criterios están dispoñíbeis en %s:",
-    "only those object classes:" : "só as clases de obxecto:",
-    "only from those groups:" : "só dos grupos:",
-    "Edit raw filter instead" : "Editar, no seu canto, o filtro en bruto",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica que grupos LDAP teñen acceso á instancia %s.",
     "Test Filter" : "Filtro de probas",
-    "groups found" : "atopáronse grupos",
-    "Users login with this attribute:" : "Os usuarios inician sesión con este atributo:",
-    "LDAP Username:" : "Nome de usuario LDAP:",
-    "LDAP Email Address:" : "Enderezo de correo LDAP:",
     "Other Attributes:" : "Outros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso. Exemplo: «uid=%%uid»",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Engadir a configuración do servidor",
-    "Delete Configuration" : "Eliminar a configuración",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://",
     "Port" : "Porto",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Introduza manualmente os filtros LDAP (recomendado para directorios grandes)",
     "Limit %s access to users meeting these criteria:" : "Limitar o acceso a %s para os usuarios que cumpren con estes criterios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica que usuarios LDAP teñen acceso á instancia %s.",
-    "users found" : "atopáronse usuarios",
     "Saving" : "Gardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/he.js b/apps/user_ldap/l10n/he.js
index ea428764a0a..1baa1d43a66 100644
--- a/apps/user_ldap/l10n/he.js
+++ b/apps/user_ldap/l10n/he.js
@@ -1,18 +1,11 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "מחיקה נכשלה",
-    "Keep settings?" : "האם לשמור את ההגדרות?",
-    "Cannot add server configuration" : "לא ניתן להוסיף את הגדרות השרת",
-    "Error" : "שגיאה",
-    "Connection test succeeded" : "בדיקת החיבור עברה בהצלחה",
-    "Connection test failed" : "בדיקת החיבור נכשלה",
     "Do you really want to delete the current Server Configuration?" : "האם אכן למחוק את הגדרות השרת הנוכחיות?",
     "Confirm Deletion" : "אישור המחיקה",
-    "Group Filter" : "סנן קבוצה",
-    "Save" : "שמירה",
+    "Users" : "משתמשים",
+    "Groups" : "קבוצות",
     "Help" : "עזרה",
-    "Add Server Configuration" : "הוספת הגדרות השרת",
     "Host" : "מארח",
     "Port" : "פורט",
     "User DN" : "DN משתמש",
diff --git a/apps/user_ldap/l10n/he.json b/apps/user_ldap/l10n/he.json
index c136cfc17a1..77ef6d25887 100644
--- a/apps/user_ldap/l10n/he.json
+++ b/apps/user_ldap/l10n/he.json
@@ -1,16 +1,9 @@
 { "translations": {
-    "Deletion failed" : "מחיקה נכשלה",
-    "Keep settings?" : "האם לשמור את ההגדרות?",
-    "Cannot add server configuration" : "לא ניתן להוסיף את הגדרות השרת",
-    "Error" : "שגיאה",
-    "Connection test succeeded" : "בדיקת החיבור עברה בהצלחה",
-    "Connection test failed" : "בדיקת החיבור נכשלה",
     "Do you really want to delete the current Server Configuration?" : "האם אכן למחוק את הגדרות השרת הנוכחיות?",
     "Confirm Deletion" : "אישור המחיקה",
-    "Group Filter" : "סנן קבוצה",
-    "Save" : "שמירה",
+    "Users" : "משתמשים",
+    "Groups" : "קבוצות",
     "Help" : "עזרה",
-    "Add Server Configuration" : "הוספת הגדרות השרת",
     "Host" : "מארח",
     "Port" : "פורט",
     "User DN" : "DN משתמש",
diff --git a/apps/user_ldap/l10n/hi.js b/apps/user_ldap/l10n/hi.js
index 3141087a7a0..5f9924248b3 100644
--- a/apps/user_ldap/l10n/hi.js
+++ b/apps/user_ldap/l10n/hi.js
@@ -1,8 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "त्रुटि",
-    "Save" : "सहेजें",
+    "Users" : "उपयोगकर्ता",
     "Help" : "सहयोग",
     "Password" : "पासवर्ड",
     "Advanced" : "उन्नत"
diff --git a/apps/user_ldap/l10n/hi.json b/apps/user_ldap/l10n/hi.json
index 2364492d706..2ea4feefc94 100644
--- a/apps/user_ldap/l10n/hi.json
+++ b/apps/user_ldap/l10n/hi.json
@@ -1,6 +1,5 @@
 { "translations": {
-    "Error" : "त्रुटि",
-    "Save" : "सहेजें",
+    "Users" : "उपयोगकर्ता",
     "Help" : "सहयोग",
     "Password" : "पासवर्ड",
     "Advanced" : "उन्नत"
diff --git a/apps/user_ldap/l10n/hr.js b/apps/user_ldap/l10n/hr.js
index af414089cc0..e9c7ce4e17b 100644
--- a/apps/user_ldap/l10n/hr.js
+++ b/apps/user_ldap/l10n/hr.js
@@ -2,9 +2,8 @@ OC.L10N.register(
     "user_ldap",
     {
     "Failed to delete the server configuration" : "Greška prilikom brisanja konfiguracije poslužitelja.",
-    "Deletion failed" : "Brisanje nije uspjelo",
-    "Error" : "Greška",
-    "Save" : "Snimi",
+    "Users" : "Korisnici",
+    "Groups" : "Grupe",
     "Help" : "Pomoć",
     "Host" : "Poslužitelj",
     "Port" : "Port",
diff --git a/apps/user_ldap/l10n/hr.json b/apps/user_ldap/l10n/hr.json
index 63cb919ac55..8aad60517c7 100644
--- a/apps/user_ldap/l10n/hr.json
+++ b/apps/user_ldap/l10n/hr.json
@@ -1,8 +1,7 @@
 { "translations": {
     "Failed to delete the server configuration" : "Greška prilikom brisanja konfiguracije poslužitelja.",
-    "Deletion failed" : "Brisanje nije uspjelo",
-    "Error" : "Greška",
-    "Save" : "Snimi",
+    "Users" : "Korisnici",
+    "Groups" : "Grupe",
     "Help" : "Pomoć",
     "Host" : "Poslužitelj",
     "Port" : "Port",
diff --git a/apps/user_ldap/l10n/hu_HU.js b/apps/user_ldap/l10n/hu_HU.js
index 8548724aea7..d6fe2fde2d8 100644
--- a/apps/user_ldap/l10n/hu_HU.js
+++ b/apps/user_ldap/l10n/hu_HU.js
@@ -10,55 +10,31 @@ OC.L10N.register(
     "No configuration specified" : "Nincs megadva konfiguráció",
     "No data specified" : "Nincs adat megadva",
     " Could not set configuration %s" : "A(z) %s konfiguráció nem állítható be",
-    "Deletion failed" : "A törlés nem sikerült",
-    "Take over settings from recent server configuration?" : "Vegyük át a beállításokat az előző konfigurációból?",
-    "Keep settings?" : "Tartsuk meg a beállításokat?",
-    "{nthServer}. Server" : "{nthServer}. Kiszolgáló",
-    "Cannot add server configuration" : "Az új  kiszolgáló konfigurációja nem hozható létre",
-    "mappings cleared" : "Töröltük a hozzárendeléseket",
-    "Success" : "Sikeres végrehajtás",
-    "Error" : "Hiba",
-    "Please specify a Base DN" : "Adja meg az alap/Base/ DN-t",
-    "Could not determine Base DN" : "nem sikerült azonosítani az alap/Base/ DN-t",
-    "Please specify the port" : "Add meg a portot",
-    "Configuration OK" : "Konfiguráció OK",
     "Configuration incorrect" : "Konfiguráió hibás",
     "Configuration incomplete" : "Konfiguráció nincs befejezve",
+    "Configuration OK" : "Konfiguráció OK",
     "Select groups" : "Csoportok kiválasztása",
     "Select object classes" : "Objektumosztályok kiválasztása",
-    "Select attributes" : "Attribútumok kiválasztása",
-    "Connection test succeeded" : "A kapcsolatellenőrzés eredménye: sikerült",
-    "Connection test failed" : "A kapcsolatellenőrzés eredménye: nem sikerült",
+    "{nthServer}. Server" : "{nthServer}. Kiszolgáló",
     "Do you really want to delete the current Server Configuration?" : "Tényleg törölni szeretné a kiszolgáló beállításait?",
     "Confirm Deletion" : "A törlés megerősítése",
+    "Select attributes" : "Attribútumok kiválasztása",
     "_%s group found_::_%s groups found_" : ["%s csoport van","%s csoport van"],
     "_%s user found_::_%s users found_" : ["%s felhasználó van","%s felhasználó van"],
     "Could not find the desired feature" : "A kívánt funkció nem található",
     "Invalid Host" : "Érvénytelen gépnév",
     "Server" : "Kiszolgáló",
-    "User Filter" : "Felhasználói szűrő",
-    "Login Filter" : "Bejelentkezési szűrő",
-    "Group Filter" : "A csoportok szűrője",
-    "Save" : "Mentés",
+    "Users" : "Felhasználók",
+    "Groups" : "Csoportok",
     "Test Configuration" : "A beállítások tesztelése",
     "Help" : "Súgó",
     "Groups meeting these criteria are available in %s:" : "A %s szolgáltatás azon csoportok létezését veszi figyelembe, amik a következő feltételeknek felelnek meg:",
-    "only those object classes:" : "csak ezek az objektumosztályok:",
-    "only from those groups:" : "csak ezek a csoportok:",
-    "Edit raw filter instead" : "Inkább közvetlenül megadom a szűrési kifejezést:",
-    "Raw LDAP filter" : "Az LDAP szűrőkifejezés",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP csoportok lesznek jogosultak %s elérésére.",
     "Test Filter" : "Test szűrő ",
-    "groups found" : "csoport van",
-    "Users login with this attribute:" : "A felhasználók ezzel az attribútummal jelentkeznek be:",
-    "LDAP Username:" : "LDAP felhasználónév:",
-    "LDAP Email Address:" : "LDAP e-mail cím:",
     "Other Attributes:" : "Más attribútumok:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül. Például: \"uid=%%uid\"",
     "1. Server" : "1. Kiszolgáló",
     "%s. Server:" : "%s. kiszolgáló",
-    "Add Server Configuration" : "Új kiszolgáló beállításának hozzáadása",
-    "Delete Configuration" : "Konfiguráció törlés",
     "Host" : "Kiszolgáló",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így:  ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP szűrők kézi beállitása (ajánlott a nagy könyvtáraknál)",
     "Limit %s access to users meeting these criteria:" : "Korlátozzuk a %s szolgáltatás elérését azokra a felhasználókra, akik megfelelnek a következő feltételeknek:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP felhasználók lesznek jogosultak %s elérésére.",
-    "users found" : "felhasználó van",
     "Saving" : "Mentés",
     "Back" : "Vissza",
     "Continue" : "Folytatás",
diff --git a/apps/user_ldap/l10n/hu_HU.json b/apps/user_ldap/l10n/hu_HU.json
index a9d9a69195a..d793887c0b2 100644
--- a/apps/user_ldap/l10n/hu_HU.json
+++ b/apps/user_ldap/l10n/hu_HU.json
@@ -8,55 +8,31 @@
     "No configuration specified" : "Nincs megadva konfiguráció",
     "No data specified" : "Nincs adat megadva",
     " Could not set configuration %s" : "A(z) %s konfiguráció nem állítható be",
-    "Deletion failed" : "A törlés nem sikerült",
-    "Take over settings from recent server configuration?" : "Vegyük át a beállításokat az előző konfigurációból?",
-    "Keep settings?" : "Tartsuk meg a beállításokat?",
-    "{nthServer}. Server" : "{nthServer}. Kiszolgáló",
-    "Cannot add server configuration" : "Az új  kiszolgáló konfigurációja nem hozható létre",
-    "mappings cleared" : "Töröltük a hozzárendeléseket",
-    "Success" : "Sikeres végrehajtás",
-    "Error" : "Hiba",
-    "Please specify a Base DN" : "Adja meg az alap/Base/ DN-t",
-    "Could not determine Base DN" : "nem sikerült azonosítani az alap/Base/ DN-t",
-    "Please specify the port" : "Add meg a portot",
-    "Configuration OK" : "Konfiguráció OK",
     "Configuration incorrect" : "Konfiguráió hibás",
     "Configuration incomplete" : "Konfiguráció nincs befejezve",
+    "Configuration OK" : "Konfiguráció OK",
     "Select groups" : "Csoportok kiválasztása",
     "Select object classes" : "Objektumosztályok kiválasztása",
-    "Select attributes" : "Attribútumok kiválasztása",
-    "Connection test succeeded" : "A kapcsolatellenőrzés eredménye: sikerült",
-    "Connection test failed" : "A kapcsolatellenőrzés eredménye: nem sikerült",
+    "{nthServer}. Server" : "{nthServer}. Kiszolgáló",
     "Do you really want to delete the current Server Configuration?" : "Tényleg törölni szeretné a kiszolgáló beállításait?",
     "Confirm Deletion" : "A törlés megerősítése",
+    "Select attributes" : "Attribútumok kiválasztása",
     "_%s group found_::_%s groups found_" : ["%s csoport van","%s csoport van"],
     "_%s user found_::_%s users found_" : ["%s felhasználó van","%s felhasználó van"],
     "Could not find the desired feature" : "A kívánt funkció nem található",
     "Invalid Host" : "Érvénytelen gépnév",
     "Server" : "Kiszolgáló",
-    "User Filter" : "Felhasználói szűrő",
-    "Login Filter" : "Bejelentkezési szűrő",
-    "Group Filter" : "A csoportok szűrője",
-    "Save" : "Mentés",
+    "Users" : "Felhasználók",
+    "Groups" : "Csoportok",
     "Test Configuration" : "A beállítások tesztelése",
     "Help" : "Súgó",
     "Groups meeting these criteria are available in %s:" : "A %s szolgáltatás azon csoportok létezését veszi figyelembe, amik a következő feltételeknek felelnek meg:",
-    "only those object classes:" : "csak ezek az objektumosztályok:",
-    "only from those groups:" : "csak ezek a csoportok:",
-    "Edit raw filter instead" : "Inkább közvetlenül megadom a szűrési kifejezést:",
-    "Raw LDAP filter" : "Az LDAP szűrőkifejezés",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP csoportok lesznek jogosultak %s elérésére.",
     "Test Filter" : "Test szűrő ",
-    "groups found" : "csoport van",
-    "Users login with this attribute:" : "A felhasználók ezzel az attribútummal jelentkeznek be:",
-    "LDAP Username:" : "LDAP felhasználónév:",
-    "LDAP Email Address:" : "LDAP e-mail cím:",
     "Other Attributes:" : "Más attribútumok:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül. Például: \"uid=%%uid\"",
     "1. Server" : "1. Kiszolgáló",
     "%s. Server:" : "%s. kiszolgáló",
-    "Add Server Configuration" : "Új kiszolgáló beállításának hozzáadása",
-    "Delete Configuration" : "Konfiguráció törlés",
     "Host" : "Kiszolgáló",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így:  ldaps://",
     "Port" : "Port",
@@ -69,7 +45,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP szűrők kézi beállitása (ajánlott a nagy könyvtáraknál)",
     "Limit %s access to users meeting these criteria:" : "Korlátozzuk a %s szolgáltatás elérését azokra a felhasználókra, akik megfelelnek a következő feltételeknek:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP felhasználók lesznek jogosultak %s elérésére.",
-    "users found" : "felhasználó van",
     "Saving" : "Mentés",
     "Back" : "Vissza",
     "Continue" : "Folytatás",
diff --git a/apps/user_ldap/l10n/ia.js b/apps/user_ldap/l10n/ia.js
index 0b6d9e3018a..c129620ee87 100644
--- a/apps/user_ldap/l10n/ia.js
+++ b/apps/user_ldap/l10n/ia.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Il falleva deler",
-    "Error" : "Error",
-    "Save" : "Salveguardar",
+    "Users" : "Usatores",
+    "Groups" : "Gruppos",
     "Help" : "Adjuta",
     "Password" : "Contrasigno",
     "Back" : "Retro",
diff --git a/apps/user_ldap/l10n/ia.json b/apps/user_ldap/l10n/ia.json
index 5b2b7df298d..86b535fd079 100644
--- a/apps/user_ldap/l10n/ia.json
+++ b/apps/user_ldap/l10n/ia.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "Il falleva deler",
-    "Error" : "Error",
-    "Save" : "Salveguardar",
+    "Users" : "Usatores",
+    "Groups" : "Gruppos",
     "Help" : "Adjuta",
     "Password" : "Contrasigno",
     "Back" : "Retro",
diff --git a/apps/user_ldap/l10n/id.js b/apps/user_ldap/l10n/id.js
index 3319f9bea58..255ee3ee1c8 100644
--- a/apps/user_ldap/l10n/id.js
+++ b/apps/user_ldap/l10n/id.js
@@ -10,54 +10,30 @@ OC.L10N.register(
     "No configuration specified" : "Tidak ada konfigurasi yang ditetapkan",
     "No data specified" : "Tidak ada data yang ditetapkan",
     " Could not set configuration %s" : "Tidak dapat menyetel konfigurasi %s",
-    "Deletion failed" : "Penghapusan gagal",
-    "Take over settings from recent server configuration?" : "Mengambil alih pengaturan dari konfigurasi server saat ini?",
-    "Keep settings?" : "Biarkan pengaturan?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Gagal menambah konfigurasi server",
-    "mappings cleared" : "pemetaan dibersihkan",
-    "Success" : "Berhasil",
-    "Error" : "Kesalahan",
-    "Please specify a Base DN" : "Sialakan menetapkan Base DN",
-    "Could not determine Base DN" : "Tidak dapat menetapkan Base DN",
-    "Please specify the port" : "Silakan tetapkan port",
-    "Configuration OK" : "Konfigurasi Oke",
     "Configuration incorrect" : "Konfigurasi salah",
     "Configuration incomplete" : "Konfigurasi tidak lengkap",
+    "Configuration OK" : "Konfigurasi Oke",
     "Select groups" : "Pilih grup",
     "Select object classes" : "Pilik kelas obyek",
-    "Select attributes" : "Pilih atribut",
-    "Connection test succeeded" : "Pemeriksaan koneksi berhasil",
-    "Connection test failed" : "Pemeriksaan koneksi gagal",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Apakan Anda ingin menghapus Konfigurasi Server saat ini?",
     "Confirm Deletion" : "Konfirmasi Penghapusan",
+    "Select attributes" : "Pilih atribut",
     "_%s group found_::_%s groups found_" : ["%s grup ditemukan"],
     "_%s user found_::_%s users found_" : ["%s pengguna ditemukan"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Tidak mendeteksi atribut nama tampilan pengguna. Silakan menentukannya sendiri di pengaturan ldap lanjutan.",
     "Could not find the desired feature" : "Tidak dapat menemukan fitur yang diinginkan",
     "Invalid Host" : "Host tidak sah",
     "Server" : "Server",
-    "User Filter" : "Penyaring Pengguna",
-    "Login Filter" : "Penyaring Masuk",
-    "Group Filter" : "Penyaring grup",
-    "Save" : "Simpan",
+    "Users" : "Pengguna",
+    "Groups" : "Grup",
     "Test Configuration" : "Uji Konfigurasi",
     "Help" : "Bantuan",
     "Groups meeting these criteria are available in %s:" : "Grup memenuhi kriteria ini tersedia di %s:",
-    "only those object classes:" : "hanya kelas objek:",
-    "only from those groups:" : "hanya dari kelompok:",
-    "Edit raw filter instead" : "Sunting penyaring raw",
-    "Raw LDAP filter" : "Penyaring LDAP raw",
     "Test Filter" : "Uji Penyaring",
-    "groups found" : "grup ditemukan",
-    "Users login with this attribute:" : "Login pengguna dengan atribut ini:",
-    "LDAP Username:" : "Nama pengguna LDAP:",
-    "LDAP Email Address:" : "Alamat Email LDAP:",
     "Other Attributes:" : "Atribut Lain:",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Tambah Konfigurasi Server",
-    "Delete Configuration" : "Hapus Konfigurasi",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol dapat tidak ditulis, kecuali Anda menggunakan SSL. Lalu jalankan dengan ldaps://",
     "Port" : "Port",
@@ -69,7 +45,6 @@ OC.L10N.register(
     "You can specify Base DN for users and groups in the Advanced tab" : "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan",
     "Manually enter LDAP filters (recommended for large directories)" : "Masukkan penyaring LDAP secara manual (direkomendasikan untuk direktori yang besar)",
     "Limit %s access to users meeting these criteria:" : "Batasi akses %s untuk pengguna yang sesuai dengan kriteria berikut:",
-    "users found" : "pengguna ditemukan",
     "Saving" : "Menyimpan",
     "Back" : "Kembali",
     "Continue" : "Lanjutkan",
diff --git a/apps/user_ldap/l10n/id.json b/apps/user_ldap/l10n/id.json
index c6a7ecd2e95..bbff7d43f0b 100644
--- a/apps/user_ldap/l10n/id.json
+++ b/apps/user_ldap/l10n/id.json
@@ -8,54 +8,30 @@
     "No configuration specified" : "Tidak ada konfigurasi yang ditetapkan",
     "No data specified" : "Tidak ada data yang ditetapkan",
     " Could not set configuration %s" : "Tidak dapat menyetel konfigurasi %s",
-    "Deletion failed" : "Penghapusan gagal",
-    "Take over settings from recent server configuration?" : "Mengambil alih pengaturan dari konfigurasi server saat ini?",
-    "Keep settings?" : "Biarkan pengaturan?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Gagal menambah konfigurasi server",
-    "mappings cleared" : "pemetaan dibersihkan",
-    "Success" : "Berhasil",
-    "Error" : "Kesalahan",
-    "Please specify a Base DN" : "Sialakan menetapkan Base DN",
-    "Could not determine Base DN" : "Tidak dapat menetapkan Base DN",
-    "Please specify the port" : "Silakan tetapkan port",
-    "Configuration OK" : "Konfigurasi Oke",
     "Configuration incorrect" : "Konfigurasi salah",
     "Configuration incomplete" : "Konfigurasi tidak lengkap",
+    "Configuration OK" : "Konfigurasi Oke",
     "Select groups" : "Pilih grup",
     "Select object classes" : "Pilik kelas obyek",
-    "Select attributes" : "Pilih atribut",
-    "Connection test succeeded" : "Pemeriksaan koneksi berhasil",
-    "Connection test failed" : "Pemeriksaan koneksi gagal",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Apakan Anda ingin menghapus Konfigurasi Server saat ini?",
     "Confirm Deletion" : "Konfirmasi Penghapusan",
+    "Select attributes" : "Pilih atribut",
     "_%s group found_::_%s groups found_" : ["%s grup ditemukan"],
     "_%s user found_::_%s users found_" : ["%s pengguna ditemukan"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Tidak mendeteksi atribut nama tampilan pengguna. Silakan menentukannya sendiri di pengaturan ldap lanjutan.",
     "Could not find the desired feature" : "Tidak dapat menemukan fitur yang diinginkan",
     "Invalid Host" : "Host tidak sah",
     "Server" : "Server",
-    "User Filter" : "Penyaring Pengguna",
-    "Login Filter" : "Penyaring Masuk",
-    "Group Filter" : "Penyaring grup",
-    "Save" : "Simpan",
+    "Users" : "Pengguna",
+    "Groups" : "Grup",
     "Test Configuration" : "Uji Konfigurasi",
     "Help" : "Bantuan",
     "Groups meeting these criteria are available in %s:" : "Grup memenuhi kriteria ini tersedia di %s:",
-    "only those object classes:" : "hanya kelas objek:",
-    "only from those groups:" : "hanya dari kelompok:",
-    "Edit raw filter instead" : "Sunting penyaring raw",
-    "Raw LDAP filter" : "Penyaring LDAP raw",
     "Test Filter" : "Uji Penyaring",
-    "groups found" : "grup ditemukan",
-    "Users login with this attribute:" : "Login pengguna dengan atribut ini:",
-    "LDAP Username:" : "Nama pengguna LDAP:",
-    "LDAP Email Address:" : "Alamat Email LDAP:",
     "Other Attributes:" : "Atribut Lain:",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Tambah Konfigurasi Server",
-    "Delete Configuration" : "Hapus Konfigurasi",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol dapat tidak ditulis, kecuali Anda menggunakan SSL. Lalu jalankan dengan ldaps://",
     "Port" : "Port",
@@ -67,7 +43,6 @@
     "You can specify Base DN for users and groups in the Advanced tab" : "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan",
     "Manually enter LDAP filters (recommended for large directories)" : "Masukkan penyaring LDAP secara manual (direkomendasikan untuk direktori yang besar)",
     "Limit %s access to users meeting these criteria:" : "Batasi akses %s untuk pengguna yang sesuai dengan kriteria berikut:",
-    "users found" : "pengguna ditemukan",
     "Saving" : "Menyimpan",
     "Back" : "Kembali",
     "Continue" : "Lanjutkan",
diff --git a/apps/user_ldap/l10n/is.js b/apps/user_ldap/l10n/is.js
index 920d3888240..1532ec7baff 100644
--- a/apps/user_ldap/l10n/is.js
+++ b/apps/user_ldap/l10n/is.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Keep settings?" : "Geyma stillingar ?",
-    "Error" : "Villa",
-    "Save" : "Vista",
+    "Users" : "Notendur",
+    "Groups" : "Hópar",
     "Test Configuration" : "Prúfa uppsetningu",
     "Help" : "Hjálp",
     "Host" : "Netþjónn",
diff --git a/apps/user_ldap/l10n/is.json b/apps/user_ldap/l10n/is.json
index 8c676efc7c7..c3ae29c3735 100644
--- a/apps/user_ldap/l10n/is.json
+++ b/apps/user_ldap/l10n/is.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Keep settings?" : "Geyma stillingar ?",
-    "Error" : "Villa",
-    "Save" : "Vista",
+    "Users" : "Notendur",
+    "Groups" : "Hópar",
     "Test Configuration" : "Prúfa uppsetningu",
     "Help" : "Hjálp",
     "Host" : "Netþjónn",
diff --git a/apps/user_ldap/l10n/it.js b/apps/user_ldap/l10n/it.js
index 3d0faefbcd0..f0b06342af2 100644
--- a/apps/user_ldap/l10n/it.js
+++ b/apps/user_ldap/l10n/it.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Nessuna configurazione specificata",
     "No data specified" : "Nessun dato specificato",
     " Could not set configuration %s" : "Impossibile impostare la configurazione %s",
-    "Deletion failed" : "Eliminazione non riuscita",
-    "Take over settings from recent server configuration?" : "Vuoi recuperare le impostazioni dalla configurazione recente del server?",
-    "Keep settings?" : "Vuoi mantenere le impostazioni?",
-    "{nthServer}. Server" : "{nthServer}. server",
-    "Cannot add server configuration" : "Impossibile aggiungere la configurazione del server",
-    "mappings cleared" : "associazioni cancellate",
-    "Success" : "Riuscito",
-    "Error" : "Errore",
-    "Please specify a Base DN" : "Specifica un DN base",
-    "Could not determine Base DN" : "Impossibile determinare il DN base",
-    "Please specify the port" : "Specifica la porta",
-    "Configuration OK" : "Configurazione corretta",
     "Configuration incorrect" : "Configurazione non corretta",
     "Configuration incomplete" : "Configurazione incompleta",
+    "Configuration OK" : "Configurazione corretta",
     "Select groups" : "Seleziona i gruppi",
     "Select object classes" : "Seleziona le classi di oggetti",
-    "Select attributes" : "Seleziona gli attributi",
-    "Connection test succeeded" : "Prova di connessione riuscita",
-    "Connection test failed" : "Prova di connessione non riuscita",
+    "{nthServer}. Server" : "{nthServer}. server",
     "Do you really want to delete the current Server Configuration?" : "Vuoi davvero eliminare la configurazione attuale del server?",
     "Confirm Deletion" : "Conferma l'eliminazione",
+    "Select attributes" : "Seleziona gli attributi",
     "_%s group found_::_%s groups found_" : ["%s gruppo trovato","%s gruppi trovati"],
     "_%s user found_::_%s users found_" : ["%s utente trovato","%s utenti trovati"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossibile rilevare l'attributo nome visualizzato dell'utente. Specificalo nelle impostazioni avanzate di ldap.",
     "Could not find the desired feature" : "Impossibile trovare la funzionalità desiderata",
     "Invalid Host" : "Host non valido",
     "Server" : "Server",
-    "User Filter" : "Filtro utente",
-    "Login Filter" : "Filtro accesso",
-    "Group Filter" : "Filtro gruppo",
-    "Save" : "Salva",
+    "Users" : "Utenti",
+    "Groups" : "Gruppi",
     "Test Configuration" : "Prova configurazione",
     "Help" : "Aiuto",
     "Groups meeting these criteria are available in %s:" : "I gruppi che corrispondono a questi criteri sono disponibili in %s:",
-    "only those object classes:" : "solo queste classi di oggetti:",
-    "only from those groups:" : "solo da questi gruppi:",
-    "Edit raw filter instead" : "Modifica invece il filtro grezzo",
-    "Raw LDAP filter" : "Filtro LDAP grezzo",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Il filtro specifica quali gruppi LDAP devono avere accesso all'istanza %s.",
     "Test Filter" : "Prova filtro",
-    "groups found" : "gruppi trovati",
-    "Users login with this attribute:" : "Utenti con questo attributo:",
-    "LDAP Username:" : "Nome utente LDAP:",
-    "LDAP Email Address:" : "Indirizzo email LDAP:",
     "Other Attributes:" : "Altri attributi:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso. Esempio: \"uid=%%uid\"",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
-    "Add Server Configuration" : "Aggiungi configurazione del server",
-    "Delete Configuration" : "Elimina configurazione",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
     "Port" : "Porta",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Digita manualmente i filtri LDAP (consigliato per directory grandi)",
     "Limit %s access to users meeting these criteria:" : "Limita l'accesso a %s ai gruppi che verificano questi criteri:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Il filtro specifica quali utenti LDAP devono avere accesso all'istanza %s.",
-    "users found" : "utenti trovati",
     "Saving" : "Salvataggio",
     "Back" : "Indietro",
     "Continue" : "Continua",
diff --git a/apps/user_ldap/l10n/it.json b/apps/user_ldap/l10n/it.json
index c5c4950379e..115bdb3b0cd 100644
--- a/apps/user_ldap/l10n/it.json
+++ b/apps/user_ldap/l10n/it.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Nessuna configurazione specificata",
     "No data specified" : "Nessun dato specificato",
     " Could not set configuration %s" : "Impossibile impostare la configurazione %s",
-    "Deletion failed" : "Eliminazione non riuscita",
-    "Take over settings from recent server configuration?" : "Vuoi recuperare le impostazioni dalla configurazione recente del server?",
-    "Keep settings?" : "Vuoi mantenere le impostazioni?",
-    "{nthServer}. Server" : "{nthServer}. server",
-    "Cannot add server configuration" : "Impossibile aggiungere la configurazione del server",
-    "mappings cleared" : "associazioni cancellate",
-    "Success" : "Riuscito",
-    "Error" : "Errore",
-    "Please specify a Base DN" : "Specifica un DN base",
-    "Could not determine Base DN" : "Impossibile determinare il DN base",
-    "Please specify the port" : "Specifica la porta",
-    "Configuration OK" : "Configurazione corretta",
     "Configuration incorrect" : "Configurazione non corretta",
     "Configuration incomplete" : "Configurazione incompleta",
+    "Configuration OK" : "Configurazione corretta",
     "Select groups" : "Seleziona i gruppi",
     "Select object classes" : "Seleziona le classi di oggetti",
-    "Select attributes" : "Seleziona gli attributi",
-    "Connection test succeeded" : "Prova di connessione riuscita",
-    "Connection test failed" : "Prova di connessione non riuscita",
+    "{nthServer}. Server" : "{nthServer}. server",
     "Do you really want to delete the current Server Configuration?" : "Vuoi davvero eliminare la configurazione attuale del server?",
     "Confirm Deletion" : "Conferma l'eliminazione",
+    "Select attributes" : "Seleziona gli attributi",
     "_%s group found_::_%s groups found_" : ["%s gruppo trovato","%s gruppi trovati"],
     "_%s user found_::_%s users found_" : ["%s utente trovato","%s utenti trovati"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossibile rilevare l'attributo nome visualizzato dell'utente. Specificalo nelle impostazioni avanzate di ldap.",
     "Could not find the desired feature" : "Impossibile trovare la funzionalità desiderata",
     "Invalid Host" : "Host non valido",
     "Server" : "Server",
-    "User Filter" : "Filtro utente",
-    "Login Filter" : "Filtro accesso",
-    "Group Filter" : "Filtro gruppo",
-    "Save" : "Salva",
+    "Users" : "Utenti",
+    "Groups" : "Gruppi",
     "Test Configuration" : "Prova configurazione",
     "Help" : "Aiuto",
     "Groups meeting these criteria are available in %s:" : "I gruppi che corrispondono a questi criteri sono disponibili in %s:",
-    "only those object classes:" : "solo queste classi di oggetti:",
-    "only from those groups:" : "solo da questi gruppi:",
-    "Edit raw filter instead" : "Modifica invece il filtro grezzo",
-    "Raw LDAP filter" : "Filtro LDAP grezzo",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Il filtro specifica quali gruppi LDAP devono avere accesso all'istanza %s.",
     "Test Filter" : "Prova filtro",
-    "groups found" : "gruppi trovati",
-    "Users login with this attribute:" : "Utenti con questo attributo:",
-    "LDAP Username:" : "Nome utente LDAP:",
-    "LDAP Email Address:" : "Indirizzo email LDAP:",
     "Other Attributes:" : "Altri attributi:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso. Esempio: \"uid=%%uid\"",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
-    "Add Server Configuration" : "Aggiungi configurazione del server",
-    "Delete Configuration" : "Elimina configurazione",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
     "Port" : "Porta",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Digita manualmente i filtri LDAP (consigliato per directory grandi)",
     "Limit %s access to users meeting these criteria:" : "Limita l'accesso a %s ai gruppi che verificano questi criteri:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Il filtro specifica quali utenti LDAP devono avere accesso all'istanza %s.",
-    "users found" : "utenti trovati",
     "Saving" : "Salvataggio",
     "Back" : "Indietro",
     "Continue" : "Continua",
diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js
index 84ae5b22991..fd2ef9c9145 100644
--- a/apps/user_ldap/l10n/ja.js
+++ b/apps/user_ldap/l10n/ja.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "構成が指定されていません",
     "No data specified" : "データが指定されていません",
     " Could not set configuration %s" : "構成 %s を設定できませんでした",
-    "Deletion failed" : "削除に失敗しました",
-    "Take over settings from recent server configuration?" : "最新のサーバー設定から設定を引き継ぎますか？",
-    "Keep settings?" : "設定を保持しますか？",
-    "{nthServer}. Server" : "{nthServer}. サーバー",
-    "Cannot add server configuration" : "サーバー設定を追加できません",
-    "mappings cleared" : "マッピングをクリアしました",
-    "Success" : "成功",
-    "Error" : "エラー",
-    "Please specify a Base DN" : "ベースDN を指定してください",
-    "Could not determine Base DN" : "ベースDNを決定できませんでした",
-    "Please specify the port" : "ポートを指定してください",
-    "Configuration OK" : "設定OK",
     "Configuration incorrect" : "設定に誤りがあります",
     "Configuration incomplete" : "設定が不完全です",
+    "Configuration OK" : "設定OK",
     "Select groups" : "グループを選択",
     "Select object classes" : "オブジェクトクラスを選択",
-    "Select attributes" : "属性を選択",
-    "Connection test succeeded" : "接続テストに成功しました",
-    "Connection test failed" : "接続テストに失敗しました",
+    "{nthServer}. Server" : "{nthServer}. サーバー",
     "Do you really want to delete the current Server Configuration?" : "現在のサーバー設定を本当に削除してもよろしいですか？",
     "Confirm Deletion" : "削除の確認",
+    "Select attributes" : "属性を選択",
     "_%s group found_::_%s groups found_" : ["%s グループが見つかりました"],
     "_%s user found_::_%s users found_" : ["%s ユーザーが見つかりました"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "ユーザー表示名の属性を検出できませんでした。詳細設定で対応する属性を指定してください。",
     "Could not find the desired feature" : "望ましい機能は見つかりませんでした",
     "Invalid Host" : "無効なホスト",
     "Server" : "サーバー",
-    "User Filter" : "ユーザーフィルター",
-    "Login Filter" : "ログインフィルター",
-    "Group Filter" : "グループフィルター",
-    "Save" : "保存",
+    "Users" : "ユーザー",
+    "Groups" : "グループ",
     "Test Configuration" : "設定をテスト",
     "Help" : "ヘルプ",
     "Groups meeting these criteria are available in %s:" : "これらの基準を満たすグループが %s で利用可能:",
-    "only those object classes:" : "このオブジェクトクラスのみ:",
-    "only from those groups:" : "次のグループから:",
-    "Edit raw filter instead" : "フィルターを直接編集",
-    "Raw LDAP filter" : "LDAPフィルター",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルターは、どの LDAP グループが %s にアクセスするかを指定します。",
     "Test Filter" : "フィルターをテスト",
-    "groups found" : "グループが見つかりました",
-    "Users login with this attribute:" : "この属性でユーザーログイン:",
-    "LDAP Username:" : "LDAPユーザー名:",
-    "LDAP Email Address:" : "LDAPメールアドレス:",
     "Other Attributes:" : "その他の属性:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルターを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例： \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. サーバー:",
-    "Add Server Configuration" : "サーバー設定を追加",
-    "Delete Configuration" : "設定を削除",
     "Host" : "ホスト",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
     "Port" : "ポート",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)",
     "Limit %s access to users meeting these criteria:" : "以下のフィルターに適合するユーザーのみ %s へアクセスを許可:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "フィルターは、どのLDAPユーザーが %s にアクセスするかを指定します。",
-    "users found" : "ユーザーが見つかりました",
     "Saving" : "保存中",
     "Back" : "戻る",
     "Continue" : "続ける",
diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json
index a03d120b1e8..7117cb0ec17 100644
--- a/apps/user_ldap/l10n/ja.json
+++ b/apps/user_ldap/l10n/ja.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "構成が指定されていません",
     "No data specified" : "データが指定されていません",
     " Could not set configuration %s" : "構成 %s を設定できませんでした",
-    "Deletion failed" : "削除に失敗しました",
-    "Take over settings from recent server configuration?" : "最新のサーバー設定から設定を引き継ぎますか？",
-    "Keep settings?" : "設定を保持しますか？",
-    "{nthServer}. Server" : "{nthServer}. サーバー",
-    "Cannot add server configuration" : "サーバー設定を追加できません",
-    "mappings cleared" : "マッピングをクリアしました",
-    "Success" : "成功",
-    "Error" : "エラー",
-    "Please specify a Base DN" : "ベースDN を指定してください",
-    "Could not determine Base DN" : "ベースDNを決定できませんでした",
-    "Please specify the port" : "ポートを指定してください",
-    "Configuration OK" : "設定OK",
     "Configuration incorrect" : "設定に誤りがあります",
     "Configuration incomplete" : "設定が不完全です",
+    "Configuration OK" : "設定OK",
     "Select groups" : "グループを選択",
     "Select object classes" : "オブジェクトクラスを選択",
-    "Select attributes" : "属性を選択",
-    "Connection test succeeded" : "接続テストに成功しました",
-    "Connection test failed" : "接続テストに失敗しました",
+    "{nthServer}. Server" : "{nthServer}. サーバー",
     "Do you really want to delete the current Server Configuration?" : "現在のサーバー設定を本当に削除してもよろしいですか？",
     "Confirm Deletion" : "削除の確認",
+    "Select attributes" : "属性を選択",
     "_%s group found_::_%s groups found_" : ["%s グループが見つかりました"],
     "_%s user found_::_%s users found_" : ["%s ユーザーが見つかりました"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "ユーザー表示名の属性を検出できませんでした。詳細設定で対応する属性を指定してください。",
     "Could not find the desired feature" : "望ましい機能は見つかりませんでした",
     "Invalid Host" : "無効なホスト",
     "Server" : "サーバー",
-    "User Filter" : "ユーザーフィルター",
-    "Login Filter" : "ログインフィルター",
-    "Group Filter" : "グループフィルター",
-    "Save" : "保存",
+    "Users" : "ユーザー",
+    "Groups" : "グループ",
     "Test Configuration" : "設定をテスト",
     "Help" : "ヘルプ",
     "Groups meeting these criteria are available in %s:" : "これらの基準を満たすグループが %s で利用可能:",
-    "only those object classes:" : "このオブジェクトクラスのみ:",
-    "only from those groups:" : "次のグループから:",
-    "Edit raw filter instead" : "フィルターを直接編集",
-    "Raw LDAP filter" : "LDAPフィルター",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルターは、どの LDAP グループが %s にアクセスするかを指定します。",
     "Test Filter" : "フィルターをテスト",
-    "groups found" : "グループが見つかりました",
-    "Users login with this attribute:" : "この属性でユーザーログイン:",
-    "LDAP Username:" : "LDAPユーザー名:",
-    "LDAP Email Address:" : "LDAPメールアドレス:",
     "Other Attributes:" : "その他の属性:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルターを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例： \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. サーバー:",
-    "Add Server Configuration" : "サーバー設定を追加",
-    "Delete Configuration" : "設定を削除",
     "Host" : "ホスト",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
     "Port" : "ポート",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)",
     "Limit %s access to users meeting these criteria:" : "以下のフィルターに適合するユーザーのみ %s へアクセスを許可:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "フィルターは、どのLDAPユーザーが %s にアクセスするかを指定します。",
-    "users found" : "ユーザーが見つかりました",
     "Saving" : "保存中",
     "Back" : "戻る",
     "Continue" : "続ける",
diff --git a/apps/user_ldap/l10n/ka_GE.js b/apps/user_ldap/l10n/ka_GE.js
index 8258d994a9d..c2fc858d153 100644
--- a/apps/user_ldap/l10n/ka_GE.js
+++ b/apps/user_ldap/l10n/ka_GE.js
@@ -4,22 +4,13 @@ OC.L10N.register(
     "Failed to delete the server configuration" : "შეცდომა სერვერის კონფიგურაციის წაშლისას",
     "The configuration is valid and the connection could be established!" : "კონფიგურაცია მართებულია და კავშირი დამყარდება!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "კონფიგურაცია მართებულია, მაგრამ მიერთება ვერ მოხერხდა. გთხოვთ შეამოწმოთ სერვერის პარამეტრები და აუთენთიკაციის პარამეტრები.",
-    "Deletion failed" : "წაშლა ვერ განხორციელდა",
-    "Take over settings from recent server configuration?" : "დაბრუნდებით სერვერის წინა კონფიგურაციაში?",
-    "Keep settings?" : "დავტოვოთ პარამეტრები?",
-    "Cannot add server configuration" : "სერვერის პარამეტრების დამატება ვერ მოხერხდა",
-    "Success" : "დასრულდა",
-    "Error" : "შეცდომა",
     "Select groups" : "ჯგუფების არჩევა",
-    "Connection test succeeded" : "კავშირის ტესტირება მოხერხდა",
-    "Connection test failed" : "კავშირის ტესტირება ვერ მოხერხდა",
     "Do you really want to delete the current Server Configuration?" : "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?",
     "Confirm Deletion" : "წაშლის დადასტურება",
-    "Group Filter" : "ჯგუფის ფილტრი",
-    "Save" : "შენახვა",
+    "Users" : "მომხმარებელი",
+    "Groups" : "ჯგუფები",
     "Test Configuration" : "კავშირის ტესტირება",
     "Help" : "დახმარება",
-    "Add Server Configuration" : "სერვერის პარამეტრების დამატება",
     "Host" : "ჰოსტი",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "თქვენ შეგიძლიათ გამოტოვოთ პროტოკოლი. გარდა ამისა გჭირდებათ SSL. შემდეგ დაიწყეთ ldaps://",
     "Port" : "პორტი",
diff --git a/apps/user_ldap/l10n/ka_GE.json b/apps/user_ldap/l10n/ka_GE.json
index 432ec44637d..be93dc5a626 100644
--- a/apps/user_ldap/l10n/ka_GE.json
+++ b/apps/user_ldap/l10n/ka_GE.json
@@ -2,22 +2,13 @@
     "Failed to delete the server configuration" : "შეცდომა სერვერის კონფიგურაციის წაშლისას",
     "The configuration is valid and the connection could be established!" : "კონფიგურაცია მართებულია და კავშირი დამყარდება!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "კონფიგურაცია მართებულია, მაგრამ მიერთება ვერ მოხერხდა. გთხოვთ შეამოწმოთ სერვერის პარამეტრები და აუთენთიკაციის პარამეტრები.",
-    "Deletion failed" : "წაშლა ვერ განხორციელდა",
-    "Take over settings from recent server configuration?" : "დაბრუნდებით სერვერის წინა კონფიგურაციაში?",
-    "Keep settings?" : "დავტოვოთ პარამეტრები?",
-    "Cannot add server configuration" : "სერვერის პარამეტრების დამატება ვერ მოხერხდა",
-    "Success" : "დასრულდა",
-    "Error" : "შეცდომა",
     "Select groups" : "ჯგუფების არჩევა",
-    "Connection test succeeded" : "კავშირის ტესტირება მოხერხდა",
-    "Connection test failed" : "კავშირის ტესტირება ვერ მოხერხდა",
     "Do you really want to delete the current Server Configuration?" : "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?",
     "Confirm Deletion" : "წაშლის დადასტურება",
-    "Group Filter" : "ჯგუფის ფილტრი",
-    "Save" : "შენახვა",
+    "Users" : "მომხმარებელი",
+    "Groups" : "ჯგუფები",
     "Test Configuration" : "კავშირის ტესტირება",
     "Help" : "დახმარება",
-    "Add Server Configuration" : "სერვერის პარამეტრების დამატება",
     "Host" : "ჰოსტი",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "თქვენ შეგიძლიათ გამოტოვოთ პროტოკოლი. გარდა ამისა გჭირდებათ SSL. შემდეგ დაიწყეთ ldaps://",
     "Port" : "პორტი",
diff --git a/apps/user_ldap/l10n/km.js b/apps/user_ldap/l10n/km.js
index 31d78a10c64..a42ee7b14f1 100644
--- a/apps/user_ldap/l10n/km.js
+++ b/apps/user_ldap/l10n/km.js
@@ -2,17 +2,11 @@ OC.L10N.register(
     "user_ldap",
     {
     "Failed to delete the server configuration" : "លុប​ការ​កំណត់​រចនា​សម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ មិន​បាន​សម្រេច",
-    "Deletion failed" : "លុប​មិន​បាន​សម្រេច",
-    "Keep settings?" : "រក្សា​ទុក​ការ​កំណត់?",
-    "Cannot add server configuration" : "មិន​អាច​បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
-    "Error" : "កំហុស",
-    "Connection test succeeded" : "សាក​ល្បង​ការ​ត​ភ្ជាប់ បាន​ជោគជ័យ",
-    "Connection test failed" : "សាកល្បង​ការ​តភ្ជាប់ មិន​បាន​សម្រេច",
     "Do you really want to delete the current Server Configuration?" : "តើ​អ្នក​ពិត​ជា​ចង់​លុប​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ​បច្ចុប្បន្ន​មែន​ទេ?",
     "Confirm Deletion" : "បញ្ជាក់​ការ​លុប",
-    "Save" : "រក្សាទុក",
+    "Users" : "អ្នកប្រើ",
+    "Groups" : "ក្រុ",
     "Help" : "ជំនួយ",
-    "Add Server Configuration" : "បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
     "Host" : "ម៉ាស៊ីន​ផ្ទុក",
     "Port" : "ច្រក",
     "Password" : "ពាក្យសម្ងាត់",
diff --git a/apps/user_ldap/l10n/km.json b/apps/user_ldap/l10n/km.json
index ef431cbff4f..5c8ec8897ba 100644
--- a/apps/user_ldap/l10n/km.json
+++ b/apps/user_ldap/l10n/km.json
@@ -1,16 +1,10 @@
 { "translations": {
     "Failed to delete the server configuration" : "លុប​ការ​កំណត់​រចនា​សម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ មិន​បាន​សម្រេច",
-    "Deletion failed" : "លុប​មិន​បាន​សម្រេច",
-    "Keep settings?" : "រក្សា​ទុក​ការ​កំណត់?",
-    "Cannot add server configuration" : "មិន​អាច​បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
-    "Error" : "កំហុស",
-    "Connection test succeeded" : "សាក​ល្បង​ការ​ត​ភ្ជាប់ បាន​ជោគជ័យ",
-    "Connection test failed" : "សាកល្បង​ការ​តភ្ជាប់ មិន​បាន​សម្រេច",
     "Do you really want to delete the current Server Configuration?" : "តើ​អ្នក​ពិត​ជា​ចង់​លុប​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ​បច្ចុប្បន្ន​មែន​ទេ?",
     "Confirm Deletion" : "បញ្ជាក់​ការ​លុប",
-    "Save" : "រក្សាទុក",
+    "Users" : "អ្នកប្រើ",
+    "Groups" : "ក្រុ",
     "Help" : "ជំនួយ",
-    "Add Server Configuration" : "បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
     "Host" : "ម៉ាស៊ីន​ផ្ទុក",
     "Port" : "ច្រក",
     "Password" : "ពាក្យសម្ងាត់",
diff --git a/apps/user_ldap/l10n/kn.js b/apps/user_ldap/l10n/kn.js
index 5731cd96b65..f70fc699983 100644
--- a/apps/user_ldap/l10n/kn.js
+++ b/apps/user_ldap/l10n/kn.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "ತಪ್ಪಾಗಿದೆ",
-    "Save" : "ಉಳಿಸಿ",
+    "Users" : "ಬಳಕೆದಾರರು",
+    "Groups" : "ಗುಂಪುಗಳು",
     "Help" : "ಸಹಾಯ",
     "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
     "Port" : "ರೇವು",
diff --git a/apps/user_ldap/l10n/kn.json b/apps/user_ldap/l10n/kn.json
index 8cb3c34a54d..39705ffba6a 100644
--- a/apps/user_ldap/l10n/kn.json
+++ b/apps/user_ldap/l10n/kn.json
@@ -1,6 +1,6 @@
 { "translations": {
-    "Error" : "ತಪ್ಪಾಗಿದೆ",
-    "Save" : "ಉಳಿಸಿ",
+    "Users" : "ಬಳಕೆದಾರರು",
+    "Groups" : "ಗುಂಪುಗಳು",
     "Help" : "ಸಹಾಯ",
     "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
     "Port" : "ರೇವು",
diff --git a/apps/user_ldap/l10n/ko.js b/apps/user_ldap/l10n/ko.js
index 85607d571b6..94be236ab63 100644
--- a/apps/user_ldap/l10n/ko.js
+++ b/apps/user_ldap/l10n/ko.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "설정이 지정되지 않음",
     "No data specified" : "데이터가 지정되지 않음",
     " Could not set configuration %s" : " 설정 %s을(를) 지정할 수 없음",
-    "Deletion failed" : "삭제 실패",
-    "Take over settings from recent server configuration?" : "최근 서버 설정을 다시 불러오시겠습니까?",
-    "Keep settings?" : "설정을 유지하겠습니까?",
-    "{nthServer}. Server" : "{nthServer}. 서버",
-    "Cannot add server configuration" : "서버 설정을 추가할 수 없음",
-    "mappings cleared" : "매핑 삭제됨",
-    "Success" : "성공",
-    "Error" : "오류",
-    "Please specify a Base DN" : "기본 DN을 입력하십시오",
-    "Could not determine Base DN" : "기본 DN을 결정할 수 없음",
-    "Please specify the port" : "포트를 입력하십시오",
-    "Configuration OK" : "설정 올바름",
     "Configuration incorrect" : "설정 올바르지 않음",
     "Configuration incomplete" : "설정 불완전함",
+    "Configuration OK" : "설정 올바름",
     "Select groups" : "그룹 선택",
     "Select object classes" : "객체 클래스 선택",
-    "Select attributes" : "속성 선택",
-    "Connection test succeeded" : "연결 시험 성공",
-    "Connection test failed" : "연결 시험 실패",
+    "{nthServer}. Server" : "{nthServer}. 서버",
     "Do you really want to delete the current Server Configuration?" : "현재 서버 설정을 지우시겠습니까?",
     "Confirm Deletion" : "삭제 확인",
+    "Select attributes" : "속성 선택",
     "_%s group found_::_%s groups found_" : ["그룹 %s개 찾음"],
     "_%s user found_::_%s users found_" : ["사용자 %s명 찾음"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "사용자 표시 이름을 결정할 수 없습니다. 고급 LDAP 설정에서 직접 입력하십시오.",
     "Could not find the desired feature" : "필요한 기능을 찾을 수 없음",
     "Invalid Host" : "잘못된 호스트",
     "Server" : "서버",
-    "User Filter" : "사용자 필터",
-    "Login Filter" : "로그인 필터",
-    "Group Filter" : "그룹 필터",
-    "Save" : "저장",
+    "Users" : "사용자",
+    "Groups" : "그룹",
     "Test Configuration" : "설정 시험",
     "Help" : "도움말",
     "Groups meeting these criteria are available in %s:" : "이 조건을 만족하는 그룹은 %s에 있습니다:",
-    "only those object classes:" : "다음 객체 클래스만:",
-    "only from those groups:" : "다음 그룹에서만:",
-    "Edit raw filter instead" : "필터 직접 편집",
-    "Raw LDAP filter" : "LDAP 필터",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 그룹을 설정합니다.",
     "Test Filter" : "필터 시험",
-    "groups found" : "그룹 찾음",
-    "Users login with this attribute:" : "다음 속성으로 사용자 로그인:",
-    "LDAP Username:" : "LDAP 사용자 이름:",
-    "LDAP Email Address:" : "LDAP 이메일 주소:",
     "Other Attributes:" : "기타 속성:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "로그인을 시도할 때 적용할 필터를 입력하십시오. %%uid는 로그인 동작의 사용자 이름으로 대체됩니다. 예: \"uid=%%uid\"",
     "1. Server" : "1. 서버",
     "%s. Server:" : "%s. 서버:",
-    "Add Server Configuration" : "서버 설정 추가",
-    "Delete Configuration" : "설정 삭제",
     "Host" : "호스트",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL을 사용하지 않으면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오.",
     "Port" : "포트",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "수동으로 LDAP 필터 입력(대형 사이트에 추천)",
     "Limit %s access to users meeting these criteria:" : "다음 조건을 만족하는 사용자만 %s 접근 허용:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 사용자를 설정합니다.",
-    "users found" : "사용자 찾음",
     "Saving" : "저장 중",
     "Back" : "뒤로",
     "Continue" : "계속",
diff --git a/apps/user_ldap/l10n/ko.json b/apps/user_ldap/l10n/ko.json
index 9179f76480e..d426febafcd 100644
--- a/apps/user_ldap/l10n/ko.json
+++ b/apps/user_ldap/l10n/ko.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "설정이 지정되지 않음",
     "No data specified" : "데이터가 지정되지 않음",
     " Could not set configuration %s" : " 설정 %s을(를) 지정할 수 없음",
-    "Deletion failed" : "삭제 실패",
-    "Take over settings from recent server configuration?" : "최근 서버 설정을 다시 불러오시겠습니까?",
-    "Keep settings?" : "설정을 유지하겠습니까?",
-    "{nthServer}. Server" : "{nthServer}. 서버",
-    "Cannot add server configuration" : "서버 설정을 추가할 수 없음",
-    "mappings cleared" : "매핑 삭제됨",
-    "Success" : "성공",
-    "Error" : "오류",
-    "Please specify a Base DN" : "기본 DN을 입력하십시오",
-    "Could not determine Base DN" : "기본 DN을 결정할 수 없음",
-    "Please specify the port" : "포트를 입력하십시오",
-    "Configuration OK" : "설정 올바름",
     "Configuration incorrect" : "설정 올바르지 않음",
     "Configuration incomplete" : "설정 불완전함",
+    "Configuration OK" : "설정 올바름",
     "Select groups" : "그룹 선택",
     "Select object classes" : "객체 클래스 선택",
-    "Select attributes" : "속성 선택",
-    "Connection test succeeded" : "연결 시험 성공",
-    "Connection test failed" : "연결 시험 실패",
+    "{nthServer}. Server" : "{nthServer}. 서버",
     "Do you really want to delete the current Server Configuration?" : "현재 서버 설정을 지우시겠습니까?",
     "Confirm Deletion" : "삭제 확인",
+    "Select attributes" : "속성 선택",
     "_%s group found_::_%s groups found_" : ["그룹 %s개 찾음"],
     "_%s user found_::_%s users found_" : ["사용자 %s명 찾음"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "사용자 표시 이름을 결정할 수 없습니다. 고급 LDAP 설정에서 직접 입력하십시오.",
     "Could not find the desired feature" : "필요한 기능을 찾을 수 없음",
     "Invalid Host" : "잘못된 호스트",
     "Server" : "서버",
-    "User Filter" : "사용자 필터",
-    "Login Filter" : "로그인 필터",
-    "Group Filter" : "그룹 필터",
-    "Save" : "저장",
+    "Users" : "사용자",
+    "Groups" : "그룹",
     "Test Configuration" : "설정 시험",
     "Help" : "도움말",
     "Groups meeting these criteria are available in %s:" : "이 조건을 만족하는 그룹은 %s에 있습니다:",
-    "only those object classes:" : "다음 객체 클래스만:",
-    "only from those groups:" : "다음 그룹에서만:",
-    "Edit raw filter instead" : "필터 직접 편집",
-    "Raw LDAP filter" : "LDAP 필터",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 그룹을 설정합니다.",
     "Test Filter" : "필터 시험",
-    "groups found" : "그룹 찾음",
-    "Users login with this attribute:" : "다음 속성으로 사용자 로그인:",
-    "LDAP Username:" : "LDAP 사용자 이름:",
-    "LDAP Email Address:" : "LDAP 이메일 주소:",
     "Other Attributes:" : "기타 속성:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "로그인을 시도할 때 적용할 필터를 입력하십시오. %%uid는 로그인 동작의 사용자 이름으로 대체됩니다. 예: \"uid=%%uid\"",
     "1. Server" : "1. 서버",
     "%s. Server:" : "%s. 서버:",
-    "Add Server Configuration" : "서버 설정 추가",
-    "Delete Configuration" : "설정 삭제",
     "Host" : "호스트",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL을 사용하지 않으면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오.",
     "Port" : "포트",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "수동으로 LDAP 필터 입력(대형 사이트에 추천)",
     "Limit %s access to users meeting these criteria:" : "다음 조건을 만족하는 사용자만 %s 접근 허용:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 사용자를 설정합니다.",
-    "users found" : "사용자 찾음",
     "Saving" : "저장 중",
     "Back" : "뒤로",
     "Continue" : "계속",
diff --git a/apps/user_ldap/l10n/ku_IQ.js b/apps/user_ldap/l10n/ku_IQ.js
index 0efd01a4fc2..35a4747c8e1 100644
--- a/apps/user_ldap/l10n/ku_IQ.js
+++ b/apps/user_ldap/l10n/ku_IQ.js
@@ -1,9 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Success" : "سه‌رکه‌وتن",
-    "Error" : "هه‌ڵه",
-    "Save" : "پاشکه‌وتکردن",
+    "Users" : "به‌كارهێنه‌ر",
     "Help" : "یارمەتی",
     "Password" : "وشەی تێپەربو",
     "Advanced" : "هه‌ڵبژاردنی پیشكه‌وتوو"
diff --git a/apps/user_ldap/l10n/ku_IQ.json b/apps/user_ldap/l10n/ku_IQ.json
index ecb9742663b..0b776905a9a 100644
--- a/apps/user_ldap/l10n/ku_IQ.json
+++ b/apps/user_ldap/l10n/ku_IQ.json
@@ -1,7 +1,5 @@
 { "translations": {
-    "Success" : "سه‌رکه‌وتن",
-    "Error" : "هه‌ڵه",
-    "Save" : "پاشکه‌وتکردن",
+    "Users" : "به‌كارهێنه‌ر",
     "Help" : "یارمەتی",
     "Password" : "وشەی تێپەربو",
     "Advanced" : "هه‌ڵبژاردنی پیشكه‌وتوو"
diff --git a/apps/user_ldap/l10n/lb.js b/apps/user_ldap/l10n/lb.js
index 69cd462ffc1..78e8ca45c38 100644
--- a/apps/user_ldap/l10n/lb.js
+++ b/apps/user_ldap/l10n/lb.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Konnt net läschen",
-    "Error" : "Fehler",
-    "Save" : "Späicheren",
+    "Users" : "Benotzer",
+    "Groups" : "Gruppen",
     "Help" : "Hëllef",
     "Host" : "Host",
     "Password" : "Passwuert",
diff --git a/apps/user_ldap/l10n/lb.json b/apps/user_ldap/l10n/lb.json
index 9b2d7ff9da0..7776bf5e76a 100644
--- a/apps/user_ldap/l10n/lb.json
+++ b/apps/user_ldap/l10n/lb.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "Konnt net läschen",
-    "Error" : "Fehler",
-    "Save" : "Späicheren",
+    "Users" : "Benotzer",
+    "Groups" : "Gruppen",
     "Help" : "Hëllef",
     "Host" : "Host",
     "Password" : "Passwuert",
diff --git a/apps/user_ldap/l10n/lt_LT.js b/apps/user_ldap/l10n/lt_LT.js
index ca6ae94c622..84d3cb8463e 100644
--- a/apps/user_ldap/l10n/lt_LT.js
+++ b/apps/user_ldap/l10n/lt_LT.js
@@ -4,22 +4,13 @@ OC.L10N.register(
     "Failed to clear the mappings." : "Nepavyko išvalyti sąsajų.",
     "Failed to delete the server configuration" : "Nepavyko pašalinti serverio konfigūracijos",
     "The configuration is valid and the connection could be established!" : "Konfigūracija yra tinkama bei prisijungta sėkmingai!",
-    "Deletion failed" : "Ištrinti nepavyko",
-    "Keep settings?" : "Išlaikyti nustatymus?",
-    "Cannot add server configuration" : "Negalima pridėti serverio konfigūracijos",
-    "mappings cleared" : "susiejimai išvalyti",
-    "Success" : "Sėkmingai",
-    "Error" : "Klaida",
     "Select groups" : "Pasirinkti grupes",
-    "Connection test succeeded" : "Ryšio patikrinimas pavyko",
-    "Connection test failed" : "Ryšio patikrinimas nepavyko",
     "Do you really want to delete the current Server Configuration?" : "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?",
     "Confirm Deletion" : "Patvirtinkite trynimą",
-    "Group Filter" : "Grupės filtras",
-    "Save" : "Išsaugoti",
+    "Users" : "Vartotojai",
+    "Groups" : "Grupės",
     "Test Configuration" : "Bandyti konfigūraciją",
     "Help" : "Pagalba",
-    "Add Server Configuration" : "Pridėti serverio konfigūraciją",
     "Host" : "Mazgas",
     "Port" : "Prievadas",
     "User DN" : "Naudotojas DN",
diff --git a/apps/user_ldap/l10n/lt_LT.json b/apps/user_ldap/l10n/lt_LT.json
index 982af1cc4f4..fd385a1e8dc 100644
--- a/apps/user_ldap/l10n/lt_LT.json
+++ b/apps/user_ldap/l10n/lt_LT.json
@@ -2,22 +2,13 @@
     "Failed to clear the mappings." : "Nepavyko išvalyti sąsajų.",
     "Failed to delete the server configuration" : "Nepavyko pašalinti serverio konfigūracijos",
     "The configuration is valid and the connection could be established!" : "Konfigūracija yra tinkama bei prisijungta sėkmingai!",
-    "Deletion failed" : "Ištrinti nepavyko",
-    "Keep settings?" : "Išlaikyti nustatymus?",
-    "Cannot add server configuration" : "Negalima pridėti serverio konfigūracijos",
-    "mappings cleared" : "susiejimai išvalyti",
-    "Success" : "Sėkmingai",
-    "Error" : "Klaida",
     "Select groups" : "Pasirinkti grupes",
-    "Connection test succeeded" : "Ryšio patikrinimas pavyko",
-    "Connection test failed" : "Ryšio patikrinimas nepavyko",
     "Do you really want to delete the current Server Configuration?" : "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?",
     "Confirm Deletion" : "Patvirtinkite trynimą",
-    "Group Filter" : "Grupės filtras",
-    "Save" : "Išsaugoti",
+    "Users" : "Vartotojai",
+    "Groups" : "Grupės",
     "Test Configuration" : "Bandyti konfigūraciją",
     "Help" : "Pagalba",
-    "Add Server Configuration" : "Pridėti serverio konfigūraciją",
     "Host" : "Mazgas",
     "Port" : "Prievadas",
     "User DN" : "Naudotojas DN",
diff --git a/apps/user_ldap/l10n/lv.js b/apps/user_ldap/l10n/lv.js
index 270bf16e926..b671b528729 100644
--- a/apps/user_ldap/l10n/lv.js
+++ b/apps/user_ldap/l10n/lv.js
@@ -4,21 +4,13 @@ OC.L10N.register(
     "Failed to delete the server configuration" : "Neizdevās izdzēst servera konfigurāciju",
     "The configuration is valid and the connection could be established!" : "Konfigurācija ir derīga un varēja izveidot savienojumu!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurācija ir derīga, bet sasaiste neizdevās. Lūdzu, pārbaudiet servera iestatījumus un akreditācijas datus.",
-    "Deletion failed" : "Neizdevās izdzēst",
-    "Take over settings from recent server configuration?" : "Paņemt iestatījumus no nesenas servera konfigurācijas?",
-    "Keep settings?" : "Paturēt iestatījumus?",
-    "Cannot add server configuration" : "Nevar pievienot servera konfigurāciju",
-    "Error" : "Kļūda",
     "Select groups" : "Izvēlieties grupas",
-    "Connection test succeeded" : "Savienojuma tests ir veiksmīgs",
-    "Connection test failed" : "Savienojuma tests cieta neveiksmi",
     "Do you really want to delete the current Server Configuration?" : "Vai tiešām vēlaties dzēst pašreizējo servera konfigurāciju?",
     "Confirm Deletion" : "Apstiprināt dzēšanu",
-    "Group Filter" : "Grupu filtrs",
-    "Save" : "Saglabāt",
+    "Users" : "Lietotāji",
+    "Groups" : "Grupas",
     "Test Configuration" : "Testa konfigurācija",
     "Help" : "Palīdzība",
-    "Add Server Configuration" : "Pievienot servera konfigurāciju",
     "Host" : "Resursdators",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Var neiekļaut protokolu, izņemot, ja vajag SSL. Tad sākums ir ldaps://",
     "Port" : "Ports",
diff --git a/apps/user_ldap/l10n/lv.json b/apps/user_ldap/l10n/lv.json
index 4d628f3a65e..44f2b7c048d 100644
--- a/apps/user_ldap/l10n/lv.json
+++ b/apps/user_ldap/l10n/lv.json
@@ -2,21 +2,13 @@
     "Failed to delete the server configuration" : "Neizdevās izdzēst servera konfigurāciju",
     "The configuration is valid and the connection could be established!" : "Konfigurācija ir derīga un varēja izveidot savienojumu!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurācija ir derīga, bet sasaiste neizdevās. Lūdzu, pārbaudiet servera iestatījumus un akreditācijas datus.",
-    "Deletion failed" : "Neizdevās izdzēst",
-    "Take over settings from recent server configuration?" : "Paņemt iestatījumus no nesenas servera konfigurācijas?",
-    "Keep settings?" : "Paturēt iestatījumus?",
-    "Cannot add server configuration" : "Nevar pievienot servera konfigurāciju",
-    "Error" : "Kļūda",
     "Select groups" : "Izvēlieties grupas",
-    "Connection test succeeded" : "Savienojuma tests ir veiksmīgs",
-    "Connection test failed" : "Savienojuma tests cieta neveiksmi",
     "Do you really want to delete the current Server Configuration?" : "Vai tiešām vēlaties dzēst pašreizējo servera konfigurāciju?",
     "Confirm Deletion" : "Apstiprināt dzēšanu",
-    "Group Filter" : "Grupu filtrs",
-    "Save" : "Saglabāt",
+    "Users" : "Lietotāji",
+    "Groups" : "Grupas",
     "Test Configuration" : "Testa konfigurācija",
     "Help" : "Palīdzība",
-    "Add Server Configuration" : "Pievienot servera konfigurāciju",
     "Host" : "Resursdators",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Var neiekļaut protokolu, izņemot, ja vajag SSL. Tad sākums ir ldaps://",
     "Port" : "Ports",
diff --git a/apps/user_ldap/l10n/mk.js b/apps/user_ldap/l10n/mk.js
index 647a3de34e0..560aa4b6b8c 100644
--- a/apps/user_ldap/l10n/mk.js
+++ b/apps/user_ldap/l10n/mk.js
@@ -1,14 +1,9 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Бришењето е неуспешно",
-    "Keep settings?" : "Да ги сочувам нагодувањата?",
-    "Cannot add server configuration" : "Не можам да ја додадам конфигурацијата на серверот",
-    "Error" : "Грешка",
-    "Connection test succeeded" : "Тестот за поврзување е успешен",
-    "Connection test failed" : "Тестот за поврзување не е успешен",
     "Confirm Deletion" : "Потврдете го бришењето",
-    "Save" : "Сними",
+    "Users" : "Корисници",
+    "Groups" : "Групи",
     "Help" : "Помош",
     "Host" : "Домаќин",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://",
diff --git a/apps/user_ldap/l10n/mk.json b/apps/user_ldap/l10n/mk.json
index c36be82ae88..85fab2fb2d1 100644
--- a/apps/user_ldap/l10n/mk.json
+++ b/apps/user_ldap/l10n/mk.json
@@ -1,12 +1,7 @@
 { "translations": {
-    "Deletion failed" : "Бришењето е неуспешно",
-    "Keep settings?" : "Да ги сочувам нагодувањата?",
-    "Cannot add server configuration" : "Не можам да ја додадам конфигурацијата на серверот",
-    "Error" : "Грешка",
-    "Connection test succeeded" : "Тестот за поврзување е успешен",
-    "Connection test failed" : "Тестот за поврзување не е успешен",
     "Confirm Deletion" : "Потврдете го бришењето",
-    "Save" : "Сними",
+    "Users" : "Корисници",
+    "Groups" : "Групи",
     "Help" : "Помош",
     "Host" : "Домаќин",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://",
diff --git a/apps/user_ldap/l10n/mn.js b/apps/user_ldap/l10n/mn.js
index fd9e5c652b0..304c0247840 100644
--- a/apps/user_ldap/l10n/mn.js
+++ b/apps/user_ldap/l10n/mn.js
@@ -1,7 +1,6 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Save" : "Хадгалах",
     "Password" : "Нууц үг"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/mn.json b/apps/user_ldap/l10n/mn.json
index 5e4e1a6572e..13788221f43 100644
--- a/apps/user_ldap/l10n/mn.json
+++ b/apps/user_ldap/l10n/mn.json
@@ -1,5 +1,4 @@
 { "translations": {
-    "Save" : "Хадгалах",
     "Password" : "Нууц үг"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ms_MY.js b/apps/user_ldap/l10n/ms_MY.js
index 5b318d77a98..74bdc1b820f 100644
--- a/apps/user_ldap/l10n/ms_MY.js
+++ b/apps/user_ldap/l10n/ms_MY.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Pemadaman gagal",
-    "Error" : "Ralat",
-    "Save" : "Simpan",
+    "Users" : "Pengguna",
+    "Groups" : "Kumpulan",
     "Help" : "Bantuan",
     "Password" : "Kata laluan",
     "Back" : "Kembali",
diff --git a/apps/user_ldap/l10n/ms_MY.json b/apps/user_ldap/l10n/ms_MY.json
index c86ace3c3a6..1d26cfcaf3d 100644
--- a/apps/user_ldap/l10n/ms_MY.json
+++ b/apps/user_ldap/l10n/ms_MY.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "Pemadaman gagal",
-    "Error" : "Ralat",
-    "Save" : "Simpan",
+    "Users" : "Pengguna",
+    "Groups" : "Kumpulan",
     "Help" : "Bantuan",
     "Password" : "Kata laluan",
     "Back" : "Kembali",
diff --git a/apps/user_ldap/l10n/my_MM.js b/apps/user_ldap/l10n/my_MM.js
index faeec3ea889..5af581c8593 100644
--- a/apps/user_ldap/l10n/my_MM.js
+++ b/apps/user_ldap/l10n/my_MM.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
+    "Users" : "သုံးစွဲသူ",
     "Help" : "အကူအညီ",
     "Password" : "စကားဝှက်",
     "Advanced" : "အဆင့်မြင့်"
diff --git a/apps/user_ldap/l10n/my_MM.json b/apps/user_ldap/l10n/my_MM.json
index 88cf16a7694..f057d32bc24 100644
--- a/apps/user_ldap/l10n/my_MM.json
+++ b/apps/user_ldap/l10n/my_MM.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Users" : "သုံးစွဲသူ",
     "Help" : "အကူအညီ",
     "Password" : "စကားဝှက်",
     "Advanced" : "အဆင့်မြင့်"
diff --git a/apps/user_ldap/l10n/nb_NO.js b/apps/user_ldap/l10n/nb_NO.js
index bede99104f8..c28947a62fb 100644
--- a/apps/user_ldap/l10n/nb_NO.js
+++ b/apps/user_ldap/l10n/nb_NO.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Ingen konfigurasjon spesifisert",
     "No data specified" : "Ingen data spesifisert",
     " Could not set configuration %s" : "Klarte ikke å sette konfigurasjon %s",
-    "Deletion failed" : "Sletting mislyktes",
-    "Take over settings from recent server configuration?" : "Hent innstillinger fra tidligere tjener-konfigurasjon?",
-    "Keep settings?" : "Behold innstillinger?",
-    "{nthServer}. Server" : "{nthServer}. server",
-    "Cannot add server configuration" : "Kan ikke legge til tjener-konfigurasjon",
-    "mappings cleared" : "tilknytninger nullstilt",
-    "Success" : "Suksess",
-    "Error" : "Feil",
-    "Please specify a Base DN" : "Vennligst spesifiser en hoved-DN",
-    "Could not determine Base DN" : "Kunne ikke fastslå hoved-DN",
-    "Please specify the port" : "Vennligst spesifiser port",
-    "Configuration OK" : "Konfigurasjon OK",
     "Configuration incorrect" : "Konfigurasjon feil",
     "Configuration incomplete" : "Konfigurasjon ufullstendig",
+    "Configuration OK" : "Konfigurasjon OK",
     "Select groups" : "Velg grupper",
     "Select object classes" : "Velg objektklasser",
-    "Select attributes" : "Velg attributter",
-    "Connection test succeeded" : "Tilkoblingstest lyktes",
-    "Connection test failed" : "Tilkoblingstest mislyktes",
+    "{nthServer}. Server" : "{nthServer}. server",
     "Do you really want to delete the current Server Configuration?" : "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
     "Confirm Deletion" : "Bekreft sletting",
+    "Select attributes" : "Velg attributter",
     "_%s group found_::_%s groups found_" : ["%s gruppe funnet","%s grupper funnet"],
     "_%s user found_::_%s users found_" : ["%s bruker funnet","%s brukere funnet"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunne ikke påvise attributt for brukers visningsnavn. Du må selv spesifisere det i avanserte LDAP-innstillinger.",
     "Could not find the desired feature" : "Fant ikke den ønskede funksjonaliteten",
     "Invalid Host" : "Ugyldig tjener",
     "Server" : "Server",
-    "User Filter" : "Brukerfilter",
-    "Login Filter" : "Innloggingsfilter",
-    "Group Filter" : "Gruppefilter",
-    "Save" : "Lagre",
+    "Users" : "Brukere",
+    "Groups" : "Grupper",
     "Test Configuration" : "Test konfigurasjonen",
     "Help" : "Hjelp",
     "Groups meeting these criteria are available in %s:" : "Grupper som tilfredsstiller disse kriteriene er tilgjengelige i %s:",
-    "only those object classes:" : "kun disse objektklassene:",
-    "only from those groups:" : "kun fra disse gruppene:",
-    "Edit raw filter instead" : "Rediger ubearbeidet filter i stedet",
-    "Raw LDAP filter" : "Ubearbeidet LDAP-filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filteret spesifiserer hvilke LDAP-grupper som skal ha tilgang til %s-instansen.",
     "Test Filter" : "Test filter",
-    "groups found" : "grupper funnet",
-    "Users login with this attribute:" : "Brukere logger inn med denne attributten:",
-    "LDAP Username:" : "LDAP-brukernavn:",
-    "LDAP Email Address:" : "LDAP-epostadresse:",
     "Other Attributes:" : "Andre attributter:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer filteret som skal brukes når noen prøver å logge inn. %%uid erstatter brukernavnet i innloggingen. Eksempel: \"uid=%%uid\"",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
-    "Add Server Configuration" : "Legg til tjener-konfigurasjon",
-    "Delete Configuration" : "Slett konfigurasjon",
     "Host" : "Tjener",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan utelate protokollen, men du er påkrevd å bruke SSL.  Deretter starte med ldaps://",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Legg inn LDAP-filtre manuelt (anbefalt for store kataloger)",
     "Limit %s access to users meeting these criteria:" : "Begrens %s-tilgang til brukere som tilfredsstiller disse kriteriene:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret spesifiserer hvilke LDAP-brukere som skal ha tilgang til %s-instansen.",
-    "users found" : "brukere funnet",
     "Saving" : "Lagrer",
     "Back" : "Tilbake",
     "Continue" : "Fortsett",
diff --git a/apps/user_ldap/l10n/nb_NO.json b/apps/user_ldap/l10n/nb_NO.json
index 366c8cd9cae..cd399a4eb62 100644
--- a/apps/user_ldap/l10n/nb_NO.json
+++ b/apps/user_ldap/l10n/nb_NO.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Ingen konfigurasjon spesifisert",
     "No data specified" : "Ingen data spesifisert",
     " Could not set configuration %s" : "Klarte ikke å sette konfigurasjon %s",
-    "Deletion failed" : "Sletting mislyktes",
-    "Take over settings from recent server configuration?" : "Hent innstillinger fra tidligere tjener-konfigurasjon?",
-    "Keep settings?" : "Behold innstillinger?",
-    "{nthServer}. Server" : "{nthServer}. server",
-    "Cannot add server configuration" : "Kan ikke legge til tjener-konfigurasjon",
-    "mappings cleared" : "tilknytninger nullstilt",
-    "Success" : "Suksess",
-    "Error" : "Feil",
-    "Please specify a Base DN" : "Vennligst spesifiser en hoved-DN",
-    "Could not determine Base DN" : "Kunne ikke fastslå hoved-DN",
-    "Please specify the port" : "Vennligst spesifiser port",
-    "Configuration OK" : "Konfigurasjon OK",
     "Configuration incorrect" : "Konfigurasjon feil",
     "Configuration incomplete" : "Konfigurasjon ufullstendig",
+    "Configuration OK" : "Konfigurasjon OK",
     "Select groups" : "Velg grupper",
     "Select object classes" : "Velg objektklasser",
-    "Select attributes" : "Velg attributter",
-    "Connection test succeeded" : "Tilkoblingstest lyktes",
-    "Connection test failed" : "Tilkoblingstest mislyktes",
+    "{nthServer}. Server" : "{nthServer}. server",
     "Do you really want to delete the current Server Configuration?" : "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
     "Confirm Deletion" : "Bekreft sletting",
+    "Select attributes" : "Velg attributter",
     "_%s group found_::_%s groups found_" : ["%s gruppe funnet","%s grupper funnet"],
     "_%s user found_::_%s users found_" : ["%s bruker funnet","%s brukere funnet"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunne ikke påvise attributt for brukers visningsnavn. Du må selv spesifisere det i avanserte LDAP-innstillinger.",
     "Could not find the desired feature" : "Fant ikke den ønskede funksjonaliteten",
     "Invalid Host" : "Ugyldig tjener",
     "Server" : "Server",
-    "User Filter" : "Brukerfilter",
-    "Login Filter" : "Innloggingsfilter",
-    "Group Filter" : "Gruppefilter",
-    "Save" : "Lagre",
+    "Users" : "Brukere",
+    "Groups" : "Grupper",
     "Test Configuration" : "Test konfigurasjonen",
     "Help" : "Hjelp",
     "Groups meeting these criteria are available in %s:" : "Grupper som tilfredsstiller disse kriteriene er tilgjengelige i %s:",
-    "only those object classes:" : "kun disse objektklassene:",
-    "only from those groups:" : "kun fra disse gruppene:",
-    "Edit raw filter instead" : "Rediger ubearbeidet filter i stedet",
-    "Raw LDAP filter" : "Ubearbeidet LDAP-filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filteret spesifiserer hvilke LDAP-grupper som skal ha tilgang til %s-instansen.",
     "Test Filter" : "Test filter",
-    "groups found" : "grupper funnet",
-    "Users login with this attribute:" : "Brukere logger inn med denne attributten:",
-    "LDAP Username:" : "LDAP-brukernavn:",
-    "LDAP Email Address:" : "LDAP-epostadresse:",
     "Other Attributes:" : "Andre attributter:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer filteret som skal brukes når noen prøver å logge inn. %%uid erstatter brukernavnet i innloggingen. Eksempel: \"uid=%%uid\"",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
-    "Add Server Configuration" : "Legg til tjener-konfigurasjon",
-    "Delete Configuration" : "Slett konfigurasjon",
     "Host" : "Tjener",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan utelate protokollen, men du er påkrevd å bruke SSL.  Deretter starte med ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Legg inn LDAP-filtre manuelt (anbefalt for store kataloger)",
     "Limit %s access to users meeting these criteria:" : "Begrens %s-tilgang til brukere som tilfredsstiller disse kriteriene:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret spesifiserer hvilke LDAP-brukere som skal ha tilgang til %s-instansen.",
-    "users found" : "brukere funnet",
     "Saving" : "Lagrer",
     "Back" : "Tilbake",
     "Continue" : "Fortsett",
diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js
index 67c46ea674f..12fead8651a 100644
--- a/apps/user_ldap/l10n/nl.js
+++ b/apps/user_ldap/l10n/nl.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Geen configuratie opgegeven",
     "No data specified" : "Geen gegevens verstrekt",
     " Could not set configuration %s" : "Kon configuratie %s niet instellen",
-    "Deletion failed" : "Verwijderen mislukt",
-    "Take over settings from recent server configuration?" : "Overnemen instellingen van de recente serverconfiguratie?",
-    "Keep settings?" : "Instellingen bewaren?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Kon de serverconfiguratie niet toevoegen",
-    "mappings cleared" : "vertaaltabel leeggemaakt",
-    "Success" : "Succes",
-    "Error" : "Fout",
-    "Please specify a Base DN" : "Geef een Base DN op",
-    "Could not determine Base DN" : "Kon de Base DN niet vaststellen",
-    "Please specify the port" : "Geef de poort op",
-    "Configuration OK" : "Configuratie OK",
     "Configuration incorrect" : "Configuratie onjuist",
     "Configuration incomplete" : "Configuratie incompleet",
+    "Configuration OK" : "Configuratie OK",
     "Select groups" : "Selecteer groepen",
     "Select object classes" : "Selecteer objectklasse",
-    "Select attributes" : "Selecteer attributen",
-    "Connection test succeeded" : "Verbindingstest geslaagd",
-    "Connection test failed" : "Verbindingstest mislukt",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
     "Confirm Deletion" : "Bevestig verwijderen",
+    "Select attributes" : "Selecteer attributen",
     "_%s group found_::_%s groups found_" : ["%s groep gevonden","%s groepen gevonden"],
     "_%s user found_::_%s users found_" : ["%s gebruiker gevonden","%s gebruikers gevonden"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kon het weergavenaam attribuut van de gebruiker niet vinden. Geef het zelf op in de geavanceerde ldap instellingen.",
     "Could not find the desired feature" : "Kon de gewenste functie niet vinden",
     "Invalid Host" : "Ongeldige server",
     "Server" : "Server",
-    "User Filter" : "Gebruikersfilter",
-    "Login Filter" : "Inlogfilter",
-    "Group Filter" : "Groep Filter",
-    "Save" : "Bewaren",
+    "Users" : "Gebruikers",
+    "Groups" : "Groepen",
     "Test Configuration" : "Test configuratie",
     "Help" : "Help",
     "Groups meeting these criteria are available in %s:" : "Groepsafspraken die voldoen aan deze criteria zijn beschikbaar in %s:",
-    "only those object classes:" : "alleen deze objectklassen",
-    "only from those groups:" : "alleen van deze groepen:",
-    "Edit raw filter instead" : "Bewerk raw filter",
-    "Raw LDAP filter" : "Raw LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Dit filter geeft aan welke LDAP groepen toegang hebben tot %s.",
     "Test Filter" : "Testfilter",
-    "groups found" : "groepen gevonden",
-    "Users login with this attribute:" : "Gebruikers loggen in met dit attribuut:",
-    "LDAP Username:" : "LDAP Username:",
-    "LDAP Email Address:" : "LDAP e-mailadres:",
     "Other Attributes:" : "Overige attributen:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definiëert het toe te passen filter als er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam bij het inloggen. Bijvoorbeeld: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Toevoegen serverconfiguratie",
-    "Delete Configuration" : "Verwijder configuratie",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://",
     "Port" : "Poort",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Handmatig invoeren LDAP filters (aanbevolen voor grote directories)",
     "Limit %s access to users meeting these criteria:" : "Beperk %s toegang tot gebruikers die voldoen aan deze criteria:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Dit filter geeft aan welke LDAP gebruikers toegang hebben tot %s.",
-    "users found" : "gebruikers gevonden",
     "Saving" : "Opslaan",
     "Back" : "Terug",
     "Continue" : "Verder",
diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json
index 39fb5fbea10..5aa26c02386 100644
--- a/apps/user_ldap/l10n/nl.json
+++ b/apps/user_ldap/l10n/nl.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Geen configuratie opgegeven",
     "No data specified" : "Geen gegevens verstrekt",
     " Could not set configuration %s" : "Kon configuratie %s niet instellen",
-    "Deletion failed" : "Verwijderen mislukt",
-    "Take over settings from recent server configuration?" : "Overnemen instellingen van de recente serverconfiguratie?",
-    "Keep settings?" : "Instellingen bewaren?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Kon de serverconfiguratie niet toevoegen",
-    "mappings cleared" : "vertaaltabel leeggemaakt",
-    "Success" : "Succes",
-    "Error" : "Fout",
-    "Please specify a Base DN" : "Geef een Base DN op",
-    "Could not determine Base DN" : "Kon de Base DN niet vaststellen",
-    "Please specify the port" : "Geef de poort op",
-    "Configuration OK" : "Configuratie OK",
     "Configuration incorrect" : "Configuratie onjuist",
     "Configuration incomplete" : "Configuratie incompleet",
+    "Configuration OK" : "Configuratie OK",
     "Select groups" : "Selecteer groepen",
     "Select object classes" : "Selecteer objectklasse",
-    "Select attributes" : "Selecteer attributen",
-    "Connection test succeeded" : "Verbindingstest geslaagd",
-    "Connection test failed" : "Verbindingstest mislukt",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
     "Confirm Deletion" : "Bevestig verwijderen",
+    "Select attributes" : "Selecteer attributen",
     "_%s group found_::_%s groups found_" : ["%s groep gevonden","%s groepen gevonden"],
     "_%s user found_::_%s users found_" : ["%s gebruiker gevonden","%s gebruikers gevonden"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kon het weergavenaam attribuut van de gebruiker niet vinden. Geef het zelf op in de geavanceerde ldap instellingen.",
     "Could not find the desired feature" : "Kon de gewenste functie niet vinden",
     "Invalid Host" : "Ongeldige server",
     "Server" : "Server",
-    "User Filter" : "Gebruikersfilter",
-    "Login Filter" : "Inlogfilter",
-    "Group Filter" : "Groep Filter",
-    "Save" : "Bewaren",
+    "Users" : "Gebruikers",
+    "Groups" : "Groepen",
     "Test Configuration" : "Test configuratie",
     "Help" : "Help",
     "Groups meeting these criteria are available in %s:" : "Groepsafspraken die voldoen aan deze criteria zijn beschikbaar in %s:",
-    "only those object classes:" : "alleen deze objectklassen",
-    "only from those groups:" : "alleen van deze groepen:",
-    "Edit raw filter instead" : "Bewerk raw filter",
-    "Raw LDAP filter" : "Raw LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Dit filter geeft aan welke LDAP groepen toegang hebben tot %s.",
     "Test Filter" : "Testfilter",
-    "groups found" : "groepen gevonden",
-    "Users login with this attribute:" : "Gebruikers loggen in met dit attribuut:",
-    "LDAP Username:" : "LDAP Username:",
-    "LDAP Email Address:" : "LDAP e-mailadres:",
     "Other Attributes:" : "Overige attributen:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definiëert het toe te passen filter als er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam bij het inloggen. Bijvoorbeeld: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Toevoegen serverconfiguratie",
-    "Delete Configuration" : "Verwijder configuratie",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://",
     "Port" : "Poort",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Handmatig invoeren LDAP filters (aanbevolen voor grote directories)",
     "Limit %s access to users meeting these criteria:" : "Beperk %s toegang tot gebruikers die voldoen aan deze criteria:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Dit filter geeft aan welke LDAP gebruikers toegang hebben tot %s.",
-    "users found" : "gebruikers gevonden",
     "Saving" : "Opslaan",
     "Back" : "Terug",
     "Continue" : "Verder",
diff --git a/apps/user_ldap/l10n/nn_NO.js b/apps/user_ldap/l10n/nn_NO.js
index 787eb6a0165..c14fc8b78b9 100644
--- a/apps/user_ldap/l10n/nn_NO.js
+++ b/apps/user_ldap/l10n/nn_NO.js
@@ -1,10 +1,9 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Feil ved sletting",
-    "Error" : "Feil",
     "Select groups" : "Vel grupper",
-    "Save" : "Lagra",
+    "Users" : "Brukarar",
+    "Groups" : "Grupper",
     "Help" : "Hjelp",
     "Host" : "Tenar",
     "Password" : "Passord",
diff --git a/apps/user_ldap/l10n/nn_NO.json b/apps/user_ldap/l10n/nn_NO.json
index 12a21a0a198..4cd54c39e08 100644
--- a/apps/user_ldap/l10n/nn_NO.json
+++ b/apps/user_ldap/l10n/nn_NO.json
@@ -1,8 +1,7 @@
 { "translations": {
-    "Deletion failed" : "Feil ved sletting",
-    "Error" : "Feil",
     "Select groups" : "Vel grupper",
-    "Save" : "Lagra",
+    "Users" : "Brukarar",
+    "Groups" : "Grupper",
     "Help" : "Hjelp",
     "Host" : "Tenar",
     "Password" : "Passord",
diff --git a/apps/user_ldap/l10n/oc.js b/apps/user_ldap/l10n/oc.js
index c08fc72758e..f077d0d7bc5 100644
--- a/apps/user_ldap/l10n/oc.js
+++ b/apps/user_ldap/l10n/oc.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Fracàs d'escafatge",
-    "Error" : "Error",
-    "Save" : "Enregistra",
+    "Users" : "Usancièrs",
+    "Groups" : "Grops",
     "Help" : "Ajuda",
     "Password" : "Senhal",
     "Advanced" : "Avançat"
diff --git a/apps/user_ldap/l10n/oc.json b/apps/user_ldap/l10n/oc.json
index 32efd1182e4..88cd771c1c6 100644
--- a/apps/user_ldap/l10n/oc.json
+++ b/apps/user_ldap/l10n/oc.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "Fracàs d'escafatge",
-    "Error" : "Error",
-    "Save" : "Enregistra",
+    "Users" : "Usancièrs",
+    "Groups" : "Grops",
     "Help" : "Ajuda",
     "Password" : "Senhal",
     "Advanced" : "Avançat"
diff --git a/apps/user_ldap/l10n/pa.js b/apps/user_ldap/l10n/pa.js
index 3bfa18de3fc..ea1d1cce4e7 100644
--- a/apps/user_ldap/l10n/pa.js
+++ b/apps/user_ldap/l10n/pa.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "ਗਲਤੀ",
+    "Groups" : "ਗਰੁੱਪ",
     "Password" : "ਪਾਸਵਰ"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/pa.json b/apps/user_ldap/l10n/pa.json
index efe484f8658..d1943cb1ae1 100644
--- a/apps/user_ldap/l10n/pa.json
+++ b/apps/user_ldap/l10n/pa.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Error" : "ਗਲਤੀ",
+    "Groups" : "ਗਰੁੱਪ",
     "Password" : "ਪਾਸਵਰ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/pl.js b/apps/user_ldap/l10n/pl.js
index d60927ce913..1c8a4d17e7b 100644
--- a/apps/user_ldap/l10n/pl.js
+++ b/apps/user_ldap/l10n/pl.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Nie określono konfiguracji",
     "No data specified" : "Nie określono danych",
     " Could not set configuration %s" : "Nie można ustawić konfiguracji %s",
-    "Deletion failed" : "Usunięcie nie powiodło się",
-    "Take over settings from recent server configuration?" : "Przejmij ustawienia z ostatnich konfiguracji serwera?",
-    "Keep settings?" : "Zachować ustawienia?",
-    "{nthServer}. Server" : "{nthServer}. Serwer",
-    "Cannot add server configuration" : "Nie można dodać konfiguracji serwera",
-    "mappings cleared" : "Mapoanie wyczyszczone",
-    "Success" : "Sukces",
-    "Error" : "Błąd",
-    "Please specify a Base DN" : "Proszę podać bazowy DN",
-    "Could not determine Base DN" : "Nie można ustalić bazowego DN",
-    "Please specify the port" : "Proszę podać port",
-    "Configuration OK" : "Konfiguracja poprawna",
     "Configuration incorrect" : "Konfiguracja niepoprawna",
     "Configuration incomplete" : "Konfiguracja niekompletna",
+    "Configuration OK" : "Konfiguracja poprawna",
     "Select groups" : "Wybierz grupy",
     "Select object classes" : "Wybierz obiekty klas",
-    "Select attributes" : "Wybierz atrybuty",
-    "Connection test succeeded" : "Test połączenia udany",
-    "Connection test failed" : "Test połączenia nie udany",
+    "{nthServer}. Server" : "{nthServer}. Serwer",
     "Do you really want to delete the current Server Configuration?" : "Czy chcesz usunąć bieżącą konfigurację serwera?",
     "Confirm Deletion" : "Potwierdź usunięcie",
+    "Select attributes" : "Wybierz atrybuty",
     "_%s group found_::_%s groups found_" : ["%s znaleziona grupa","%s znalezionych grup","%s znalezionych grup"],
     "_%s user found_::_%s users found_" : ["%s znaleziony użytkownik","%s znalezionych użytkowników","%s znalezionych użytkowników"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nie udało się wykryć atrybutu wyświetlanej nazwy użytkownika. Określ ją w zaawansowanych ustawieniach LDAP.",
     "Could not find the desired feature" : "Nie można znaleźć żądanej funkcji",
     "Invalid Host" : "Niepoprawny Host",
     "Server" : "Serwer",
-    "User Filter" : "Filtr użytkownika",
-    "Login Filter" : "Filtr logowania",
-    "Group Filter" : "Grupa filtrów",
-    "Save" : "Zapisz",
+    "Users" : "Użytkownicy",
+    "Groups" : "Grupy",
     "Test Configuration" : "Konfiguracja testowa",
     "Help" : "Pomoc",
     "Groups meeting these criteria are available in %s:" : "Przyłączenie do grupy z tymi ustawieniami dostępne jest w %s:",
-    "only those object classes:" : "tylko te klasy obiektów:",
-    "only from those groups:" : "tylko z tych grup:",
-    "Edit raw filter instead" : "Edytuj zamiast tego czysty filtr",
-    "Raw LDAP filter" : "Czysty filtr LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr określa, które grupy LDAP powinny mieć dostęp do instancji %s.",
     "Test Filter" : "Testuj filtr",
-    "groups found" : "grup znaleziono",
-    "Users login with this attribute:" : "Użytkownicy zalogowani z tymi ustawieniami:",
-    "LDAP Username:" : "Nazwa użytkownika LDAP:",
-    "LDAP Email Address:" : "LDAP Adres Email:",
     "Other Attributes:" : "Inne atrybuty:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\"",
     "1. Server" : "1. Serwer",
     "%s. Server:" : "%s. Serwer:",
-    "Add Server Configuration" : "Dodaj konfigurację servera",
-    "Delete Configuration" : "Usuń konfigurację",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ręcznie wprowadzaj filtry LDAP (zalecane dla dużych katalogów)",
     "Limit %s access to users meeting these criteria:" : "Limit %s dostępu do podłączania użytkowników z tymi ustawieniami:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr określa, którzy użytkownicy LDAP powinni mieć dostęp do instancji %s.",
-    "users found" : "użytkownicy znalezieni",
     "Saving" : "Zapisuję",
     "Back" : "Wróć",
     "Continue" : "Kontynuuj ",
diff --git a/apps/user_ldap/l10n/pl.json b/apps/user_ldap/l10n/pl.json
index a778c5c68ca..28fba352023 100644
--- a/apps/user_ldap/l10n/pl.json
+++ b/apps/user_ldap/l10n/pl.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Nie określono konfiguracji",
     "No data specified" : "Nie określono danych",
     " Could not set configuration %s" : "Nie można ustawić konfiguracji %s",
-    "Deletion failed" : "Usunięcie nie powiodło się",
-    "Take over settings from recent server configuration?" : "Przejmij ustawienia z ostatnich konfiguracji serwera?",
-    "Keep settings?" : "Zachować ustawienia?",
-    "{nthServer}. Server" : "{nthServer}. Serwer",
-    "Cannot add server configuration" : "Nie można dodać konfiguracji serwera",
-    "mappings cleared" : "Mapoanie wyczyszczone",
-    "Success" : "Sukces",
-    "Error" : "Błąd",
-    "Please specify a Base DN" : "Proszę podać bazowy DN",
-    "Could not determine Base DN" : "Nie można ustalić bazowego DN",
-    "Please specify the port" : "Proszę podać port",
-    "Configuration OK" : "Konfiguracja poprawna",
     "Configuration incorrect" : "Konfiguracja niepoprawna",
     "Configuration incomplete" : "Konfiguracja niekompletna",
+    "Configuration OK" : "Konfiguracja poprawna",
     "Select groups" : "Wybierz grupy",
     "Select object classes" : "Wybierz obiekty klas",
-    "Select attributes" : "Wybierz atrybuty",
-    "Connection test succeeded" : "Test połączenia udany",
-    "Connection test failed" : "Test połączenia nie udany",
+    "{nthServer}. Server" : "{nthServer}. Serwer",
     "Do you really want to delete the current Server Configuration?" : "Czy chcesz usunąć bieżącą konfigurację serwera?",
     "Confirm Deletion" : "Potwierdź usunięcie",
+    "Select attributes" : "Wybierz atrybuty",
     "_%s group found_::_%s groups found_" : ["%s znaleziona grupa","%s znalezionych grup","%s znalezionych grup"],
     "_%s user found_::_%s users found_" : ["%s znaleziony użytkownik","%s znalezionych użytkowników","%s znalezionych użytkowników"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nie udało się wykryć atrybutu wyświetlanej nazwy użytkownika. Określ ją w zaawansowanych ustawieniach LDAP.",
     "Could not find the desired feature" : "Nie można znaleźć żądanej funkcji",
     "Invalid Host" : "Niepoprawny Host",
     "Server" : "Serwer",
-    "User Filter" : "Filtr użytkownika",
-    "Login Filter" : "Filtr logowania",
-    "Group Filter" : "Grupa filtrów",
-    "Save" : "Zapisz",
+    "Users" : "Użytkownicy",
+    "Groups" : "Grupy",
     "Test Configuration" : "Konfiguracja testowa",
     "Help" : "Pomoc",
     "Groups meeting these criteria are available in %s:" : "Przyłączenie do grupy z tymi ustawieniami dostępne jest w %s:",
-    "only those object classes:" : "tylko te klasy obiektów:",
-    "only from those groups:" : "tylko z tych grup:",
-    "Edit raw filter instead" : "Edytuj zamiast tego czysty filtr",
-    "Raw LDAP filter" : "Czysty filtr LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr określa, które grupy LDAP powinny mieć dostęp do instancji %s.",
     "Test Filter" : "Testuj filtr",
-    "groups found" : "grup znaleziono",
-    "Users login with this attribute:" : "Użytkownicy zalogowani z tymi ustawieniami:",
-    "LDAP Username:" : "Nazwa użytkownika LDAP:",
-    "LDAP Email Address:" : "LDAP Adres Email:",
     "Other Attributes:" : "Inne atrybuty:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\"",
     "1. Server" : "1. Serwer",
     "%s. Server:" : "%s. Serwer:",
-    "Add Server Configuration" : "Dodaj konfigurację servera",
-    "Delete Configuration" : "Usuń konfigurację",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ręcznie wprowadzaj filtry LDAP (zalecane dla dużych katalogów)",
     "Limit %s access to users meeting these criteria:" : "Limit %s dostępu do podłączania użytkowników z tymi ustawieniami:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr określa, którzy użytkownicy LDAP powinni mieć dostęp do instancji %s.",
-    "users found" : "użytkownicy znalezieni",
     "Saving" : "Zapisuję",
     "Back" : "Wróć",
     "Continue" : "Kontynuuj ",
diff --git a/apps/user_ldap/l10n/pt_BR.js b/apps/user_ldap/l10n/pt_BR.js
index 2dc6a22f56a..32f73bd2d44 100644
--- a/apps/user_ldap/l10n/pt_BR.js
+++ b/apps/user_ldap/l10n/pt_BR.js
@@ -10,56 +10,54 @@ OC.L10N.register(
     "No configuration specified" : "Nenhuma configuração especificada",
     "No data specified" : "Não há dados especificados",
     " Could not set configuration %s" : "Não foi possível definir a configuração %s",
-    "Deletion failed" : "Remoção falhou",
-    "Take over settings from recent server configuration?" : "Tomar parámetros de recente configuração de servidor?",
-    "Keep settings?" : "Manter configurações?",
-    "{nthServer}. Server" : "Servidor {nthServer}.",
-    "Cannot add server configuration" : "Impossível adicionar a configuração do servidor",
-    "mappings cleared" : "mapeamentos limpos",
-    "Success" : "Sucesso",
-    "Error" : "Erro",
-    "Please specify a Base DN" : "Por favor, especifique a Base DN",
-    "Could not determine Base DN" : "Não foi possível determinar a Base DN",
-    "Please specify the port" : "Por favor, especifique a porta",
-    "Configuration OK" : "Configuração OK",
+    "Action does not exist" : "A ação não existe",
     "Configuration incorrect" : "Configuração incorreta",
     "Configuration incomplete" : "Configuração incompleta",
+    "Configuration OK" : "Configuração OK",
     "Select groups" : "Selecionar grupos",
     "Select object classes" : "Selecione classes de objetos",
-    "Select attributes" : "Selecione os atributos",
-    "Connection test succeeded" : "Teste de conexão bem sucedida",
-    "Connection test failed" : "Teste de conexão falhou",
+    "Please check the credentials, they seem to be wrong." : "Por favor verifique as credenciais, elas parecem estar erradas.",
+    "Please specify the port, it could not be auto-detected." : "Por favor especifique uma porta, ela não pode ser detectada automaticamente.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "A Base DN não pode ser detectada automaticamente, por favor revise as credenciais, host e porta.",
+    "Could not detect Base DN, please enter it manually." : "Não foi possível detectar a Base DN, por favor entre manualmente.",
+    "{nthServer}. Server" : "Servidor {nthServer}.",
+    "No object found in the given Base DN. Please revise." : "Nenhum objeto encontrado ba Base DN informada. Por favor revise.",
+    "More then 1.000 directory entries available." : "Mais de 1.000 entradas de diretórios disponíveis.",
+    " entries available within the provided Base DN" : "entradas disponíveis na Base DN disponibilizada",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Um erro ocorreu. Por favor verifique a Base DN, e também a conexção e credenciais.",
     "Do you really want to delete the current Server Configuration?" : "Você quer realmente deletar as atuais Configurações de Servidor?",
     "Confirm Deletion" : "Confirmar Exclusão",
+    "Mappings cleared successfully!" : "Limpeza do mapeamento feita com sucesso!",
+    "Error while clearing the mappings." : "Erro enquanto limpava os mapeamentos.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Falha ao gravar. Por favor, verifique se o banco de dados está em operação. Atualize antes de continuar.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Mudar o modo irá permitir consultas LDAP automáticas. Dependendo do tamanho do LDAP isso pode demorar um pouco. Você ainda quer mudar o modo?",
+    "Mode switch" : "Troca de modo",
+    "Select attributes" : "Selecione os atributos",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Usuário não encontrado. Por favor verifique os seus atributos de login e nome de usuário. Filtro eficaz (para copiar-e-colar para validação de linha de comando): <br/>",
+    "User found and settings verified." : "Usuário encontrado e configurações verificadas.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Configurações verificadas, mas um usuário encontrado. Apenas o primeiro será capaz de fazer login. Considere um filtro mais apurado.",
+    "An unspecified error occurred. Please check the settings and the log." : "SetAn Ocorreu um erro não especificado. Por favor, verifique as configurações e os log.tings verificadas, mas um usuário encontrado. Apenas o primeiro será capaz de login. Considere um filtro mais apurado.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "O filtro de pesquisa é inválido, provavelmente devido a questões de sintaxe, como número ímpar de colchetes abertos e fechados. Por favor, revise.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Um erro de conexão para LDAP / AD ocorreu, por favor, verifique host, a porta e as credenciais.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "O espaço reservado %uid está faltando. Ele será substituído pelo nome de login ao consultar LDAP / AD.",
+    "Please provide a login name to test against" : "Por favor, forneça um nome de login para testar",
     "_%s group found_::_%s groups found_" : ["grupo% s encontrado","grupos% s encontrado"],
     "_%s user found_::_%s users found_" : ["usuário %s encontrado","usuários %s encontrados"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detectar o nome de exibição do atributo do usuário. Por favor, indique-o você mesmo em configurações avançadas do LDAP.",
     "Could not find the desired feature" : "Não foi possível encontrar a função desejada",
     "Invalid Host" : "Host Inválido",
     "Server" : "Servidor",
-    "User Filter" : "Filtro de Usuário",
-    "Login Filter" : "Filtro de Login",
-    "Group Filter" : "Filtro de Grupo",
-    "Save" : "Salvar",
+    "Users" : "Usuários",
+    "Groups" : "Grupos",
     "Test Configuration" : "Teste de Configuração",
     "Help" : "Ajuda",
     "Groups meeting these criteria are available in %s:" : "Grupos que satisfazem estes critérios estão disponíveis em %s:",
-    "only those object classes:" : "apenas essas classes de objetos:",
-    "only from those groups:" : "apenas desses grupos:",
-    "Edit raw filter instead" : "Editar filtro raw ao invéz",
-    "Raw LDAP filter" : "Filtro LDAP Raw",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica quais grupos LDAP devem ter acesso à instância do %s.",
     "Test Filter" : "Filtro Teste",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Usuários entrar com este atributo:",
-    "LDAP Username:" : "Usuário LDAP:",
-    "LDAP Email Address:" : "LDAP Endereço de E-mail:",
     "Other Attributes:" : "Outros Atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a ser aplicado, quando o login for feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Adicionar Configuração de Servidor",
-    "Delete Configuration" : "Excluir Configuração",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://",
     "Port" : "Porta",
@@ -73,7 +71,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Inserir manualmente filtros LDAP (recomendado para grandes diretórios)",
     "Limit %s access to users meeting these criteria:" : "Limitar o acesso %s para usuários que satisfazem esses critérios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais usuários LDAP devem ter acesso à instância do %s.",
-    "users found" : "usuários encontrados",
     "Saving" : "Salvando",
     "Back" : "Voltar",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/pt_BR.json b/apps/user_ldap/l10n/pt_BR.json
index 4453f0bb0c3..d2fe39bcea1 100644
--- a/apps/user_ldap/l10n/pt_BR.json
+++ b/apps/user_ldap/l10n/pt_BR.json
@@ -8,56 +8,54 @@
     "No configuration specified" : "Nenhuma configuração especificada",
     "No data specified" : "Não há dados especificados",
     " Could not set configuration %s" : "Não foi possível definir a configuração %s",
-    "Deletion failed" : "Remoção falhou",
-    "Take over settings from recent server configuration?" : "Tomar parámetros de recente configuração de servidor?",
-    "Keep settings?" : "Manter configurações?",
-    "{nthServer}. Server" : "Servidor {nthServer}.",
-    "Cannot add server configuration" : "Impossível adicionar a configuração do servidor",
-    "mappings cleared" : "mapeamentos limpos",
-    "Success" : "Sucesso",
-    "Error" : "Erro",
-    "Please specify a Base DN" : "Por favor, especifique a Base DN",
-    "Could not determine Base DN" : "Não foi possível determinar a Base DN",
-    "Please specify the port" : "Por favor, especifique a porta",
-    "Configuration OK" : "Configuração OK",
+    "Action does not exist" : "A ação não existe",
     "Configuration incorrect" : "Configuração incorreta",
     "Configuration incomplete" : "Configuração incompleta",
+    "Configuration OK" : "Configuração OK",
     "Select groups" : "Selecionar grupos",
     "Select object classes" : "Selecione classes de objetos",
-    "Select attributes" : "Selecione os atributos",
-    "Connection test succeeded" : "Teste de conexão bem sucedida",
-    "Connection test failed" : "Teste de conexão falhou",
+    "Please check the credentials, they seem to be wrong." : "Por favor verifique as credenciais, elas parecem estar erradas.",
+    "Please specify the port, it could not be auto-detected." : "Por favor especifique uma porta, ela não pode ser detectada automaticamente.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "A Base DN não pode ser detectada automaticamente, por favor revise as credenciais, host e porta.",
+    "Could not detect Base DN, please enter it manually." : "Não foi possível detectar a Base DN, por favor entre manualmente.",
+    "{nthServer}. Server" : "Servidor {nthServer}.",
+    "No object found in the given Base DN. Please revise." : "Nenhum objeto encontrado ba Base DN informada. Por favor revise.",
+    "More then 1.000 directory entries available." : "Mais de 1.000 entradas de diretórios disponíveis.",
+    " entries available within the provided Base DN" : "entradas disponíveis na Base DN disponibilizada",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Um erro ocorreu. Por favor verifique a Base DN, e também a conexção e credenciais.",
     "Do you really want to delete the current Server Configuration?" : "Você quer realmente deletar as atuais Configurações de Servidor?",
     "Confirm Deletion" : "Confirmar Exclusão",
+    "Mappings cleared successfully!" : "Limpeza do mapeamento feita com sucesso!",
+    "Error while clearing the mappings." : "Erro enquanto limpava os mapeamentos.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Falha ao gravar. Por favor, verifique se o banco de dados está em operação. Atualize antes de continuar.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Mudar o modo irá permitir consultas LDAP automáticas. Dependendo do tamanho do LDAP isso pode demorar um pouco. Você ainda quer mudar o modo?",
+    "Mode switch" : "Troca de modo",
+    "Select attributes" : "Selecione os atributos",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Usuário não encontrado. Por favor verifique os seus atributos de login e nome de usuário. Filtro eficaz (para copiar-e-colar para validação de linha de comando): <br/>",
+    "User found and settings verified." : "Usuário encontrado e configurações verificadas.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Configurações verificadas, mas um usuário encontrado. Apenas o primeiro será capaz de fazer login. Considere um filtro mais apurado.",
+    "An unspecified error occurred. Please check the settings and the log." : "SetAn Ocorreu um erro não especificado. Por favor, verifique as configurações e os log.tings verificadas, mas um usuário encontrado. Apenas o primeiro será capaz de login. Considere um filtro mais apurado.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "O filtro de pesquisa é inválido, provavelmente devido a questões de sintaxe, como número ímpar de colchetes abertos e fechados. Por favor, revise.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Um erro de conexão para LDAP / AD ocorreu, por favor, verifique host, a porta e as credenciais.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "O espaço reservado %uid está faltando. Ele será substituído pelo nome de login ao consultar LDAP / AD.",
+    "Please provide a login name to test against" : "Por favor, forneça um nome de login para testar",
     "_%s group found_::_%s groups found_" : ["grupo% s encontrado","grupos% s encontrado"],
     "_%s user found_::_%s users found_" : ["usuário %s encontrado","usuários %s encontrados"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detectar o nome de exibição do atributo do usuário. Por favor, indique-o você mesmo em configurações avançadas do LDAP.",
     "Could not find the desired feature" : "Não foi possível encontrar a função desejada",
     "Invalid Host" : "Host Inválido",
     "Server" : "Servidor",
-    "User Filter" : "Filtro de Usuário",
-    "Login Filter" : "Filtro de Login",
-    "Group Filter" : "Filtro de Grupo",
-    "Save" : "Salvar",
+    "Users" : "Usuários",
+    "Groups" : "Grupos",
     "Test Configuration" : "Teste de Configuração",
     "Help" : "Ajuda",
     "Groups meeting these criteria are available in %s:" : "Grupos que satisfazem estes critérios estão disponíveis em %s:",
-    "only those object classes:" : "apenas essas classes de objetos:",
-    "only from those groups:" : "apenas desses grupos:",
-    "Edit raw filter instead" : "Editar filtro raw ao invéz",
-    "Raw LDAP filter" : "Filtro LDAP Raw",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica quais grupos LDAP devem ter acesso à instância do %s.",
     "Test Filter" : "Filtro Teste",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Usuários entrar com este atributo:",
-    "LDAP Username:" : "Usuário LDAP:",
-    "LDAP Email Address:" : "LDAP Endereço de E-mail:",
     "Other Attributes:" : "Outros Atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a ser aplicado, quando o login for feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Adicionar Configuração de Servidor",
-    "Delete Configuration" : "Excluir Configuração",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://",
     "Port" : "Porta",
@@ -71,7 +69,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Inserir manualmente filtros LDAP (recomendado para grandes diretórios)",
     "Limit %s access to users meeting these criteria:" : "Limitar o acesso %s para usuários que satisfazem esses critérios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais usuários LDAP devem ter acesso à instância do %s.",
-    "users found" : "usuários encontrados",
     "Saving" : "Salvando",
     "Back" : "Voltar",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js
index 4a740ff1d1e..2b275908770 100644
--- a/apps/user_ldap/l10n/pt_PT.js
+++ b/apps/user_ldap/l10n/pt_PT.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Nenhuma configuração especificada",
     "No data specified" : "Nenhuma data especificada",
     " Could not set configuration %s" : "Não foi possível definir a configuração %s",
-    "Deletion failed" : "Erro ao apagar",
-    "Take over settings from recent server configuration?" : "Assumir as configurações da configuração do servidor mais recente?",
-    "Keep settings?" : "Manter as definições?",
-    "{nthServer}. Server" : "{nthServer}. Servidor",
-    "Cannot add server configuration" : "Não foi possível adicionar as configurações do servidor.",
-    "mappings cleared" : "Mapas limpos",
-    "Success" : "Sucesso",
-    "Error" : "Erro",
-    "Please specify a Base DN" : "Por favor indique a Base DN",
-    "Could not determine Base DN" : "Não foi possível determinar a Base DN",
-    "Please specify the port" : "Por favor indique a porta",
-    "Configuration OK" : "Configuração OK",
     "Configuration incorrect" : "Configuração incorreta",
     "Configuration incomplete" : "Configuração incompleta",
+    "Configuration OK" : "Configuração OK",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Selecionar classes de objetos",
-    "Select attributes" : "Selecionar atributos",
-    "Connection test succeeded" : "Teste de ligação com sucesso.",
-    "Connection test failed" : "Erro no teste de ligação.",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
     "Do you really want to delete the current Server Configuration?" : "Deseja realmente apagar as configurações de servidor actuais?",
     "Confirm Deletion" : "Confirmar a operação de apagar",
+    "Select attributes" : "Selecionar atributos",
     "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
     "_%s user found_::_%s users found_" : ["%s utilizador encontrado","%s utilizadores encontrados"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detetar o atributo do nome do utilizador. Por favor especifique-o nas configurações ldap avançadas.",
     "Could not find the desired feature" : "Não se encontrou a função desejada",
     "Invalid Host" : "Hospedeiro Inválido",
     "Server" : "Servidor",
-    "User Filter" : "Filtro de utilizadores",
-    "Login Filter" : "Filtro de Login",
-    "Group Filter" : "Filtrar por grupo",
-    "Save" : "Guardar",
+    "Users" : "Utilizadores",
+    "Groups" : "Grupos",
     "Test Configuration" : "Testar a configuração",
     "Help" : "Ajuda",
     "Groups meeting these criteria are available in %s:" : "Grupos que satisfazerem estes critérios estão disponíveis em %s:",
-    "only those object classes:" : "apenas essas classes de objetos:",
-    "only from those groups:" : "apenas desses grupos:",
-    "Edit raw filter instead" : "Editar filtro raw em vez disso",
-    "Raw LDAP filter" : "Filtro LDAP Raw",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica quais grupos LDAP devem ter acesso à instância %s.",
     "Test Filter" : "Testar Filtro",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Utilizadores entrar com este atributo:",
-    "LDAP Username:" : "Nome de utilizador LDAP:",
-    "LDAP Email Address:" : "Endereço de correio eletrónico LDAP:",
     "Other Attributes:" : "Outros Atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a aplicar, quando se tenta uma sessão. %%uid substitui o nome de utilizador na ação de início de sessão. Exemplo: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servvidor",
-    "Add Server Configuration" : "Adicionar configurações do servidor",
-    "Delete Configuration" : "Apagar Configuração",
     "Host" : "Anfitrião",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
     "Port" : "Porto",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Introduzir filtros LDAP manualmente (recomendado para directórios grandes)",
     "Limit %s access to users meeting these criteria:" : "Limitar o acesso a %s de utilizadores com estes critérios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais utilizadores do LDAP devem ter acesso  à instância %s.",
-    "users found" : "utilizadores encontrados",
     "Saving" : "Guardando",
     "Back" : "Voltar",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json
index 81071aec577..9d94106818e 100644
--- a/apps/user_ldap/l10n/pt_PT.json
+++ b/apps/user_ldap/l10n/pt_PT.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Nenhuma configuração especificada",
     "No data specified" : "Nenhuma data especificada",
     " Could not set configuration %s" : "Não foi possível definir a configuração %s",
-    "Deletion failed" : "Erro ao apagar",
-    "Take over settings from recent server configuration?" : "Assumir as configurações da configuração do servidor mais recente?",
-    "Keep settings?" : "Manter as definições?",
-    "{nthServer}. Server" : "{nthServer}. Servidor",
-    "Cannot add server configuration" : "Não foi possível adicionar as configurações do servidor.",
-    "mappings cleared" : "Mapas limpos",
-    "Success" : "Sucesso",
-    "Error" : "Erro",
-    "Please specify a Base DN" : "Por favor indique a Base DN",
-    "Could not determine Base DN" : "Não foi possível determinar a Base DN",
-    "Please specify the port" : "Por favor indique a porta",
-    "Configuration OK" : "Configuração OK",
     "Configuration incorrect" : "Configuração incorreta",
     "Configuration incomplete" : "Configuração incompleta",
+    "Configuration OK" : "Configuração OK",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Selecionar classes de objetos",
-    "Select attributes" : "Selecionar atributos",
-    "Connection test succeeded" : "Teste de ligação com sucesso.",
-    "Connection test failed" : "Erro no teste de ligação.",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
     "Do you really want to delete the current Server Configuration?" : "Deseja realmente apagar as configurações de servidor actuais?",
     "Confirm Deletion" : "Confirmar a operação de apagar",
+    "Select attributes" : "Selecionar atributos",
     "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
     "_%s user found_::_%s users found_" : ["%s utilizador encontrado","%s utilizadores encontrados"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detetar o atributo do nome do utilizador. Por favor especifique-o nas configurações ldap avançadas.",
     "Could not find the desired feature" : "Não se encontrou a função desejada",
     "Invalid Host" : "Hospedeiro Inválido",
     "Server" : "Servidor",
-    "User Filter" : "Filtro de utilizadores",
-    "Login Filter" : "Filtro de Login",
-    "Group Filter" : "Filtrar por grupo",
-    "Save" : "Guardar",
+    "Users" : "Utilizadores",
+    "Groups" : "Grupos",
     "Test Configuration" : "Testar a configuração",
     "Help" : "Ajuda",
     "Groups meeting these criteria are available in %s:" : "Grupos que satisfazerem estes critérios estão disponíveis em %s:",
-    "only those object classes:" : "apenas essas classes de objetos:",
-    "only from those groups:" : "apenas desses grupos:",
-    "Edit raw filter instead" : "Editar filtro raw em vez disso",
-    "Raw LDAP filter" : "Filtro LDAP Raw",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica quais grupos LDAP devem ter acesso à instância %s.",
     "Test Filter" : "Testar Filtro",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Utilizadores entrar com este atributo:",
-    "LDAP Username:" : "Nome de utilizador LDAP:",
-    "LDAP Email Address:" : "Endereço de correio eletrónico LDAP:",
     "Other Attributes:" : "Outros Atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a aplicar, quando se tenta uma sessão. %%uid substitui o nome de utilizador na ação de início de sessão. Exemplo: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servvidor",
-    "Add Server Configuration" : "Adicionar configurações do servidor",
-    "Delete Configuration" : "Apagar Configuração",
     "Host" : "Anfitrião",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
     "Port" : "Porto",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Introduzir filtros LDAP manualmente (recomendado para directórios grandes)",
     "Limit %s access to users meeting these criteria:" : "Limitar o acesso a %s de utilizadores com estes critérios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais utilizadores do LDAP devem ter acesso  à instância %s.",
-    "users found" : "utilizadores encontrados",
     "Saving" : "Guardando",
     "Back" : "Voltar",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/ro.js b/apps/user_ldap/l10n/ro.js
index 31966e0507e..c36b232f185 100644
--- a/apps/user_ldap/l10n/ro.js
+++ b/apps/user_ldap/l10n/ro.js
@@ -4,26 +4,18 @@ OC.L10N.register(
     "The configuration is valid and the connection could be established!" : "Configuraţia este valida şi s-a stabilit conectarea",
     "No action specified" : "Nu este specificata nici o acţiune ",
     "No configuration specified" : "Nu este specificata nici o configurare ",
-    "Deletion failed" : "Ștergerea a eșuat",
-    "Keep settings?" : "Păstraţi setările ?",
-    "Cannot add server configuration" : "Nu se poate adăuga configuraţia serverului ",
-    "Success" : "Succes",
-    "Error" : "Eroare",
-    "Configuration OK" : "Configuraţie valida",
     "Configuration incorrect" : "Configuraţie incorecta ",
     "Configuration incomplete" : "Configuraţie incompleta ",
+    "Configuration OK" : "Configuraţie valida",
     "Select groups" : "Selectaţi grupuri ",
-    "Select attributes" : "Selectaţi caracteristici",
-    "Connection test succeeded" : "Testul de conectare a reuşit ",
-    "Connection test failed" : "Testul de conectare a eşuat ",
     "Do you really want to delete the current Server Configuration?" : "Sunteţi sigur ca vreţi sa ştergeţi configuraţia actuala a serverului ?",
     "Confirm Deletion" : "Confirmaţi Ştergerea ",
-    "Group Filter" : "Fitrare Grup",
-    "Save" : "Salvează",
+    "Select attributes" : "Selectaţi caracteristici",
+    "Users" : "Utilizatori",
+    "Groups" : "Grupuri",
     "Test Configuration" : "Configurare test",
     "Help" : "Ajutor",
     "Other Attributes:" : "Alte caracteristici :",
-    "Add Server Configuration" : "Adăugaţi Configuraţia Serverului",
     "Host" : "Gazdă",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://",
     "Port" : "Portul",
@@ -33,7 +25,6 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "Pentru acces anonim, lăsați DN și Parolă libere.",
     "One Base DN per line" : "Un Base DN pe linie",
     "You can specify Base DN for users and groups in the Advanced tab" : "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat",
-    "users found" : "Utilizatori găsiţi ",
     "Back" : "Înapoi",
     "Continue" : "Continuă",
     "Advanced" : "Avansat",
diff --git a/apps/user_ldap/l10n/ro.json b/apps/user_ldap/l10n/ro.json
index 0eda7131c5d..44cc6680e64 100644
--- a/apps/user_ldap/l10n/ro.json
+++ b/apps/user_ldap/l10n/ro.json
@@ -2,26 +2,18 @@
     "The configuration is valid and the connection could be established!" : "Configuraţia este valida şi s-a stabilit conectarea",
     "No action specified" : "Nu este specificata nici o acţiune ",
     "No configuration specified" : "Nu este specificata nici o configurare ",
-    "Deletion failed" : "Ștergerea a eșuat",
-    "Keep settings?" : "Păstraţi setările ?",
-    "Cannot add server configuration" : "Nu se poate adăuga configuraţia serverului ",
-    "Success" : "Succes",
-    "Error" : "Eroare",
-    "Configuration OK" : "Configuraţie valida",
     "Configuration incorrect" : "Configuraţie incorecta ",
     "Configuration incomplete" : "Configuraţie incompleta ",
+    "Configuration OK" : "Configuraţie valida",
     "Select groups" : "Selectaţi grupuri ",
-    "Select attributes" : "Selectaţi caracteristici",
-    "Connection test succeeded" : "Testul de conectare a reuşit ",
-    "Connection test failed" : "Testul de conectare a eşuat ",
     "Do you really want to delete the current Server Configuration?" : "Sunteţi sigur ca vreţi sa ştergeţi configuraţia actuala a serverului ?",
     "Confirm Deletion" : "Confirmaţi Ştergerea ",
-    "Group Filter" : "Fitrare Grup",
-    "Save" : "Salvează",
+    "Select attributes" : "Selectaţi caracteristici",
+    "Users" : "Utilizatori",
+    "Groups" : "Grupuri",
     "Test Configuration" : "Configurare test",
     "Help" : "Ajutor",
     "Other Attributes:" : "Alte caracteristici :",
-    "Add Server Configuration" : "Adăugaţi Configuraţia Serverului",
     "Host" : "Gazdă",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://",
     "Port" : "Portul",
@@ -31,7 +23,6 @@
     "For anonymous access, leave DN and Password empty." : "Pentru acces anonim, lăsați DN și Parolă libere.",
     "One Base DN per line" : "Un Base DN pe linie",
     "You can specify Base DN for users and groups in the Advanced tab" : "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat",
-    "users found" : "Utilizatori găsiţi ",
     "Back" : "Înapoi",
     "Continue" : "Continuă",
     "Advanced" : "Avansat",
diff --git a/apps/user_ldap/l10n/ru.js b/apps/user_ldap/l10n/ru.js
index f21c98e121c..04e788b5777 100644
--- a/apps/user_ldap/l10n/ru.js
+++ b/apps/user_ldap/l10n/ru.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Конфигурация не создана",
     "No data specified" : "Нет данных",
     " Could not set configuration %s" : "Невозможно создать конфигурацию %s",
-    "Deletion failed" : "Удаление не удалось",
-    "Take over settings from recent server configuration?" : "Принять настройки из последней конфигурации сервера?",
-    "Keep settings?" : "Сохранить настройки?",
-    "{nthServer}. Server" : "Сервер {nthServer}.",
-    "Cannot add server configuration" : "Не удалось добавить конфигурацию сервера",
-    "mappings cleared" : "соответствия очищены",
-    "Success" : "Успешно",
-    "Error" : "Ошибка",
-    "Please specify a Base DN" : "Необходимо указать Base DN",
-    "Could not determine Base DN" : "Невозможно определить Base DN",
-    "Please specify the port" : "Укажите порт",
-    "Configuration OK" : "Конфигурация в порядке",
     "Configuration incorrect" : "Конфигурация некорректна",
     "Configuration incomplete" : "Конфигурация не завершена",
+    "Configuration OK" : "Конфигурация в порядке",
     "Select groups" : "Выберите группы",
     "Select object classes" : "Выберите объектные классы",
-    "Select attributes" : "Выберите атрибуты",
-    "Connection test succeeded" : "Проверка соединения удалась",
-    "Connection test failed" : "Проверка соединения не удалась",
+    "{nthServer}. Server" : "Сервер {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "Вы действительно хотите удалить существующую конфигурацию сервера?",
     "Confirm Deletion" : "Подтверждение удаления",
+    "Select attributes" : "Выберите атрибуты",
     "_%s group found_::_%s groups found_" : ["%s группа найдена","%s группы найдены","%s групп найдено"],
     "_%s user found_::_%s users found_" : ["%s пользователь найден","%s пользователя найдено","%s пользователей найдено"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Не удалось автоматически определить атрибут содержащий отображаемое имя пользователя. Зайдите в расширенные настройки ldap и укажите его вручную.",
     "Could not find the desired feature" : "Не удается найти требуемую функциональность",
     "Invalid Host" : "Некорректный адрес сервера",
     "Server" : "Сервер",
-    "User Filter" : "Фильтр пользователей",
-    "Login Filter" : "Фильтр логинов",
-    "Group Filter" : "Фильтр группы",
-    "Save" : "Сохранить",
+    "Users" : "Пользователи",
+    "Groups" : "Группы",
     "Test Configuration" : "Проверить конфигурацию",
     "Help" : "Помощь",
     "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:",
-    "only those object classes:" : "только эти объектные классы:",
-    "only from those groups:" : "только из этих групп:",
-    "Edit raw filter instead" : "Редактировать исходный фильтр",
-    "Raw LDAP filter" : "Исходный LDAP фильтр",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет какие LDAP группы должны иметь доступ к экземпляру %s.",
     "Test Filter" : "Проверить фильтр",
-    "groups found" : "групп найдено",
-    "Users login with this attribute:" : "Логин пользователей с этим атрибутом:",
-    "LDAP Username:" : "Имя пользователя LDAP",
-    "LDAP Email Address:" : "Адрес email LDAP:",
     "Other Attributes:" : "Другие атрибуты:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему. Например: \"uid=%%uid\"",
     "1. Server" : "Сервер 1.",
     "%s. Server:" : "Сервер %s:",
-    "Add Server Configuration" : "Добавить конфигурацию сервера",
-    "Delete Configuration" : "Удалить конфигурацию",
     "Host" : "Сервер",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно пренебречь протоколом, за исключением использования SSL. В этом случае укажите ldaps://",
     "Port" : "Порт",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)",
     "Limit %s access to users meeting these criteria:" : "Ограничить доступ пользователям к %s, удовлетворяющим этому критерию:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к экземпляру %s.",
-    "users found" : "пользователей найдено",
     "Saving" : "Сохраняется",
     "Back" : "Назад",
     "Continue" : "Продолжить",
diff --git a/apps/user_ldap/l10n/ru.json b/apps/user_ldap/l10n/ru.json
index 354381760bf..999c2e01bc3 100644
--- a/apps/user_ldap/l10n/ru.json
+++ b/apps/user_ldap/l10n/ru.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Конфигурация не создана",
     "No data specified" : "Нет данных",
     " Could not set configuration %s" : "Невозможно создать конфигурацию %s",
-    "Deletion failed" : "Удаление не удалось",
-    "Take over settings from recent server configuration?" : "Принять настройки из последней конфигурации сервера?",
-    "Keep settings?" : "Сохранить настройки?",
-    "{nthServer}. Server" : "Сервер {nthServer}.",
-    "Cannot add server configuration" : "Не удалось добавить конфигурацию сервера",
-    "mappings cleared" : "соответствия очищены",
-    "Success" : "Успешно",
-    "Error" : "Ошибка",
-    "Please specify a Base DN" : "Необходимо указать Base DN",
-    "Could not determine Base DN" : "Невозможно определить Base DN",
-    "Please specify the port" : "Укажите порт",
-    "Configuration OK" : "Конфигурация в порядке",
     "Configuration incorrect" : "Конфигурация некорректна",
     "Configuration incomplete" : "Конфигурация не завершена",
+    "Configuration OK" : "Конфигурация в порядке",
     "Select groups" : "Выберите группы",
     "Select object classes" : "Выберите объектные классы",
-    "Select attributes" : "Выберите атрибуты",
-    "Connection test succeeded" : "Проверка соединения удалась",
-    "Connection test failed" : "Проверка соединения не удалась",
+    "{nthServer}. Server" : "Сервер {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "Вы действительно хотите удалить существующую конфигурацию сервера?",
     "Confirm Deletion" : "Подтверждение удаления",
+    "Select attributes" : "Выберите атрибуты",
     "_%s group found_::_%s groups found_" : ["%s группа найдена","%s группы найдены","%s групп найдено"],
     "_%s user found_::_%s users found_" : ["%s пользователь найден","%s пользователя найдено","%s пользователей найдено"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Не удалось автоматически определить атрибут содержащий отображаемое имя пользователя. Зайдите в расширенные настройки ldap и укажите его вручную.",
     "Could not find the desired feature" : "Не удается найти требуемую функциональность",
     "Invalid Host" : "Некорректный адрес сервера",
     "Server" : "Сервер",
-    "User Filter" : "Фильтр пользователей",
-    "Login Filter" : "Фильтр логинов",
-    "Group Filter" : "Фильтр группы",
-    "Save" : "Сохранить",
+    "Users" : "Пользователи",
+    "Groups" : "Группы",
     "Test Configuration" : "Проверить конфигурацию",
     "Help" : "Помощь",
     "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:",
-    "only those object classes:" : "только эти объектные классы:",
-    "only from those groups:" : "только из этих групп:",
-    "Edit raw filter instead" : "Редактировать исходный фильтр",
-    "Raw LDAP filter" : "Исходный LDAP фильтр",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет какие LDAP группы должны иметь доступ к экземпляру %s.",
     "Test Filter" : "Проверить фильтр",
-    "groups found" : "групп найдено",
-    "Users login with this attribute:" : "Логин пользователей с этим атрибутом:",
-    "LDAP Username:" : "Имя пользователя LDAP",
-    "LDAP Email Address:" : "Адрес email LDAP:",
     "Other Attributes:" : "Другие атрибуты:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему. Например: \"uid=%%uid\"",
     "1. Server" : "Сервер 1.",
     "%s. Server:" : "Сервер %s:",
-    "Add Server Configuration" : "Добавить конфигурацию сервера",
-    "Delete Configuration" : "Удалить конфигурацию",
     "Host" : "Сервер",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно пренебречь протоколом, за исключением использования SSL. В этом случае укажите ldaps://",
     "Port" : "Порт",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)",
     "Limit %s access to users meeting these criteria:" : "Ограничить доступ пользователям к %s, удовлетворяющим этому критерию:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к экземпляру %s.",
-    "users found" : "пользователей найдено",
     "Saving" : "Сохраняется",
     "Back" : "Назад",
     "Continue" : "Продолжить",
diff --git a/apps/user_ldap/l10n/si_LK.js b/apps/user_ldap/l10n/si_LK.js
index b99cf0bd3f3..f8f0eaecfd8 100644
--- a/apps/user_ldap/l10n/si_LK.js
+++ b/apps/user_ldap/l10n/si_LK.js
@@ -1,11 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "මකාදැමීම අසාර්ථකයි",
-    "Success" : "සාර්ථකයි",
-    "Error" : "දෝෂයක්",
-    "Group Filter" : "කණ්ඩායම් පෙරහන",
-    "Save" : "සුරකින්න",
+    "Users" : "පරිශීලකයන්",
+    "Groups" : "කණ්ඩායම්",
     "Help" : "උදව්",
     "Host" : "සත්කාරකය",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න",
diff --git a/apps/user_ldap/l10n/si_LK.json b/apps/user_ldap/l10n/si_LK.json
index 716d4fc9491..7a886df99ab 100644
--- a/apps/user_ldap/l10n/si_LK.json
+++ b/apps/user_ldap/l10n/si_LK.json
@@ -1,9 +1,6 @@
 { "translations": {
-    "Deletion failed" : "මකාදැමීම අසාර්ථකයි",
-    "Success" : "සාර්ථකයි",
-    "Error" : "දෝෂයක්",
-    "Group Filter" : "කණ්ඩායම් පෙරහන",
-    "Save" : "සුරකින්න",
+    "Users" : "පරිශීලකයන්",
+    "Groups" : "කණ්ඩායම්",
     "Help" : "උදව්",
     "Host" : "සත්කාරකය",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න",
diff --git a/apps/user_ldap/l10n/sk_SK.js b/apps/user_ldap/l10n/sk_SK.js
index 3f41750a5b9..24e1da2bcda 100644
--- a/apps/user_ldap/l10n/sk_SK.js
+++ b/apps/user_ldap/l10n/sk_SK.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Nie je určená konfigurácia",
     "No data specified" : "Nie sú vybraté dáta",
     " Could not set configuration %s" : "Nemôžem nastaviť konfiguráciu %s",
-    "Deletion failed" : "Odstránenie zlyhalo",
-    "Take over settings from recent server configuration?" : "Prebrať nastavenia z nedávneho nastavenia servera?",
-    "Keep settings?" : "Ponechať nastavenia?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Nemožno pridať nastavenie servera",
-    "mappings cleared" : "mapovanie vymazané",
-    "Success" : "Úspešné",
-    "Error" : "Chyba",
-    "Please specify a Base DN" : "Prosím, zadajte základnú DN",
-    "Could not determine Base DN" : "Nemožno určiť základnú DN",
-    "Please specify the port" : "Prosím, zadajte port",
-    "Configuration OK" : "Konfigurácia je v poriadku",
     "Configuration incorrect" : "Nesprávna konfigurácia",
     "Configuration incomplete" : "Nekompletná konfigurácia",
+    "Configuration OK" : "Konfigurácia je v poriadku",
     "Select groups" : "Vybrať skupinu",
     "Select object classes" : "Vyberte triedy objektov",
-    "Select attributes" : "Vyberte atribúty",
-    "Connection test succeeded" : "Test pripojenia bol úspešný",
-    "Connection test failed" : "Test pripojenia zlyhal",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Naozaj chcete zmazať súčasné nastavenie servera?",
     "Confirm Deletion" : "Potvrdiť vymazanie",
+    "Select attributes" : "Vyberte atribúty",
     "_%s group found_::_%s groups found_" : ["%s nájdená skupina","%s nájdené skupiny","%s nájdených skupín"],
     "_%s user found_::_%s users found_" : ["%s nájdený používateľ","%s nájdení používatelia","%s nájdených používateľov"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nemožno zistiť používateľský atribút pre zobrazenie používateľského mena. Prosím, zadajte ho sami v pokročilých nastaveniach LDAP.",
     "Could not find the desired feature" : "Nemožno nájsť požadovanú funkciu",
     "Invalid Host" : "Neplatný hostiteľ",
     "Server" : "Server",
-    "User Filter" : "Filter používateľov",
-    "Login Filter" : "Filter prihlasovania",
-    "Group Filter" : "Filter skupiny",
-    "Save" : "Uložiť",
+    "Users" : "Používatelia",
+    "Groups" : "Skupiny",
     "Test Configuration" : "Test nastavenia",
     "Help" : "Pomoc",
     "Groups meeting these criteria are available in %s:" : "Skupiny spĺňajúce tieto kritériá sú k dispozícii v %s:",
-    "only those object classes:" : "len tieto triedy objektov:",
-    "only from those groups:" : "len z týchto skupín:",
-    "Edit raw filter instead" : "Miesto pre úpravu raw filtra",
-    "Raw LDAP filter" : "Raw LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Tento filter LDAP určuje, ktoré skupiny budú mať prístup k %s inštancii.",
     "Test Filter" : "Otestovať filter",
-    "groups found" : "nájdené skupiny",
-    "Users login with this attribute:" : "Používatelia sa budú prihlasovať pomocou tohto atribútu:",
-    "LDAP Username:" : "LDAP používateľské meno:",
-    "LDAP Email Address:" : "LDAP emailová adresa:",
     "Other Attributes:" : "Iné atribúty:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahrádza používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Pridať nastavenia servera.",
-    "Delete Configuration" : "Zmazať nastavenia",
     "Host" : "Hostiteľ",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Môžete vynechať protokol, okrem prípadu, kedy sa vyžaduje SSL. Vtedy začnite s ldaps://",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ručné vloženie LDAP filtrov (odporúčané pre rozsiahle adresáre)",
     "Limit %s access to users meeting these criteria:" : "Obmedziť %s prístup na používateľov spĺňajúcich tieto kritériá:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Tento filter LDAP určuje, ktorí používatelia majú prístup k %s inštancii.",
-    "users found" : "nájdení používatelia",
     "Saving" : "Ukladá sa",
     "Back" : "Späť",
     "Continue" : "Pokračovať",
diff --git a/apps/user_ldap/l10n/sk_SK.json b/apps/user_ldap/l10n/sk_SK.json
index 62a010f3f53..3b0e067cdc6 100644
--- a/apps/user_ldap/l10n/sk_SK.json
+++ b/apps/user_ldap/l10n/sk_SK.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Nie je určená konfigurácia",
     "No data specified" : "Nie sú vybraté dáta",
     " Could not set configuration %s" : "Nemôžem nastaviť konfiguráciu %s",
-    "Deletion failed" : "Odstránenie zlyhalo",
-    "Take over settings from recent server configuration?" : "Prebrať nastavenia z nedávneho nastavenia servera?",
-    "Keep settings?" : "Ponechať nastavenia?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Nemožno pridať nastavenie servera",
-    "mappings cleared" : "mapovanie vymazané",
-    "Success" : "Úspešné",
-    "Error" : "Chyba",
-    "Please specify a Base DN" : "Prosím, zadajte základnú DN",
-    "Could not determine Base DN" : "Nemožno určiť základnú DN",
-    "Please specify the port" : "Prosím, zadajte port",
-    "Configuration OK" : "Konfigurácia je v poriadku",
     "Configuration incorrect" : "Nesprávna konfigurácia",
     "Configuration incomplete" : "Nekompletná konfigurácia",
+    "Configuration OK" : "Konfigurácia je v poriadku",
     "Select groups" : "Vybrať skupinu",
     "Select object classes" : "Vyberte triedy objektov",
-    "Select attributes" : "Vyberte atribúty",
-    "Connection test succeeded" : "Test pripojenia bol úspešný",
-    "Connection test failed" : "Test pripojenia zlyhal",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Naozaj chcete zmazať súčasné nastavenie servera?",
     "Confirm Deletion" : "Potvrdiť vymazanie",
+    "Select attributes" : "Vyberte atribúty",
     "_%s group found_::_%s groups found_" : ["%s nájdená skupina","%s nájdené skupiny","%s nájdených skupín"],
     "_%s user found_::_%s users found_" : ["%s nájdený používateľ","%s nájdení používatelia","%s nájdených používateľov"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nemožno zistiť používateľský atribút pre zobrazenie používateľského mena. Prosím, zadajte ho sami v pokročilých nastaveniach LDAP.",
     "Could not find the desired feature" : "Nemožno nájsť požadovanú funkciu",
     "Invalid Host" : "Neplatný hostiteľ",
     "Server" : "Server",
-    "User Filter" : "Filter používateľov",
-    "Login Filter" : "Filter prihlasovania",
-    "Group Filter" : "Filter skupiny",
-    "Save" : "Uložiť",
+    "Users" : "Používatelia",
+    "Groups" : "Skupiny",
     "Test Configuration" : "Test nastavenia",
     "Help" : "Pomoc",
     "Groups meeting these criteria are available in %s:" : "Skupiny spĺňajúce tieto kritériá sú k dispozícii v %s:",
-    "only those object classes:" : "len tieto triedy objektov:",
-    "only from those groups:" : "len z týchto skupín:",
-    "Edit raw filter instead" : "Miesto pre úpravu raw filtra",
-    "Raw LDAP filter" : "Raw LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Tento filter LDAP určuje, ktoré skupiny budú mať prístup k %s inštancii.",
     "Test Filter" : "Otestovať filter",
-    "groups found" : "nájdené skupiny",
-    "Users login with this attribute:" : "Používatelia sa budú prihlasovať pomocou tohto atribútu:",
-    "LDAP Username:" : "LDAP používateľské meno:",
-    "LDAP Email Address:" : "LDAP emailová adresa:",
     "Other Attributes:" : "Iné atribúty:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahrádza používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Pridať nastavenia servera.",
-    "Delete Configuration" : "Zmazať nastavenia",
     "Host" : "Hostiteľ",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Môžete vynechať protokol, okrem prípadu, kedy sa vyžaduje SSL. Vtedy začnite s ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ručné vloženie LDAP filtrov (odporúčané pre rozsiahle adresáre)",
     "Limit %s access to users meeting these criteria:" : "Obmedziť %s prístup na používateľov spĺňajúcich tieto kritériá:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Tento filter LDAP určuje, ktorí používatelia majú prístup k %s inštancii.",
-    "users found" : "nájdení používatelia",
     "Saving" : "Ukladá sa",
     "Back" : "Späť",
     "Continue" : "Pokračovať",
diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js
index 8e6e5ed261f..12ae0632005 100644
--- a/apps/user_ldap/l10n/sl.js
+++ b/apps/user_ldap/l10n/sl.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Ni določenih nastavitev",
     "No data specified" : "Ni navedenih podatkov",
     " Could not set configuration %s" : "Ni mogoče uveljaviti nastavitev %s",
-    "Deletion failed" : "Brisanje je spodletelo.",
-    "Take over settings from recent server configuration?" : "Ali naj bodo prevzete nedavne nastavitve strežnika?",
-    "Keep settings?" : "Ali naj se nastavitve ohranijo?",
-    "{nthServer}. Server" : "{nthServer}. strežnik",
-    "Cannot add server configuration" : "Ni mogoče dodati nastavitev strežnika",
-    "mappings cleared" : "preslikave so izbrisane",
-    "Success" : "Uspešno končano.",
-    "Error" : "Napaka",
-    "Please specify a Base DN" : "Določite osnovno enolično ime (base DN)",
-    "Could not determine Base DN" : "Ni mogoče določiti osnovnega enoličnega imena (base DN)",
-    "Please specify the port" : "Določiti je treba vrata",
-    "Configuration OK" : "Nastavitev je ustrezna",
     "Configuration incorrect" : "Nastavitev ni ustrezna",
     "Configuration incomplete" : "Nastavitev je nepopolna",
+    "Configuration OK" : "Nastavitev je ustrezna",
     "Select groups" : "Izberi skupine",
     "Select object classes" : "Izbor razredov predmeta",
-    "Select attributes" : "Izbor atributov",
-    "Connection test succeeded" : "Preizkus povezave je uspešno končan.",
-    "Connection test failed" : "Preizkus povezave je spodletel.",
+    "{nthServer}. Server" : "{nthServer}. strežnik",
     "Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?",
     "Confirm Deletion" : "Potrdi brisanje",
+    "Select attributes" : "Izbor atributov",
     "_%s group found_::_%s groups found_" : ["%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"],
     "_%s user found_::_%s users found_" : ["%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ni mogoče prebrati atributa prikaznega imena. Določiti ga je treba ročno med nastavitvami LDAP.",
     "Could not find the desired feature" : "Želene zmožnosti ni mogoče najti",
     "Invalid Host" : "Neveljaven gostitelj",
     "Server" : "Strežnik",
-    "User Filter" : "Uporabniški filter",
-    "Login Filter" : "Filter prijave",
-    "Group Filter" : "Filter skupin",
-    "Save" : "Shrani",
+    "Users" : "Uporabniki",
+    "Groups" : "Skupine",
     "Test Configuration" : "Preizkusne nastavitve",
     "Help" : "Pomoč",
     "Groups meeting these criteria are available in %s:" : "Skupine, ki so skladne s kriterijem, so na voljo v %s:",
-    "only those object classes:" : "le razredi predmeta:",
-    "only from those groups:" : "le iz skupin:",
-    "Edit raw filter instead" : "Uredi surov filter",
-    "Raw LDAP filter" : "Surovi filter LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.",
     "Test Filter" : "Preizkusi filter",
-    "groups found" : "najdenih skupin",
-    "Users login with this attribute:" : "Uporabniki se prijavijo z atributom:",
-    "LDAP Username:" : "Uporabniško ime LDAP:",
-    "LDAP Email Address:" : "Elektronski naslov LDAP:",
     "Other Attributes:" : "Drugi atributi:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"",
     "1. Server" : "1. strežnik",
     "%s. Server:" : "%s. strežnik:",
-    "Add Server Configuration" : "Dodaj nastavitve strežnika",
-    "Delete Configuration" : "Izbriši nastavitve",
     "Host" : "Gostitelj",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://",
     "Port" : "Vrata",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ročno vstavi filtre za LDAP (priporočljivo za obsežnejše mape).",
     "Limit %s access to users meeting these criteria:" : "Omeji dostop do %s za uporabnike, ki zadostijo kriterijem:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filter določa, kateri uporabniki LDAP bodo imeli dostop do %s.",
-    "users found" : "najdenih uporabnikov",
     "Saving" : "Poteka shranjevanje ...",
     "Back" : "Nazaj",
     "Continue" : "Nadaljuj",
diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json
index 3370556c6a4..2025e381d90 100644
--- a/apps/user_ldap/l10n/sl.json
+++ b/apps/user_ldap/l10n/sl.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Ni določenih nastavitev",
     "No data specified" : "Ni navedenih podatkov",
     " Could not set configuration %s" : "Ni mogoče uveljaviti nastavitev %s",
-    "Deletion failed" : "Brisanje je spodletelo.",
-    "Take over settings from recent server configuration?" : "Ali naj bodo prevzete nedavne nastavitve strežnika?",
-    "Keep settings?" : "Ali naj se nastavitve ohranijo?",
-    "{nthServer}. Server" : "{nthServer}. strežnik",
-    "Cannot add server configuration" : "Ni mogoče dodati nastavitev strežnika",
-    "mappings cleared" : "preslikave so izbrisane",
-    "Success" : "Uspešno končano.",
-    "Error" : "Napaka",
-    "Please specify a Base DN" : "Določite osnovno enolično ime (base DN)",
-    "Could not determine Base DN" : "Ni mogoče določiti osnovnega enoličnega imena (base DN)",
-    "Please specify the port" : "Določiti je treba vrata",
-    "Configuration OK" : "Nastavitev je ustrezna",
     "Configuration incorrect" : "Nastavitev ni ustrezna",
     "Configuration incomplete" : "Nastavitev je nepopolna",
+    "Configuration OK" : "Nastavitev je ustrezna",
     "Select groups" : "Izberi skupine",
     "Select object classes" : "Izbor razredov predmeta",
-    "Select attributes" : "Izbor atributov",
-    "Connection test succeeded" : "Preizkus povezave je uspešno končan.",
-    "Connection test failed" : "Preizkus povezave je spodletel.",
+    "{nthServer}. Server" : "{nthServer}. strežnik",
     "Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?",
     "Confirm Deletion" : "Potrdi brisanje",
+    "Select attributes" : "Izbor atributov",
     "_%s group found_::_%s groups found_" : ["%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"],
     "_%s user found_::_%s users found_" : ["%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ni mogoče prebrati atributa prikaznega imena. Določiti ga je treba ročno med nastavitvami LDAP.",
     "Could not find the desired feature" : "Želene zmožnosti ni mogoče najti",
     "Invalid Host" : "Neveljaven gostitelj",
     "Server" : "Strežnik",
-    "User Filter" : "Uporabniški filter",
-    "Login Filter" : "Filter prijave",
-    "Group Filter" : "Filter skupin",
-    "Save" : "Shrani",
+    "Users" : "Uporabniki",
+    "Groups" : "Skupine",
     "Test Configuration" : "Preizkusne nastavitve",
     "Help" : "Pomoč",
     "Groups meeting these criteria are available in %s:" : "Skupine, ki so skladne s kriterijem, so na voljo v %s:",
-    "only those object classes:" : "le razredi predmeta:",
-    "only from those groups:" : "le iz skupin:",
-    "Edit raw filter instead" : "Uredi surov filter",
-    "Raw LDAP filter" : "Surovi filter LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.",
     "Test Filter" : "Preizkusi filter",
-    "groups found" : "najdenih skupin",
-    "Users login with this attribute:" : "Uporabniki se prijavijo z atributom:",
-    "LDAP Username:" : "Uporabniško ime LDAP:",
-    "LDAP Email Address:" : "Elektronski naslov LDAP:",
     "Other Attributes:" : "Drugi atributi:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"",
     "1. Server" : "1. strežnik",
     "%s. Server:" : "%s. strežnik:",
-    "Add Server Configuration" : "Dodaj nastavitve strežnika",
-    "Delete Configuration" : "Izbriši nastavitve",
     "Host" : "Gostitelj",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://",
     "Port" : "Vrata",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ročno vstavi filtre za LDAP (priporočljivo za obsežnejše mape).",
     "Limit %s access to users meeting these criteria:" : "Omeji dostop do %s za uporabnike, ki zadostijo kriterijem:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filter določa, kateri uporabniki LDAP bodo imeli dostop do %s.",
-    "users found" : "najdenih uporabnikov",
     "Saving" : "Poteka shranjevanje ...",
     "Back" : "Nazaj",
     "Continue" : "Nadaljuj",
diff --git a/apps/user_ldap/l10n/sq.js b/apps/user_ldap/l10n/sq.js
index b45c3fd7e01..48ec0616b0e 100644
--- a/apps/user_ldap/l10n/sq.js
+++ b/apps/user_ldap/l10n/sq.js
@@ -5,22 +5,12 @@ OC.L10N.register(
     "Failed to delete the server configuration" : "dështoi fshirjen e konfigurimit të serverit",
     "The configuration is valid and the connection could be established!" : "Konfigurimi është i vlefshem dhe lidhja mund të kryhet",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurimi është i saktë por lidhja dështoi. Kontrolloni konfigurimete serverit dhe kredencialet.",
-    "Deletion failed" : "Fshirja dështoi",
-    "Take over settings from recent server configuration?" : "Doni të rivini konfigurmet më të fundit të serverit?",
-    "Keep settings?" : "Doni të mbani konfigurimet?",
-    "Cannot add server configuration" : "E pamundur të shtohen konfigurimet në server",
-    "mappings cleared" : "planifikimi u fshi",
-    "Success" : "Sukses",
-    "Error" : "Gabim",
-    "Connection test succeeded" : "Prova e lidhjes përfundoi me sukses",
-    "Connection test failed" : "Prova e lidhjes dështoi",
     "Do you really want to delete the current Server Configuration?" : "Jeni vërtetë të sigurt të fshini konfigurimet aktuale të serverit?",
     "Confirm Deletion" : "Konfirmoni Fshirjen",
-    "Group Filter" : "Filtri i grupeve",
-    "Save" : "Ruaj",
+    "Users" : "Përdoruesit",
+    "Groups" : "Grupet",
     "Test Configuration" : "Provoni konfigurimet",
     "Help" : "Ndihmë",
-    "Add Server Configuration" : "Shtoni konfigurimet e serverit",
     "Host" : "Pritësi",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Ju mund të mos vendosni protokollin ,vetëm nëse ju nevojitet SSL. atherë filloni me ldaps://",
     "Port" : "Porta",
diff --git a/apps/user_ldap/l10n/sq.json b/apps/user_ldap/l10n/sq.json
index 4075ece437b..595aee41fad 100644
--- a/apps/user_ldap/l10n/sq.json
+++ b/apps/user_ldap/l10n/sq.json
@@ -3,22 +3,12 @@
     "Failed to delete the server configuration" : "dështoi fshirjen e konfigurimit të serverit",
     "The configuration is valid and the connection could be established!" : "Konfigurimi është i vlefshem dhe lidhja mund të kryhet",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurimi është i saktë por lidhja dështoi. Kontrolloni konfigurimete serverit dhe kredencialet.",
-    "Deletion failed" : "Fshirja dështoi",
-    "Take over settings from recent server configuration?" : "Doni të rivini konfigurmet më të fundit të serverit?",
-    "Keep settings?" : "Doni të mbani konfigurimet?",
-    "Cannot add server configuration" : "E pamundur të shtohen konfigurimet në server",
-    "mappings cleared" : "planifikimi u fshi",
-    "Success" : "Sukses",
-    "Error" : "Gabim",
-    "Connection test succeeded" : "Prova e lidhjes përfundoi me sukses",
-    "Connection test failed" : "Prova e lidhjes dështoi",
     "Do you really want to delete the current Server Configuration?" : "Jeni vërtetë të sigurt të fshini konfigurimet aktuale të serverit?",
     "Confirm Deletion" : "Konfirmoni Fshirjen",
-    "Group Filter" : "Filtri i grupeve",
-    "Save" : "Ruaj",
+    "Users" : "Përdoruesit",
+    "Groups" : "Grupet",
     "Test Configuration" : "Provoni konfigurimet",
     "Help" : "Ndihmë",
-    "Add Server Configuration" : "Shtoni konfigurimet e serverit",
     "Host" : "Pritësi",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Ju mund të mos vendosni protokollin ,vetëm nëse ju nevojitet SSL. atherë filloni me ldaps://",
     "Port" : "Porta",
diff --git a/apps/user_ldap/l10n/sr.js b/apps/user_ldap/l10n/sr.js
index 02b992361ab..c8b8f9fed95 100644
--- a/apps/user_ldap/l10n/sr.js
+++ b/apps/user_ldap/l10n/sr.js
@@ -2,64 +2,40 @@ OC.L10N.register(
     "user_ldap",
     {
     "Failed to clear the mappings." : "Неуспело чишћење мапирања.",
-    "Failed to delete the server configuration" : "Неуспело брисање серверске конфугирације",
+    "Failed to delete the server configuration" : "Неуспело брисање поставе сервера",
     "The configuration is valid and the connection could be established!" : "Конфигурација је важећа и веза се може успоставити!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфигурација је важећа, али Bind није успео. Проверите подешавања сервера и акредитиве.",
     "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурација није важећа. Погледајте у дневнику записа за додатне детаље.",
-    "No action specified" : "Није наведена акција",
-    "No configuration specified" : "Није наведена конфигурација",
+    "No action specified" : "Није наведена радња",
+    "No configuration specified" : "Није наведена постава",
     "No data specified" : "Нису наведени подаци",
     " Could not set configuration %s" : "Нисам могао да подесим конфигурацију %s",
-    "Deletion failed" : "Брисање није успело",
-    "Take over settings from recent server configuration?" : "Преузми подешавања са недавних конфигурација сервера?",
-    "Keep settings?" : "Задржати поставке?",
-    "{nthServer}. Server" : "{nthServer}. Сервер",
-    "Cannot add server configuration" : "Не могу да додам конфигурацију сервера",
-    "mappings cleared" : "мапирања су очишћена",
-    "Success" : "Успешно",
-    "Error" : "Грешка",
-    "Please specify a Base DN" : "Наведите Base DN",
-    "Could not determine Base DN" : "Не могу да одредим Base DN",
-    "Please specify the port" : "Наведите порт",
-    "Configuration OK" : "Конфигурација је у реду",
     "Configuration incorrect" : "Конфигурација је неисправна",
     "Configuration incomplete" : "Конфигурација није комплетна",
+    "Configuration OK" : "Конфигурација је у реду",
     "Select groups" : "Изаберите групе",
     "Select object classes" : "Изаберите класе објеката",
-    "Select attributes" : "Изаберите атрибуте",
-    "Connection test succeeded" : "Тест повезивања је успешан",
-    "Connection test failed" : "Тест повезивања није успешан",
+    "{nthServer}. Server" : "{nthServer}. Сервер",
     "Do you really want to delete the current Server Configuration?" : "Да ли стварно желите да обришете тренутну конфигурацију сервера?",
     "Confirm Deletion" : "Потврдa брисањa",
+    "Select attributes" : "Изаберите атрибуте",
     "_%s group found_::_%s groups found_" : ["нађена %s група","нађене %s групе","нађено %s група"],
     "_%s user found_::_%s users found_" : ["нађен %s корисник","нађена %s корисника","нађено %s корисника"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Немогу да откријем особину приказивања корисниковог имена. Наведите је у напредним поставкама LDAP-a",
     "Could not find the desired feature" : "Не могу да пронађем жељену особину",
     "Invalid Host" : "Неважећи домаћин",
     "Server" : "Сервер",
-    "User Filter" : "Филтер корисника",
-    "Login Filter" : "Филтер пријављивања",
-    "Group Filter" : "Филтер групе",
-    "Save" : "Сачувај",
+    "Users" : "Корисници",
+    "Groups" : "Групе",
     "Test Configuration" : "Тестирај конфигурацију",
     "Help" : "Помоћ",
     "Groups meeting these criteria are available in %s:" : "Групе које испуњавају ове критеријуме су доступне у %s:",
-    "only those object classes:" : "само ове класе објеката:",
-    "only from those groups:" : "само из ових група:",
-    "Edit raw filter instead" : "Уреди сирови филтер",
-    "Raw LDAP filter" : "Сирови LDAP филтер",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтер прецизира које ће LDAP групе требају имати приступ %s случају.",
     "Test Filter" : "Тестни филтер",
-    "groups found" : "пронађене групе",
-    "Users login with this attribute:" : "Корисници се логују са овим параметром:",
-    "LDAP Username:" : "LDAP корисничко име:",
-    "LDAP Email Address:" : "LDAP адреса е-поште",
     "Other Attributes:" : "Остали параметри:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Одређује филтер који ће се применити при покушају пријављивања. %%uid замењује корисничко име при пријављивању. Пример: \"uid=%%uid\"",
     "1. Server" : "1. сервер",
     "%s. Server:" : "%s. Сервер:",
-    "Add Server Configuration" : "Додај конфигурацију сервера",
-    "Delete Configuration" : "Обриши конфигурацију",
     "Host" : "Домаћин",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можете да изоставите протокол, осим ако захтевате ССЛ. У том случају почните са ldaps://",
     "Port" : "Порт",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Унесите ручно LDAP филтере (препоручено за велике директоријуме)",
     "Limit %s access to users meeting these criteria:" : "Ограничи %s приступа за кориснике који испуњавају ове критеријуме:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Филтер одређује који ЛДАП корисници ће имати приступ на %s.",
-    "users found" : "пронађених корисника",
     "Saving" : "Чувам",
     "Back" : "Назад",
     "Continue" : "Настави",
@@ -110,6 +85,8 @@ OC.L10N.register(
     "Group-Member association" : "Придруживање чланова у групу",
     "Nested Groups" : "Угнеждене групе",
     "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Када је укључено, подржане су групе унутар групе. (Ради само ако особина члана групе садржи DN-ове.)",
+    "Paging chunksize" : "Величина делића странице",
+    "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Величина делића се користи за страничење ЛДАП претрага које могу вратити гомилу резултата попут набрајања корисника или група. (постављање на 0 у таквим ситуацијама искључује приказ претраге по страницама)",
     "Special Attributes" : "Посебни параметри",
     "Quota Field" : "Поље квоте",
     "Quota Default" : "Подразумевана квота",
diff --git a/apps/user_ldap/l10n/sr.json b/apps/user_ldap/l10n/sr.json
index 4c5d20c72bb..2d401c62927 100644
--- a/apps/user_ldap/l10n/sr.json
+++ b/apps/user_ldap/l10n/sr.json
@@ -1,63 +1,39 @@
 { "translations": {
     "Failed to clear the mappings." : "Неуспело чишћење мапирања.",
-    "Failed to delete the server configuration" : "Неуспело брисање серверске конфугирације",
+    "Failed to delete the server configuration" : "Неуспело брисање поставе сервера",
     "The configuration is valid and the connection could be established!" : "Конфигурација је важећа и веза се може успоставити!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфигурација је важећа, али Bind није успео. Проверите подешавања сервера и акредитиве.",
     "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурација није важећа. Погледајте у дневнику записа за додатне детаље.",
-    "No action specified" : "Није наведена акција",
-    "No configuration specified" : "Није наведена конфигурација",
+    "No action specified" : "Није наведена радња",
+    "No configuration specified" : "Није наведена постава",
     "No data specified" : "Нису наведени подаци",
     " Could not set configuration %s" : "Нисам могао да подесим конфигурацију %s",
-    "Deletion failed" : "Брисање није успело",
-    "Take over settings from recent server configuration?" : "Преузми подешавања са недавних конфигурација сервера?",
-    "Keep settings?" : "Задржати поставке?",
-    "{nthServer}. Server" : "{nthServer}. Сервер",
-    "Cannot add server configuration" : "Не могу да додам конфигурацију сервера",
-    "mappings cleared" : "мапирања су очишћена",
-    "Success" : "Успешно",
-    "Error" : "Грешка",
-    "Please specify a Base DN" : "Наведите Base DN",
-    "Could not determine Base DN" : "Не могу да одредим Base DN",
-    "Please specify the port" : "Наведите порт",
-    "Configuration OK" : "Конфигурација је у реду",
     "Configuration incorrect" : "Конфигурација је неисправна",
     "Configuration incomplete" : "Конфигурација није комплетна",
+    "Configuration OK" : "Конфигурација је у реду",
     "Select groups" : "Изаберите групе",
     "Select object classes" : "Изаберите класе објеката",
-    "Select attributes" : "Изаберите атрибуте",
-    "Connection test succeeded" : "Тест повезивања је успешан",
-    "Connection test failed" : "Тест повезивања није успешан",
+    "{nthServer}. Server" : "{nthServer}. Сервер",
     "Do you really want to delete the current Server Configuration?" : "Да ли стварно желите да обришете тренутну конфигурацију сервера?",
     "Confirm Deletion" : "Потврдa брисањa",
+    "Select attributes" : "Изаберите атрибуте",
     "_%s group found_::_%s groups found_" : ["нађена %s група","нађене %s групе","нађено %s група"],
     "_%s user found_::_%s users found_" : ["нађен %s корисник","нађена %s корисника","нађено %s корисника"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Немогу да откријем особину приказивања корисниковог имена. Наведите је у напредним поставкама LDAP-a",
     "Could not find the desired feature" : "Не могу да пронађем жељену особину",
     "Invalid Host" : "Неважећи домаћин",
     "Server" : "Сервер",
-    "User Filter" : "Филтер корисника",
-    "Login Filter" : "Филтер пријављивања",
-    "Group Filter" : "Филтер групе",
-    "Save" : "Сачувај",
+    "Users" : "Корисници",
+    "Groups" : "Групе",
     "Test Configuration" : "Тестирај конфигурацију",
     "Help" : "Помоћ",
     "Groups meeting these criteria are available in %s:" : "Групе које испуњавају ове критеријуме су доступне у %s:",
-    "only those object classes:" : "само ове класе објеката:",
-    "only from those groups:" : "само из ових група:",
-    "Edit raw filter instead" : "Уреди сирови филтер",
-    "Raw LDAP filter" : "Сирови LDAP филтер",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтер прецизира које ће LDAP групе требају имати приступ %s случају.",
     "Test Filter" : "Тестни филтер",
-    "groups found" : "пронађене групе",
-    "Users login with this attribute:" : "Корисници се логују са овим параметром:",
-    "LDAP Username:" : "LDAP корисничко име:",
-    "LDAP Email Address:" : "LDAP адреса е-поште",
     "Other Attributes:" : "Остали параметри:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Одређује филтер који ће се применити при покушају пријављивања. %%uid замењује корисничко име при пријављивању. Пример: \"uid=%%uid\"",
     "1. Server" : "1. сервер",
     "%s. Server:" : "%s. Сервер:",
-    "Add Server Configuration" : "Додај конфигурацију сервера",
-    "Delete Configuration" : "Обриши конфигурацију",
     "Host" : "Домаћин",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можете да изоставите протокол, осим ако захтевате ССЛ. У том случају почните са ldaps://",
     "Port" : "Порт",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Унесите ручно LDAP филтере (препоручено за велике директоријуме)",
     "Limit %s access to users meeting these criteria:" : "Ограничи %s приступа за кориснике који испуњавају ове критеријуме:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Филтер одређује који ЛДАП корисници ће имати приступ на %s.",
-    "users found" : "пронађених корисника",
     "Saving" : "Чувам",
     "Back" : "Назад",
     "Continue" : "Настави",
@@ -108,6 +83,8 @@
     "Group-Member association" : "Придруживање чланова у групу",
     "Nested Groups" : "Угнеждене групе",
     "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Када је укључено, подржане су групе унутар групе. (Ради само ако особина члана групе садржи DN-ове.)",
+    "Paging chunksize" : "Величина делића странице",
+    "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Величина делића се користи за страничење ЛДАП претрага које могу вратити гомилу резултата попут набрајања корисника или група. (постављање на 0 у таквим ситуацијама искључује приказ претраге по страницама)",
     "Special Attributes" : "Посебни параметри",
     "Quota Field" : "Поље квоте",
     "Quota Default" : "Подразумевана квота",
diff --git a/apps/user_ldap/l10n/sr@latin.js b/apps/user_ldap/l10n/sr@latin.js
index fe5ead9186f..4a2f45db5c7 100644
--- a/apps/user_ldap/l10n/sr@latin.js
+++ b/apps/user_ldap/l10n/sr@latin.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Brisanje neuspelo",
-    "Error" : "Greška",
-    "Save" : "Snimi",
+    "Users" : "Korisnici",
+    "Groups" : "Grupe",
     "Help" : "Pomoć",
     "Host" : "Računar",
     "Port" : "Port",
diff --git a/apps/user_ldap/l10n/sr@latin.json b/apps/user_ldap/l10n/sr@latin.json
index da7acb64d2e..8cf62805869 100644
--- a/apps/user_ldap/l10n/sr@latin.json
+++ b/apps/user_ldap/l10n/sr@latin.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "Brisanje neuspelo",
-    "Error" : "Greška",
-    "Save" : "Snimi",
+    "Users" : "Korisnici",
+    "Groups" : "Grupe",
     "Help" : "Pomoć",
     "Host" : "Računar",
     "Port" : "Port",
diff --git a/apps/user_ldap/l10n/sv.js b/apps/user_ldap/l10n/sv.js
index f0fd5615867..f9920f6ca7d 100644
--- a/apps/user_ldap/l10n/sv.js
+++ b/apps/user_ldap/l10n/sv.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Ingen konfiguration har angetts",
     "No data specified" : "Ingen data har angetts",
     " Could not set configuration %s" : "Kunde inte sätta inställning %s",
-    "Deletion failed" : "Raderingen misslyckades",
-    "Take over settings from recent server configuration?" : "Ta över inställningar från tidigare serverkonfiguration?",
-    "Keep settings?" : "Behåll inställningarna?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Kunde inte lägga till serverinställning",
-    "mappings cleared" : "mappningar rensade",
-    "Success" : "Lyckat",
-    "Error" : "Fel",
-    "Please specify a Base DN" : "Vänligen ange en Base DN",
-    "Could not determine Base DN" : "Det gick inte att avgöra Base DN",
-    "Please specify the port" : "Specificera en port",
-    "Configuration OK" : "Konfigurationen är OK",
     "Configuration incorrect" : "Felaktig konfiguration",
     "Configuration incomplete" : "Konfigurationen är ej komplett",
+    "Configuration OK" : "Konfigurationen är OK",
     "Select groups" : "Välj grupper",
     "Select object classes" : "Välj objekt-klasser",
-    "Select attributes" : "Välj attribut",
-    "Connection test succeeded" : "Anslutningstestet lyckades",
-    "Connection test failed" : "Anslutningstestet misslyckades",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Vill du verkligen radera den nuvarande serverinställningen?",
     "Confirm Deletion" : "Bekräfta radering",
+    "Select attributes" : "Välj attribut",
     "_%s group found_::_%s groups found_" : ["%s grupp hittad","%s grupper hittade"],
     "_%s user found_::_%s users found_" : ["%s användare hittad","%s användare hittade"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunde inte upptäcka attributet användarvisningsnamn. Vänligen ange det själv i de avancerade LDAP-inställningarna.",
     "Could not find the desired feature" : "Det gick inte hitta den önskade funktionen",
     "Invalid Host" : "Felaktig värd",
     "Server" : "Server",
-    "User Filter" : "Användarfilter",
-    "Login Filter" : "Inloggningsfilter",
-    "Group Filter" : "Gruppfilter",
-    "Save" : "Spara",
+    "Users" : "Användare",
+    "Groups" : "Grupper",
     "Test Configuration" : "Testa konfigurationen",
     "Help" : "Hjälp",
     "Groups meeting these criteria are available in %s:" : "Grupper som uppfyller dessa kriterier finns i %s:",
-    "only those object classes:" : "Endast de objekt-klasserna:",
-    "only from those groups:" : "endast ifrån de här grupperna:",
-    "Edit raw filter instead" : "Redigera rått filter istället",
-    "Raw LDAP filter" : "Rått LDAP-filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtret specifierar vilka LDAD-grupper som ska ha åtkomst till %s instans",
     "Test Filter" : "Testfilter",
-    "groups found" : "grupper hittade",
-    "Users login with this attribute:" : "Användare loggar in med detta attribut:",
-    "LDAP Username:" : "LDAP användarnamn:",
-    "LDAP Email Address:" : "LDAP e-postadress:",
     "Other Attributes:" : "Övriga attribut:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Lägg till serverinställning",
-    "Delete Configuration" : "Radera konfiguration",
     "Host" : "Server",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ange LDAP-filter manuellt (rekommenderat för stora kataloger)",
     "Limit %s access to users meeting these criteria:" : "Begränsa %s tillgång till användare som uppfyller dessa kriterier:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtret specifierar vilka LDAP-användare som skall ha åtkomst till %s instans",
-    "users found" : "användare funna",
     "Saving" : "Sparar",
     "Back" : "Tillbaka",
     "Continue" : "Fortsätt",
diff --git a/apps/user_ldap/l10n/sv.json b/apps/user_ldap/l10n/sv.json
index 4f416eac3ea..53155976d98 100644
--- a/apps/user_ldap/l10n/sv.json
+++ b/apps/user_ldap/l10n/sv.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Ingen konfiguration har angetts",
     "No data specified" : "Ingen data har angetts",
     " Could not set configuration %s" : "Kunde inte sätta inställning %s",
-    "Deletion failed" : "Raderingen misslyckades",
-    "Take over settings from recent server configuration?" : "Ta över inställningar från tidigare serverkonfiguration?",
-    "Keep settings?" : "Behåll inställningarna?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Kunde inte lägga till serverinställning",
-    "mappings cleared" : "mappningar rensade",
-    "Success" : "Lyckat",
-    "Error" : "Fel",
-    "Please specify a Base DN" : "Vänligen ange en Base DN",
-    "Could not determine Base DN" : "Det gick inte att avgöra Base DN",
-    "Please specify the port" : "Specificera en port",
-    "Configuration OK" : "Konfigurationen är OK",
     "Configuration incorrect" : "Felaktig konfiguration",
     "Configuration incomplete" : "Konfigurationen är ej komplett",
+    "Configuration OK" : "Konfigurationen är OK",
     "Select groups" : "Välj grupper",
     "Select object classes" : "Välj objekt-klasser",
-    "Select attributes" : "Välj attribut",
-    "Connection test succeeded" : "Anslutningstestet lyckades",
-    "Connection test failed" : "Anslutningstestet misslyckades",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Vill du verkligen radera den nuvarande serverinställningen?",
     "Confirm Deletion" : "Bekräfta radering",
+    "Select attributes" : "Välj attribut",
     "_%s group found_::_%s groups found_" : ["%s grupp hittad","%s grupper hittade"],
     "_%s user found_::_%s users found_" : ["%s användare hittad","%s användare hittade"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunde inte upptäcka attributet användarvisningsnamn. Vänligen ange det själv i de avancerade LDAP-inställningarna.",
     "Could not find the desired feature" : "Det gick inte hitta den önskade funktionen",
     "Invalid Host" : "Felaktig värd",
     "Server" : "Server",
-    "User Filter" : "Användarfilter",
-    "Login Filter" : "Inloggningsfilter",
-    "Group Filter" : "Gruppfilter",
-    "Save" : "Spara",
+    "Users" : "Användare",
+    "Groups" : "Grupper",
     "Test Configuration" : "Testa konfigurationen",
     "Help" : "Hjälp",
     "Groups meeting these criteria are available in %s:" : "Grupper som uppfyller dessa kriterier finns i %s:",
-    "only those object classes:" : "Endast de objekt-klasserna:",
-    "only from those groups:" : "endast ifrån de här grupperna:",
-    "Edit raw filter instead" : "Redigera rått filter istället",
-    "Raw LDAP filter" : "Rått LDAP-filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtret specifierar vilka LDAD-grupper som ska ha åtkomst till %s instans",
     "Test Filter" : "Testfilter",
-    "groups found" : "grupper hittade",
-    "Users login with this attribute:" : "Användare loggar in med detta attribut:",
-    "LDAP Username:" : "LDAP användarnamn:",
-    "LDAP Email Address:" : "LDAP e-postadress:",
     "Other Attributes:" : "Övriga attribut:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Lägg till serverinställning",
-    "Delete Configuration" : "Radera konfiguration",
     "Host" : "Server",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ange LDAP-filter manuellt (rekommenderat för stora kataloger)",
     "Limit %s access to users meeting these criteria:" : "Begränsa %s tillgång till användare som uppfyller dessa kriterier:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtret specifierar vilka LDAP-användare som skall ha åtkomst till %s instans",
-    "users found" : "användare funna",
     "Saving" : "Sparar",
     "Back" : "Tillbaka",
     "Continue" : "Fortsätt",
diff --git a/apps/user_ldap/l10n/ta_LK.js b/apps/user_ldap/l10n/ta_LK.js
index 9aac33d72c8..51b6fd44fe0 100644
--- a/apps/user_ldap/l10n/ta_LK.js
+++ b/apps/user_ldap/l10n/ta_LK.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "நீக்கம் தோல்வியடைந்தது",
-    "Error" : "வழு",
-    "Save" : "சேமிக்க ",
+    "Users" : "பயனாளர்",
+    "Groups" : "குழுக்கள்",
     "Help" : "உதவி",
     "Host" : "ஓம்புனர்",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்",
diff --git a/apps/user_ldap/l10n/ta_LK.json b/apps/user_ldap/l10n/ta_LK.json
index 76b21ad70d9..496dbcc6a31 100644
--- a/apps/user_ldap/l10n/ta_LK.json
+++ b/apps/user_ldap/l10n/ta_LK.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "நீக்கம் தோல்வியடைந்தது",
-    "Error" : "வழு",
-    "Save" : "சேமிக்க ",
+    "Users" : "பயனாளர்",
+    "Groups" : "குழுக்கள்",
     "Help" : "உதவி",
     "Host" : "ஓம்புனர்",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்",
diff --git a/apps/user_ldap/l10n/te.js b/apps/user_ldap/l10n/te.js
index dfb4f4af3d7..7be587b12af 100644
--- a/apps/user_ldap/l10n/te.js
+++ b/apps/user_ldap/l10n/te.js
@@ -1,8 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "పొరపాటు",
-    "Save" : "భద్రపరచు",
+    "Users" : "వాడుకరులు",
     "Help" : "సహాయం",
     "Password" : "సంకేతపదం",
     "Continue" : "కొనసాగించు",
diff --git a/apps/user_ldap/l10n/te.json b/apps/user_ldap/l10n/te.json
index 82952a0593f..89d2f4d7337 100644
--- a/apps/user_ldap/l10n/te.json
+++ b/apps/user_ldap/l10n/te.json
@@ -1,6 +1,5 @@
 { "translations": {
-    "Error" : "పొరపాటు",
-    "Save" : "భద్రపరచు",
+    "Users" : "వాడుకరులు",
     "Help" : "సహాయం",
     "Password" : "సంకేతపదం",
     "Continue" : "కొనసాగించు",
diff --git a/apps/user_ldap/l10n/th_TH.js b/apps/user_ldap/l10n/th_TH.js
index e746f5e9853..4aa92c2ec8c 100644
--- a/apps/user_ldap/l10n/th_TH.js
+++ b/apps/user_ldap/l10n/th_TH.js
@@ -4,20 +4,12 @@ OC.L10N.register(
     "Failed to delete the server configuration" : "การลบการกำหนดค่าเซิร์ฟเวอร์ล้มเหลว",
     "The configuration is valid and the connection could be established!" : "การกำหนดค่าถูกต้องและการเชื่อมต่อสามารถเชื่อมต่อได้!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "การกำหนดค่าถูกต้อง, แต่การผูกข้อมูลล้มเหลว, กรุณาตรวจสอบการตั้งค่าเซิร์ฟเวอร์และข้อมูลการเข้าใช้งาน",
-    "Deletion failed" : "การลบทิ้งล้มเหลว",
-    "Keep settings?" : "รักษาการตั้งค่าไว้?",
-    "Cannot add server configuration" : "ไม่สามารถเพิ่มค่ากำหนดเซิร์ฟเวอร์ได้",
-    "Success" : "เสร็จสิ้น",
-    "Error" : "ข้อผิดพลาด",
     "Select groups" : "เลือกกลุ่ม",
-    "Connection test succeeded" : "ทดสอบการเชื่อมต่อสำเร็จ",
-    "Connection test failed" : "ทดสอบการเชื่อมต่อล้มเหลว",
     "Do you really want to delete the current Server Configuration?" : "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?",
     "Confirm Deletion" : "ยืนยันการลบทิ้ง",
-    "Group Filter" : "ตัวกรองข้อมูลกลุ่ม",
-    "Save" : "บันทึก",
+    "Users" : "ผู้ใช้งาน",
+    "Groups" : "กลุ่ม",
     "Help" : "ช่วยเหลือ",
-    "Add Server Configuration" : "เพิ่มการกำหนดค่าเซิร์ฟเวอร์",
     "Host" : "โฮสต์",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://",
     "Port" : "พอร์ต",
diff --git a/apps/user_ldap/l10n/th_TH.json b/apps/user_ldap/l10n/th_TH.json
index f7e44a61c33..130b90657e9 100644
--- a/apps/user_ldap/l10n/th_TH.json
+++ b/apps/user_ldap/l10n/th_TH.json
@@ -2,20 +2,12 @@
     "Failed to delete the server configuration" : "การลบการกำหนดค่าเซิร์ฟเวอร์ล้มเหลว",
     "The configuration is valid and the connection could be established!" : "การกำหนดค่าถูกต้องและการเชื่อมต่อสามารถเชื่อมต่อได้!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "การกำหนดค่าถูกต้อง, แต่การผูกข้อมูลล้มเหลว, กรุณาตรวจสอบการตั้งค่าเซิร์ฟเวอร์และข้อมูลการเข้าใช้งาน",
-    "Deletion failed" : "การลบทิ้งล้มเหลว",
-    "Keep settings?" : "รักษาการตั้งค่าไว้?",
-    "Cannot add server configuration" : "ไม่สามารถเพิ่มค่ากำหนดเซิร์ฟเวอร์ได้",
-    "Success" : "เสร็จสิ้น",
-    "Error" : "ข้อผิดพลาด",
     "Select groups" : "เลือกกลุ่ม",
-    "Connection test succeeded" : "ทดสอบการเชื่อมต่อสำเร็จ",
-    "Connection test failed" : "ทดสอบการเชื่อมต่อล้มเหลว",
     "Do you really want to delete the current Server Configuration?" : "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?",
     "Confirm Deletion" : "ยืนยันการลบทิ้ง",
-    "Group Filter" : "ตัวกรองข้อมูลกลุ่ม",
-    "Save" : "บันทึก",
+    "Users" : "ผู้ใช้งาน",
+    "Groups" : "กลุ่ม",
     "Help" : "ช่วยเหลือ",
-    "Add Server Configuration" : "เพิ่มการกำหนดค่าเซิร์ฟเวอร์",
     "Host" : "โฮสต์",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://",
     "Port" : "พอร์ต",
diff --git a/apps/user_ldap/l10n/tr.js b/apps/user_ldap/l10n/tr.js
index 41e6d03bfa8..15b474a5225 100644
--- a/apps/user_ldap/l10n/tr.js
+++ b/apps/user_ldap/l10n/tr.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Yapılandırma belirtilmemiş",
     "No data specified" : "Veri belirtilmemiş",
     " Could not set configuration %s" : "%s yapılandırması ayarlanamadı",
-    "Deletion failed" : "Silme başarısız oldu",
-    "Take over settings from recent server configuration?" : "Ayarlar son sunucu yapılandırmalarından devralınsın mı?",
-    "Keep settings?" : "Ayarlar korunsun mu?",
-    "{nthServer}. Server" : "{nthServer}. Sunucu",
-    "Cannot add server configuration" : "Sunucu yapılandırması eklenemedi",
-    "mappings cleared" : "eşleştirmeler temizlendi",
-    "Success" : "Başarılı",
-    "Error" : "Hata",
-    "Please specify a Base DN" : "Lütfen bir Base DN belirtin",
-    "Could not determine Base DN" : "Base DN belirlenemedi",
-    "Please specify the port" : "Lütfen bağlantı noktasını belirtin",
-    "Configuration OK" : "Yapılandırma tamam",
     "Configuration incorrect" : "Yapılandırma geçersiz",
     "Configuration incomplete" : "Yapılandırma tamamlanmamış",
+    "Configuration OK" : "Yapılandırma tamam",
     "Select groups" : "Grupları seç",
     "Select object classes" : "Nesne sınıflarını seç",
-    "Select attributes" : "Nitelikleri seç",
-    "Connection test succeeded" : "Bağlantı testi başarılı oldu",
-    "Connection test failed" : "Bağlantı testi başarısız oldu",
+    "{nthServer}. Server" : "{nthServer}. Sunucu",
     "Do you really want to delete the current Server Configuration?" : "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?",
     "Confirm Deletion" : "Silmeyi onayla",
+    "Select attributes" : "Nitelikleri seç",
     "_%s group found_::_%s groups found_" : ["%s grup bulundu","%s grup bulundu"],
     "_%s user found_::_%s users found_" : ["%s kullanıcı bulundu","%s kullanıcı bulundu"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Görüntülenecek kullanıcı adı özelliği algılanamadı. Lütfen gelişmiş ldap ayarlarına girerek kendiniz belirleyin.",
     "Could not find the desired feature" : "İstenen özellik bulunamadı",
     "Invalid Host" : "Geçersiz Makine",
     "Server" : "Sunucu",
-    "User Filter" : "Kullanıcı Süzgeci",
-    "Login Filter" : "Oturum Süzgeci",
-    "Group Filter" : "Grup Süzgeci",
-    "Save" : "Kaydet",
+    "Users" : "Kullanıcılar",
+    "Groups" : "Gruplar",
     "Test Configuration" : "Yapılandırmayı Sına",
     "Help" : "Yardım",
     "Groups meeting these criteria are available in %s:" : "Bu kriterlerle eşleşen gruplar %s içinde mevcut:",
-    "only those object classes:" : "sadece bu nesne sınıflarına:",
-    "only from those groups:" : "sadece bu gruplardan:",
-    "Edit raw filter instead" : "Bunun yerine ham filtreyi düzenle",
-    "Raw LDAP filter" : "Ham LDAP filtresi",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP gruplarını belirtir.",
     "Test Filter" : "Filtreyi Test Et",
-    "groups found" : "grup bulundu",
-    "Users login with this attribute:" : "Kullanıcılar şu öznitelikle oturum açarlar:",
-    "LDAP Username:" : "LDAP Kullanıcı Adı:",
-    "LDAP Email Address:" : "LDAP E-posta Adresi:",
     "Other Attributes:" : "Diğer Nitelikler:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, oturum işleminde kullanıcı adı ile değiştirilir. Örneğin: \"uid=%%uid\"",
     "1. Server" : "1. Sunucu",
     "%s. Server:" : "%s. Sunucu:",
-    "Add Server Configuration" : "Sunucu Yapılandırması Ekle",
-    "Delete Configuration" : "Yapılandırmayı Sil",
     "Host" : "Sunucu",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL gerekmediği takdirde protokol belirtmeyebilirsiniz. Gerekiyorsa ldaps:// ile başlayın",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP filtrelerini el ile girin (büyük dizinler için önerilir)",
     "Limit %s access to users meeting these criteria:" : "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.",
-    "users found" : "kullanıcı bulundu",
     "Saving" : "Kaydediliyor",
     "Back" : "Geri",
     "Continue" : "Devam et",
diff --git a/apps/user_ldap/l10n/tr.json b/apps/user_ldap/l10n/tr.json
index 678eb81a141..f4a3e37cde9 100644
--- a/apps/user_ldap/l10n/tr.json
+++ b/apps/user_ldap/l10n/tr.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Yapılandırma belirtilmemiş",
     "No data specified" : "Veri belirtilmemiş",
     " Could not set configuration %s" : "%s yapılandırması ayarlanamadı",
-    "Deletion failed" : "Silme başarısız oldu",
-    "Take over settings from recent server configuration?" : "Ayarlar son sunucu yapılandırmalarından devralınsın mı?",
-    "Keep settings?" : "Ayarlar korunsun mu?",
-    "{nthServer}. Server" : "{nthServer}. Sunucu",
-    "Cannot add server configuration" : "Sunucu yapılandırması eklenemedi",
-    "mappings cleared" : "eşleştirmeler temizlendi",
-    "Success" : "Başarılı",
-    "Error" : "Hata",
-    "Please specify a Base DN" : "Lütfen bir Base DN belirtin",
-    "Could not determine Base DN" : "Base DN belirlenemedi",
-    "Please specify the port" : "Lütfen bağlantı noktasını belirtin",
-    "Configuration OK" : "Yapılandırma tamam",
     "Configuration incorrect" : "Yapılandırma geçersiz",
     "Configuration incomplete" : "Yapılandırma tamamlanmamış",
+    "Configuration OK" : "Yapılandırma tamam",
     "Select groups" : "Grupları seç",
     "Select object classes" : "Nesne sınıflarını seç",
-    "Select attributes" : "Nitelikleri seç",
-    "Connection test succeeded" : "Bağlantı testi başarılı oldu",
-    "Connection test failed" : "Bağlantı testi başarısız oldu",
+    "{nthServer}. Server" : "{nthServer}. Sunucu",
     "Do you really want to delete the current Server Configuration?" : "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?",
     "Confirm Deletion" : "Silmeyi onayla",
+    "Select attributes" : "Nitelikleri seç",
     "_%s group found_::_%s groups found_" : ["%s grup bulundu","%s grup bulundu"],
     "_%s user found_::_%s users found_" : ["%s kullanıcı bulundu","%s kullanıcı bulundu"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Görüntülenecek kullanıcı adı özelliği algılanamadı. Lütfen gelişmiş ldap ayarlarına girerek kendiniz belirleyin.",
     "Could not find the desired feature" : "İstenen özellik bulunamadı",
     "Invalid Host" : "Geçersiz Makine",
     "Server" : "Sunucu",
-    "User Filter" : "Kullanıcı Süzgeci",
-    "Login Filter" : "Oturum Süzgeci",
-    "Group Filter" : "Grup Süzgeci",
-    "Save" : "Kaydet",
+    "Users" : "Kullanıcılar",
+    "Groups" : "Gruplar",
     "Test Configuration" : "Yapılandırmayı Sına",
     "Help" : "Yardım",
     "Groups meeting these criteria are available in %s:" : "Bu kriterlerle eşleşen gruplar %s içinde mevcut:",
-    "only those object classes:" : "sadece bu nesne sınıflarına:",
-    "only from those groups:" : "sadece bu gruplardan:",
-    "Edit raw filter instead" : "Bunun yerine ham filtreyi düzenle",
-    "Raw LDAP filter" : "Ham LDAP filtresi",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP gruplarını belirtir.",
     "Test Filter" : "Filtreyi Test Et",
-    "groups found" : "grup bulundu",
-    "Users login with this attribute:" : "Kullanıcılar şu öznitelikle oturum açarlar:",
-    "LDAP Username:" : "LDAP Kullanıcı Adı:",
-    "LDAP Email Address:" : "LDAP E-posta Adresi:",
     "Other Attributes:" : "Diğer Nitelikler:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, oturum işleminde kullanıcı adı ile değiştirilir. Örneğin: \"uid=%%uid\"",
     "1. Server" : "1. Sunucu",
     "%s. Server:" : "%s. Sunucu:",
-    "Add Server Configuration" : "Sunucu Yapılandırması Ekle",
-    "Delete Configuration" : "Yapılandırmayı Sil",
     "Host" : "Sunucu",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL gerekmediği takdirde protokol belirtmeyebilirsiniz. Gerekiyorsa ldaps:// ile başlayın",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP filtrelerini el ile girin (büyük dizinler için önerilir)",
     "Limit %s access to users meeting these criteria:" : "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.",
-    "users found" : "kullanıcı bulundu",
     "Saving" : "Kaydediliyor",
     "Back" : "Geri",
     "Continue" : "Devam et",
diff --git a/apps/user_ldap/l10n/ug.js b/apps/user_ldap/l10n/ug.js
index efdb474f381..c1020b1c32b 100644
--- a/apps/user_ldap/l10n/ug.js
+++ b/apps/user_ldap/l10n/ug.js
@@ -1,10 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "ئۆچۈرۈش مەغلۇپ بولدى",
-    "Error" : "خاتالىق",
-    "Group Filter" : "گۇرۇپپا سۈزگۈچ",
-    "Save" : "ساقلا",
+    "Users" : "ئىشلەتكۈچىلەر",
+    "Groups" : "گۇرۇپپا",
     "Help" : "ياردەم",
     "Host" : "باش ئاپپارات",
     "Port" : "ئېغىز",
diff --git a/apps/user_ldap/l10n/ug.json b/apps/user_ldap/l10n/ug.json
index 59b6d5206a7..adecc82972d 100644
--- a/apps/user_ldap/l10n/ug.json
+++ b/apps/user_ldap/l10n/ug.json
@@ -1,8 +1,6 @@
 { "translations": {
-    "Deletion failed" : "ئۆچۈرۈش مەغلۇپ بولدى",
-    "Error" : "خاتالىق",
-    "Group Filter" : "گۇرۇپپا سۈزگۈچ",
-    "Save" : "ساقلا",
+    "Users" : "ئىشلەتكۈچىلەر",
+    "Groups" : "گۇرۇپپا",
     "Help" : "ياردەم",
     "Host" : "باش ئاپپارات",
     "Port" : "ئېغىز",
diff --git a/apps/user_ldap/l10n/uk.js b/apps/user_ldap/l10n/uk.js
index c231a4a5553..5aa7c217c60 100644
--- a/apps/user_ldap/l10n/uk.js
+++ b/apps/user_ldap/l10n/uk.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Немає конфігурації",
     "No data specified" : "Немає даних",
     " Could not set configuration %s" : "Не вдалося встановити конфігурацію %s",
-    "Deletion failed" : "Видалення не було виконано",
-    "Take over settings from recent server configuration?" : "Застосувати налаштування  з останньої конфігурації сервера ?",
-    "Keep settings?" : "Зберегти налаштування ?",
-    "{nthServer}. Server" : "{nthServer}. Сервер",
-    "Cannot add server configuration" : "Неможливо додати конфігурацію сервера",
-    "mappings cleared" : "відображення очищається",
-    "Success" : "Успіх",
-    "Error" : "Помилка",
-    "Please specify a Base DN" : "Введіть Base DN",
-    "Could not determine Base DN" : "Не вдалося визначити Base DN",
-    "Please specify the port" : "Будь ласка, вкажіть порт",
-    "Configuration OK" : "Конфігурація OK",
     "Configuration incorrect" : "Невірна конфігурація",
     "Configuration incomplete" : "Конфігурація неповна",
+    "Configuration OK" : "Конфігурація OK",
     "Select groups" : "Оберіть групи",
     "Select object classes" : "Виберіть класи об'єктів",
-    "Select attributes" : "Виберіть атрибути",
-    "Connection test succeeded" : "Перевірка з'єднання пройшла успішно",
-    "Connection test failed" : "Перевірка з'єднання завершилась неуспішно",
+    "{nthServer}. Server" : "{nthServer}. Сервер",
     "Do you really want to delete the current Server Configuration?" : "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?",
     "Confirm Deletion" : "Підтвердіть Видалення",
+    "Select attributes" : "Виберіть атрибути",
     "_%s group found_::_%s groups found_" : [" %s група знайдена "," %s груп знайдено ","%s груп знайдено "],
     "_%s user found_::_%s users found_" : ["%s користувач знайден","%s користувачів знайдено","%s користувачів знайдено"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Не вдалося виявити ім'я користувача. Будь ласка, сформулюйте самі в розширених налаштуваннях LDAP.",
     "Could not find the desired feature" : "Не вдалося знайти потрібну функцію",
     "Invalid Host" : "Невірний Host",
     "Server" : "Сервер",
-    "User Filter" : "Користувацький Фільтр",
-    "Login Filter" : "Фільтр Входу",
-    "Group Filter" : "Фільтр Груп",
-    "Save" : "Зберегти",
+    "Users" : "Користувачі",
+    "Groups" : "Групи",
     "Test Configuration" : "Тестове налаштування",
     "Help" : "Допомога",
     "Groups meeting these criteria are available in %s:" : "Групи, що відповідають цим критеріям доступні в %s:",
-    "only those object classes:" : "тільки ці об'єктні класи:",
-    "only from those groups:" : "тільки з цих груп:",
-    "Edit raw filter instead" : "Редагувати початковий фільтр",
-    "Raw LDAP filter" : "Початковий LDAP фільтр",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Фільтр визначає, які LDAP групи повинні мати доступ до %s примірника.",
     "Test Filter" : "Тест Фільтр",
-    "groups found" : "знайдені групи",
-    "Users login with this attribute:" : "Вхід користувачів з цим атрибутом:",
-    "LDAP Username:" : "LDAP Ім’я користувача:",
-    "LDAP Email Address:" : "LDAP E-mail адрес:",
     "Other Attributes:" : "Інші Атрібути:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Визначає фільтр, який слід застосовувати при спробі входу.\n%%uid замінює ім'я користувача при вході в систему. Приклад: \"uid=%%uid\"",
     "1. Server" : "1. Сервер",
     "%s. Server:" : "%s. Сервер:",
-    "Add Server Configuration" : "Додати налаштування Сервера",
-    "Delete Configuration" : "Видалити Конфігурацію",
     "Host" : "Хост",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://",
     "Port" : "Порт",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Вручну введіть LDAP фільтри (рекомендується для великих каталогів)",
     "Limit %s access to users meeting these criteria:" : "Обмежити %s доступ до користувачів, що відповідають цим критеріям:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Фільтр визначає, які користувачі LDAP повині мати доступ до примірника %s.",
-    "users found" : "користувачів знайдено",
     "Saving" : "Збереження",
     "Back" : "Назад",
     "Continue" : "Продовжити",
diff --git a/apps/user_ldap/l10n/uk.json b/apps/user_ldap/l10n/uk.json
index 597c15170d6..16fd5b66343 100644
--- a/apps/user_ldap/l10n/uk.json
+++ b/apps/user_ldap/l10n/uk.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Немає конфігурації",
     "No data specified" : "Немає даних",
     " Could not set configuration %s" : "Не вдалося встановити конфігурацію %s",
-    "Deletion failed" : "Видалення не було виконано",
-    "Take over settings from recent server configuration?" : "Застосувати налаштування  з останньої конфігурації сервера ?",
-    "Keep settings?" : "Зберегти налаштування ?",
-    "{nthServer}. Server" : "{nthServer}. Сервер",
-    "Cannot add server configuration" : "Неможливо додати конфігурацію сервера",
-    "mappings cleared" : "відображення очищається",
-    "Success" : "Успіх",
-    "Error" : "Помилка",
-    "Please specify a Base DN" : "Введіть Base DN",
-    "Could not determine Base DN" : "Не вдалося визначити Base DN",
-    "Please specify the port" : "Будь ласка, вкажіть порт",
-    "Configuration OK" : "Конфігурація OK",
     "Configuration incorrect" : "Невірна конфігурація",
     "Configuration incomplete" : "Конфігурація неповна",
+    "Configuration OK" : "Конфігурація OK",
     "Select groups" : "Оберіть групи",
     "Select object classes" : "Виберіть класи об'єктів",
-    "Select attributes" : "Виберіть атрибути",
-    "Connection test succeeded" : "Перевірка з'єднання пройшла успішно",
-    "Connection test failed" : "Перевірка з'єднання завершилась неуспішно",
+    "{nthServer}. Server" : "{nthServer}. Сервер",
     "Do you really want to delete the current Server Configuration?" : "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?",
     "Confirm Deletion" : "Підтвердіть Видалення",
+    "Select attributes" : "Виберіть атрибути",
     "_%s group found_::_%s groups found_" : [" %s група знайдена "," %s груп знайдено ","%s груп знайдено "],
     "_%s user found_::_%s users found_" : ["%s користувач знайден","%s користувачів знайдено","%s користувачів знайдено"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Не вдалося виявити ім'я користувача. Будь ласка, сформулюйте самі в розширених налаштуваннях LDAP.",
     "Could not find the desired feature" : "Не вдалося знайти потрібну функцію",
     "Invalid Host" : "Невірний Host",
     "Server" : "Сервер",
-    "User Filter" : "Користувацький Фільтр",
-    "Login Filter" : "Фільтр Входу",
-    "Group Filter" : "Фільтр Груп",
-    "Save" : "Зберегти",
+    "Users" : "Користувачі",
+    "Groups" : "Групи",
     "Test Configuration" : "Тестове налаштування",
     "Help" : "Допомога",
     "Groups meeting these criteria are available in %s:" : "Групи, що відповідають цим критеріям доступні в %s:",
-    "only those object classes:" : "тільки ці об'єктні класи:",
-    "only from those groups:" : "тільки з цих груп:",
-    "Edit raw filter instead" : "Редагувати початковий фільтр",
-    "Raw LDAP filter" : "Початковий LDAP фільтр",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Фільтр визначає, які LDAP групи повинні мати доступ до %s примірника.",
     "Test Filter" : "Тест Фільтр",
-    "groups found" : "знайдені групи",
-    "Users login with this attribute:" : "Вхід користувачів з цим атрибутом:",
-    "LDAP Username:" : "LDAP Ім’я користувача:",
-    "LDAP Email Address:" : "LDAP E-mail адрес:",
     "Other Attributes:" : "Інші Атрібути:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Визначає фільтр, який слід застосовувати при спробі входу.\n%%uid замінює ім'я користувача при вході в систему. Приклад: \"uid=%%uid\"",
     "1. Server" : "1. Сервер",
     "%s. Server:" : "%s. Сервер:",
-    "Add Server Configuration" : "Додати налаштування Сервера",
-    "Delete Configuration" : "Видалити Конфігурацію",
     "Host" : "Хост",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://",
     "Port" : "Порт",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Вручну введіть LDAP фільтри (рекомендується для великих каталогів)",
     "Limit %s access to users meeting these criteria:" : "Обмежити %s доступ до користувачів, що відповідають цим критеріям:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Фільтр визначає, які користувачі LDAP повині мати доступ до примірника %s.",
-    "users found" : "користувачів знайдено",
     "Saving" : "Збереження",
     "Back" : "Назад",
     "Continue" : "Продовжити",
diff --git a/apps/user_ldap/l10n/ur_PK.js b/apps/user_ldap/l10n/ur_PK.js
index 9ddd79ea349..26ff7ae3d84 100644
--- a/apps/user_ldap/l10n/ur_PK.js
+++ b/apps/user_ldap/l10n/ur_PK.js
@@ -1,8 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "ایرر",
-    "Save" : "حفظ",
+    "Users" : "صارفین",
     "Help" : "مدد",
     "Password" : "پاسورڈ",
     "Continue" : "جاری",
diff --git a/apps/user_ldap/l10n/ur_PK.json b/apps/user_ldap/l10n/ur_PK.json
index d15b84d049b..738ebc145c8 100644
--- a/apps/user_ldap/l10n/ur_PK.json
+++ b/apps/user_ldap/l10n/ur_PK.json
@@ -1,6 +1,5 @@
 { "translations": {
-    "Error" : "ایرر",
-    "Save" : "حفظ",
+    "Users" : "صارفین",
     "Help" : "مدد",
     "Password" : "پاسورڈ",
     "Continue" : "جاری",
diff --git a/apps/user_ldap/l10n/vi.js b/apps/user_ldap/l10n/vi.js
index cd9f720287c..e20feb8abba 100644
--- a/apps/user_ldap/l10n/vi.js
+++ b/apps/user_ldap/l10n/vi.js
@@ -3,16 +3,11 @@ OC.L10N.register(
     {
     "Failed to clear the mappings." : "Lỗi khi xóa ánh xạ.",
     "Failed to delete the server configuration" : "Lỗi khi xóa cấu hình máy chủ",
-    "Deletion failed" : "Xóa thất bại",
-    "Success" : "Thành công",
-    "Error" : "Lỗi",
     "Select groups" : "Chọn nhóm",
     "Invalid Host" : "Host không hợp lệ",
     "Server" : "Máy chủ",
-    "User Filter" : "Bộ lọc người dùng",
-    "Login Filter" : "Bộ lọc đăng nhập",
-    "Group Filter" : "Bộ lọc nhóm",
-    "Save" : "Lưu",
+    "Users" : "Người dùng",
+    "Groups" : "Nhóm",
     "Test Configuration" : "Kiểm tra cấu hình",
     "Help" : "Giúp đỡ",
     "Other Attributes:" : "Thuộc tính khác",
diff --git a/apps/user_ldap/l10n/vi.json b/apps/user_ldap/l10n/vi.json
index f964781b5b4..ffbeff90189 100644
--- a/apps/user_ldap/l10n/vi.json
+++ b/apps/user_ldap/l10n/vi.json
@@ -1,16 +1,11 @@
 { "translations": {
     "Failed to clear the mappings." : "Lỗi khi xóa ánh xạ.",
     "Failed to delete the server configuration" : "Lỗi khi xóa cấu hình máy chủ",
-    "Deletion failed" : "Xóa thất bại",
-    "Success" : "Thành công",
-    "Error" : "Lỗi",
     "Select groups" : "Chọn nhóm",
     "Invalid Host" : "Host không hợp lệ",
     "Server" : "Máy chủ",
-    "User Filter" : "Bộ lọc người dùng",
-    "Login Filter" : "Bộ lọc đăng nhập",
-    "Group Filter" : "Bộ lọc nhóm",
-    "Save" : "Lưu",
+    "Users" : "Người dùng",
+    "Groups" : "Nhóm",
     "Test Configuration" : "Kiểm tra cấu hình",
     "Help" : "Giúp đỡ",
     "Other Attributes:" : "Thuộc tính khác",
diff --git a/apps/user_ldap/l10n/zh_CN.js b/apps/user_ldap/l10n/zh_CN.js
index 481ed4dda7a..e341c393865 100644
--- a/apps/user_ldap/l10n/zh_CN.js
+++ b/apps/user_ldap/l10n/zh_CN.js
@@ -5,25 +5,14 @@ OC.L10N.register(
     "Failed to delete the server configuration" : "未能删除服务器配置",
     "The configuration is valid and the connection could be established!" : "配置有效，能够建立连接！",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "配置有效但绑定失败。请检查服务器设置和认证信息。",
-    "Deletion failed" : "删除失败",
-    "Take over settings from recent server configuration?" : "从近期的服务器配置中导入设置？",
-    "Keep settings?" : "保留设置吗？",
-    "Cannot add server configuration" : "无法增加服务器配置",
-    "mappings cleared" : "清除映射",
-    "Success" : "成功",
-    "Error" : "错误",
     "Select groups" : "选择分组",
-    "Connection test succeeded" : "连接测试成功",
-    "Connection test failed" : "连接测试失败",
     "Do you really want to delete the current Server Configuration?" : "您真的想要删除当前服务器配置吗？",
     "Confirm Deletion" : "确认删除",
     "Invalid Host" : "无效的主机",
-    "Group Filter" : "组过滤",
-    "Save" : "保存",
+    "Users" : "用户",
+    "Groups" : "群组",
     "Test Configuration" : "测试配置",
     "Help" : "帮助",
-    "groups found" : "找到组",
-    "Add Server Configuration" : "增加服务器配置",
     "Host" : "主机",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "可以忽略协议，但如要使用SSL，则需以ldaps://开头",
     "Port" : "端口",
@@ -33,7 +22,6 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "启用匿名访问，将DN和密码保留为空",
     "One Base DN per line" : "每行一个基本判别名",
     "You can specify Base DN for users and groups in the Advanced tab" : "您可以在高级选项卡里为用户和组指定Base DN",
-    "users found" : "找到用户",
     "Back" : "返回",
     "Continue" : "继续",
     "Advanced" : "高级",
diff --git a/apps/user_ldap/l10n/zh_CN.json b/apps/user_ldap/l10n/zh_CN.json
index d79a6f73f9a..24cd71d6941 100644
--- a/apps/user_ldap/l10n/zh_CN.json
+++ b/apps/user_ldap/l10n/zh_CN.json
@@ -3,25 +3,14 @@
     "Failed to delete the server configuration" : "未能删除服务器配置",
     "The configuration is valid and the connection could be established!" : "配置有效，能够建立连接！",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "配置有效但绑定失败。请检查服务器设置和认证信息。",
-    "Deletion failed" : "删除失败",
-    "Take over settings from recent server configuration?" : "从近期的服务器配置中导入设置？",
-    "Keep settings?" : "保留设置吗？",
-    "Cannot add server configuration" : "无法增加服务器配置",
-    "mappings cleared" : "清除映射",
-    "Success" : "成功",
-    "Error" : "错误",
     "Select groups" : "选择分组",
-    "Connection test succeeded" : "连接测试成功",
-    "Connection test failed" : "连接测试失败",
     "Do you really want to delete the current Server Configuration?" : "您真的想要删除当前服务器配置吗？",
     "Confirm Deletion" : "确认删除",
     "Invalid Host" : "无效的主机",
-    "Group Filter" : "组过滤",
-    "Save" : "保存",
+    "Users" : "用户",
+    "Groups" : "群组",
     "Test Configuration" : "测试配置",
     "Help" : "帮助",
-    "groups found" : "找到组",
-    "Add Server Configuration" : "增加服务器配置",
     "Host" : "主机",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "可以忽略协议，但如要使用SSL，则需以ldaps://开头",
     "Port" : "端口",
@@ -31,7 +20,6 @@
     "For anonymous access, leave DN and Password empty." : "启用匿名访问，将DN和密码保留为空",
     "One Base DN per line" : "每行一个基本判别名",
     "You can specify Base DN for users and groups in the Advanced tab" : "您可以在高级选项卡里为用户和组指定Base DN",
-    "users found" : "找到用户",
     "Back" : "返回",
     "Continue" : "继续",
     "Advanced" : "高级",
diff --git a/apps/user_ldap/l10n/zh_HK.js b/apps/user_ldap/l10n/zh_HK.js
index 2bd0061ab7a..918e84c1c13 100644
--- a/apps/user_ldap/l10n/zh_HK.js
+++ b/apps/user_ldap/l10n/zh_HK.js
@@ -1,15 +1,13 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Keep settings?" : "儲存設定？",
-    "{nthServer}. Server" : "{nthServer}. 伺服器",
-    "Success" : "成功",
-    "Error" : "錯誤",
     "Select groups" : "選擇群組",
+    "{nthServer}. Server" : "{nthServer}. 伺服器",
     "_%s group found_::_%s groups found_" : ["找到 %s 群組"],
     "_%s user found_::_%s users found_" : ["找到 %s 用戶"],
     "Server" : "伺服器",
-    "Save" : "儲存",
+    "Users" : "用戶",
+    "Groups" : "群組",
     "Test Configuration" : "測試配置",
     "Help" : "幫助",
     "1. Server" : "1. 伺服器",
diff --git a/apps/user_ldap/l10n/zh_HK.json b/apps/user_ldap/l10n/zh_HK.json
index 5e350517a36..eec1e9ed3aa 100644
--- a/apps/user_ldap/l10n/zh_HK.json
+++ b/apps/user_ldap/l10n/zh_HK.json
@@ -1,13 +1,11 @@
 { "translations": {
-    "Keep settings?" : "儲存設定？",
-    "{nthServer}. Server" : "{nthServer}. 伺服器",
-    "Success" : "成功",
-    "Error" : "錯誤",
     "Select groups" : "選擇群組",
+    "{nthServer}. Server" : "{nthServer}. 伺服器",
     "_%s group found_::_%s groups found_" : ["找到 %s 群組"],
     "_%s user found_::_%s users found_" : ["找到 %s 用戶"],
     "Server" : "伺服器",
-    "Save" : "儲存",
+    "Users" : "用戶",
+    "Groups" : "群組",
     "Test Configuration" : "測試配置",
     "Help" : "幫助",
     "1. Server" : "1. 伺服器",
diff --git a/apps/user_ldap/l10n/zh_TW.js b/apps/user_ldap/l10n/zh_TW.js
index 7bd21791c1d..5eeddd06ccf 100644
--- a/apps/user_ldap/l10n/zh_TW.js
+++ b/apps/user_ldap/l10n/zh_TW.js
@@ -5,24 +5,14 @@ OC.L10N.register(
     "Failed to delete the server configuration" : "刪除伺服器設定時失敗",
     "The configuration is valid and the connection could be established!" : "設定有效且連線可建立",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "設定有效但連線無法建立，請檢查伺服器設定與認證資料。",
-    "Deletion failed" : "移除失敗",
-    "Take over settings from recent server configuration?" : "要使用最近一次的伺服器設定嗎？",
-    "Keep settings?" : "維持設定嗎？",
-    "Cannot add server configuration" : "無法新增伺服器設定",
-    "mappings cleared" : "映射已清除",
-    "Success" : "成功",
-    "Error" : "錯誤",
     "Select groups" : "選擇群組",
-    "Connection test succeeded" : "連線測試成功",
-    "Connection test failed" : "連線測試失敗",
     "Do you really want to delete the current Server Configuration?" : "您真的要刪除現在的伺服器設定嗎？",
     "Confirm Deletion" : "確認刪除",
     "Server" : "伺服器",
-    "Group Filter" : "Group Filter",
-    "Save" : "儲存",
+    "Users" : "使用者",
+    "Groups" : "群組",
     "Test Configuration" : "測試此設定",
     "Help" : "說明",
-    "Add Server Configuration" : "新增伺服器設定",
     "Host" : "主機",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "若您不需要 SSL 加密連線則不需輸入通訊協定，反之請輸入 ldaps://",
     "Port" : "連接埠",
diff --git a/apps/user_ldap/l10n/zh_TW.json b/apps/user_ldap/l10n/zh_TW.json
index 96d76193ba7..60403875d29 100644
--- a/apps/user_ldap/l10n/zh_TW.json
+++ b/apps/user_ldap/l10n/zh_TW.json
@@ -3,24 +3,14 @@
     "Failed to delete the server configuration" : "刪除伺服器設定時失敗",
     "The configuration is valid and the connection could be established!" : "設定有效且連線可建立",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "設定有效但連線無法建立，請檢查伺服器設定與認證資料。",
-    "Deletion failed" : "移除失敗",
-    "Take over settings from recent server configuration?" : "要使用最近一次的伺服器設定嗎？",
-    "Keep settings?" : "維持設定嗎？",
-    "Cannot add server configuration" : "無法新增伺服器設定",
-    "mappings cleared" : "映射已清除",
-    "Success" : "成功",
-    "Error" : "錯誤",
     "Select groups" : "選擇群組",
-    "Connection test succeeded" : "連線測試成功",
-    "Connection test failed" : "連線測試失敗",
     "Do you really want to delete the current Server Configuration?" : "您真的要刪除現在的伺服器設定嗎？",
     "Confirm Deletion" : "確認刪除",
     "Server" : "伺服器",
-    "Group Filter" : "Group Filter",
-    "Save" : "儲存",
+    "Users" : "使用者",
+    "Groups" : "群組",
     "Test Configuration" : "測試此設定",
     "Help" : "說明",
-    "Add Server Configuration" : "新增伺服器設定",
     "Host" : "主機",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "若您不需要 SSL 加密連線則不需輸入通訊協定，反之請輸入 ldaps://",
     "Port" : "連接埠",
diff --git a/apps/user_webdavauth/l10n/sr@latin.js b/apps/user_webdavauth/l10n/sr@latin.js
index cf03aa604dd..cd7a973d450 100644
--- a/apps/user_webdavauth/l10n/sr@latin.js
+++ b/apps/user_webdavauth/l10n/sr@latin.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "user_webdavauth",
     {
-    "WebDAV Authentication" : "WebDAV provera identiteta",
+    "WebDAV Authentication" : "WebDAV autentifikacija",
     "Address:" : "Adresa:",
-    "Save" : "Snimi",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnički podaci za proveru identiteta će biti poslati na ovu adresu. Ova komponenta proverava odgovor i protumačiće HTTP statusne kodove 401 i 403 kao neispravne podatke za proveru identiteta, a sve ostale odgovore kao ispravne."
+    "Save" : "Sačuvaj",
+    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnički akreditivi biće poslati na ovu adresu. Priključak proverava odgovor i HTTP kodove 401 i 403 tumačiće kao neispravne akreditive a sve ostale odgovore kao ispravne."
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_webdavauth/l10n/sr@latin.json b/apps/user_webdavauth/l10n/sr@latin.json
index d54f467400e..a26e0f73765 100644
--- a/apps/user_webdavauth/l10n/sr@latin.json
+++ b/apps/user_webdavauth/l10n/sr@latin.json
@@ -1,7 +1,7 @@
 { "translations": {
-    "WebDAV Authentication" : "WebDAV provera identiteta",
+    "WebDAV Authentication" : "WebDAV autentifikacija",
     "Address:" : "Adresa:",
-    "Save" : "Snimi",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnički podaci za proveru identiteta će biti poslati na ovu adresu. Ova komponenta proverava odgovor i protumačiće HTTP statusne kodove 401 i 403 kao neispravne podatke za proveru identiteta, a sve ostale odgovore kao ispravne."
+    "Save" : "Sačuvaj",
+    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnički akreditivi biće poslati na ovu adresu. Priključak proverava odgovor i HTTP kodove 401 i 403 tumačiće kao neispravne akreditive a sve ostale odgovore kao ispravne."
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/core/l10n/af_ZA.js b/core/l10n/af_ZA.js
index 6e6ef7c4c46..e5a3b2541d3 100644
--- a/core/l10n/af_ZA.js
+++ b/core/l10n/af_ZA.js
@@ -96,7 +96,6 @@ OC.L10N.register(
     "Admin" : "Admin",
     "Help" : "Hulp",
     "Access forbidden" : "Toegang verbode",
-    "Security Warning" : "Sekuriteits waarskuwing",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jou data gids en lêers is moontlik toeganklik vanaf die internet omdat die .htaccess lêer nie werk nie.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.",
     "Create an <strong>admin account</strong>" : "Skep `n <strong>admin-rekening</strong>",
diff --git a/core/l10n/af_ZA.json b/core/l10n/af_ZA.json
index c6c41e0dd11..b4a2b5df623 100644
--- a/core/l10n/af_ZA.json
+++ b/core/l10n/af_ZA.json
@@ -94,7 +94,6 @@
     "Admin" : "Admin",
     "Help" : "Hulp",
     "Access forbidden" : "Toegang verbode",
-    "Security Warning" : "Sekuriteits waarskuwing",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jou data gids en lêers is moontlik toeganklik vanaf die internet omdat die .htaccess lêer nie werk nie.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.",
     "Create an <strong>admin account</strong>" : "Skep `n <strong>admin-rekening</strong>",
diff --git a/core/l10n/ar.js b/core/l10n/ar.js
index a5de135bbff..3fcc7002be0 100644
--- a/core/l10n/ar.js
+++ b/core/l10n/ar.js
@@ -52,7 +52,6 @@ OC.L10N.register(
     "Error while changing permissions" : "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
     "Shared with you and the group {group} by {owner}" : "شورك معك ومع المجموعة {group} من قبل {owner}",
     "Shared with you by {owner}" : "شورك معك من قبل {owner}",
-    "Share with user or group …" : "المشاركة مع مستخدم أو مجموعة...",
     "Share link" : "شارك الرابط",
     "Link" : "الرابط",
     "Password protect" : "حماية كلمة السر",
@@ -98,7 +97,6 @@ OC.L10N.register(
     "Admin" : "المدير",
     "Help" : "المساعدة",
     "Access forbidden" : "التوصّل محظور",
-    "Security Warning" : "تحذير أمان",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess  لا يعمل بشكل صحيح.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "لمزيد من المعلومات عن كيفية إعداد خادمك، يرجى الاطلاع على <a href=\"%s\" target=\"_blank\">صفحة المساعدة</a>.",
     "Create an <strong>admin account</strong>" : "أضف </strong>مستخدم رئيسي <strong>",
diff --git a/core/l10n/ar.json b/core/l10n/ar.json
index 10f39fdbeb4..d1c70bacab9 100644
--- a/core/l10n/ar.json
+++ b/core/l10n/ar.json
@@ -50,7 +50,6 @@
     "Error while changing permissions" : "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
     "Shared with you and the group {group} by {owner}" : "شورك معك ومع المجموعة {group} من قبل {owner}",
     "Shared with you by {owner}" : "شورك معك من قبل {owner}",
-    "Share with user or group …" : "المشاركة مع مستخدم أو مجموعة...",
     "Share link" : "شارك الرابط",
     "Link" : "الرابط",
     "Password protect" : "حماية كلمة السر",
@@ -96,7 +95,6 @@
     "Admin" : "المدير",
     "Help" : "المساعدة",
     "Access forbidden" : "التوصّل محظور",
-    "Security Warning" : "تحذير أمان",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess  لا يعمل بشكل صحيح.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "لمزيد من المعلومات عن كيفية إعداد خادمك، يرجى الاطلاع على <a href=\"%s\" target=\"_blank\">صفحة المساعدة</a>.",
     "Create an <strong>admin account</strong>" : "أضف </strong>مستخدم رئيسي <strong>",
diff --git a/core/l10n/ast.js b/core/l10n/ast.js
index baf953b7be8..d80238d71d5 100644
--- a/core/l10n/ast.js
+++ b/core/l10n/ast.js
@@ -70,7 +70,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Fallu mientres camudaben los permisos",
     "Shared with you and the group {group} by {owner}" : "Compartíu contigo y col grupu {group} por {owner}",
     "Shared with you by {owner}" : "Compartíu contigo por {owner}",
-    "Share with user or group …" : "Compartir col usuariu o grupu ...",
     "Share link" : "Compartir enllaz",
     "The public link will expire no later than {days} days after it is created" : "L'enllaz públicu va caducar enantes de {days} díes dende la so creación",
     "Password protect" : "Protexer con contraseña",
@@ -131,7 +130,6 @@ OC.L10N.register(
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hola, ¿qué hai?\n\nnamái déxanos dicite que %s compartió %s contigo.\nVelu: %s\n\n",
     "The share will expire on %s." : "La compartición va caducar el %s.",
     "Cheers!" : "¡Salú!",
-    "Security Warning" : "Avisu de seguridá",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pa informase de cómo configurar el so sirvidor, por favor güeya la  <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crea una <strong>cuenta d'alministrador</strong>",
diff --git a/core/l10n/ast.json b/core/l10n/ast.json
index ff7d10c2e0e..ec159007f04 100644
--- a/core/l10n/ast.json
+++ b/core/l10n/ast.json
@@ -68,7 +68,6 @@
     "Error while changing permissions" : "Fallu mientres camudaben los permisos",
     "Shared with you and the group {group} by {owner}" : "Compartíu contigo y col grupu {group} por {owner}",
     "Shared with you by {owner}" : "Compartíu contigo por {owner}",
-    "Share with user or group …" : "Compartir col usuariu o grupu ...",
     "Share link" : "Compartir enllaz",
     "The public link will expire no later than {days} days after it is created" : "L'enllaz públicu va caducar enantes de {days} díes dende la so creación",
     "Password protect" : "Protexer con contraseña",
@@ -129,7 +128,6 @@
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hola, ¿qué hai?\n\nnamái déxanos dicite que %s compartió %s contigo.\nVelu: %s\n\n",
     "The share will expire on %s." : "La compartición va caducar el %s.",
     "Cheers!" : "¡Salú!",
-    "Security Warning" : "Avisu de seguridá",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pa informase de cómo configurar el so sirvidor, por favor güeya la  <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crea una <strong>cuenta d'alministrador</strong>",
diff --git a/core/l10n/az.js b/core/l10n/az.js
index 7b5e004a12a..be8608bdecd 100644
--- a/core/l10n/az.js
+++ b/core/l10n/az.js
@@ -61,7 +61,6 @@ OC.L10N.register(
     "Admin" : "İnzibatçı",
     "Help" : "Kömək",
     "Cheers!" : "Şərəfə!",
-    "Security Warning" : "Təhlükəsizlik xəbərdarlığı",
     "Username" : "İstifadəçi adı",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Xüsusilə fayl sinxronizasiyası üçün desktop client-dən istifadə edilərsə, SQLite məsləhət görülmür.",
     "Search" : "Axtarış",
diff --git a/core/l10n/az.json b/core/l10n/az.json
index d6ed10f0fb1..54987978c04 100644
--- a/core/l10n/az.json
+++ b/core/l10n/az.json
@@ -59,7 +59,6 @@
     "Admin" : "İnzibatçı",
     "Help" : "Kömək",
     "Cheers!" : "Şərəfə!",
-    "Security Warning" : "Təhlükəsizlik xəbərdarlığı",
     "Username" : "İstifadəçi adı",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Xüsusilə fayl sinxronizasiyası üçün desktop client-dən istifadə edilərsə, SQLite məsləhət görülmür.",
     "Search" : "Axtarış",
diff --git a/core/l10n/bg_BG.js b/core/l10n/bg_BG.js
index ffc8d985abf..0b009e8accb 100644
--- a/core/l10n/bg_BG.js
+++ b/core/l10n/bg_BG.js
@@ -81,7 +81,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Грешка при промяна на привилегиите",
     "Shared with you and the group {group} by {owner}" : "Споделено от {owner} с Вас и групата {group} .",
     "Shared with you by {owner}" : "Споделено с Вас от {owner}.",
-    "Share with user or group …" : "Споделяне с потребител или група...",
     "Share link" : "Връзка за споделяне",
     "The public link will expire no later than {days} days after it is created" : "Общодостъпната връзка ще изтече не по-късно от {days} дни след създаването ѝ.",
     "Link" : "Връзка",
@@ -128,7 +127,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["изтегли %n файл","изтегли %n файла"],
     "Updating {productName} to version {version}, this may take a while." : "Обновяване на {productName} към версия {version}. Това може да отнеме време.",
     "Please reload the page." : "Моля, презаредете страницата.",
-    "The update was unsuccessful. " : "Обновяването бе неуспешно.",
     "The update was successful. Redirecting you to ownCloud now." : "Обновяването е успешно. Сега Ви пренасочваме към ownCloud.",
     "Couldn't reset password because the token is invalid" : "Промяната на паролата е невъзможно, защото връзката за удостоверение не е валидна",
     "Couldn't send reset email. Please make sure your username is correct." : "Неуспешно изпращане на имейл за възстановяване на паролата. Моля, уверете се, че потребителското име е правилно.",
@@ -173,7 +171,6 @@ OC.L10N.register(
     "File: %s" : "Файл: %s",
     "Line: %s" : "Линия: %s",
     "Trace" : "Проследяване на грешките",
-    "Security Warning" : "Предупреждение за сигурноста",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашата директория за данни и файлове Ви вероятно са достъпни от интернет, поради това, че файлът \".htaccess\" не функционира.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "За информация как правилно да настроиш сървъра си, моля прегледай <a href=\"%s\" target=\"_blank\">документацията</a>.",
     "Create an <strong>admin account</strong>" : "Създаване на <strong>администраторски профил</strong>.",
@@ -187,7 +184,6 @@ OC.L10N.register(
     "Database name" : "Име на базата данни",
     "Database tablespace" : "Tablespace на базата данни",
     "Database host" : "Хост за базата данни",
-    "Performance Warning" : "Предупреждение за производителността",
     "SQLite will be used as database." : "Ще бъде използвана SQLite за база данни.",
     "For larger installations we recommend to choose a different database backend." : "За по- големи инсталации Ви препоръчваме да изберете друг сървър за бази данни.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особено, когато използвате клиент за работен плот за синхронизация, използването на SQLite e непрепоръчително.",
diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json
index e8a8fc5a134..d0ff4af07bf 100644
--- a/core/l10n/bg_BG.json
+++ b/core/l10n/bg_BG.json
@@ -79,7 +79,6 @@
     "Error while changing permissions" : "Грешка при промяна на привилегиите",
     "Shared with you and the group {group} by {owner}" : "Споделено от {owner} с Вас и групата {group} .",
     "Shared with you by {owner}" : "Споделено с Вас от {owner}.",
-    "Share with user or group …" : "Споделяне с потребител или група...",
     "Share link" : "Връзка за споделяне",
     "The public link will expire no later than {days} days after it is created" : "Общодостъпната връзка ще изтече не по-късно от {days} дни след създаването ѝ.",
     "Link" : "Връзка",
@@ -126,7 +125,6 @@
     "_download %n file_::_download %n files_" : ["изтегли %n файл","изтегли %n файла"],
     "Updating {productName} to version {version}, this may take a while." : "Обновяване на {productName} към версия {version}. Това може да отнеме време.",
     "Please reload the page." : "Моля, презаредете страницата.",
-    "The update was unsuccessful. " : "Обновяването бе неуспешно.",
     "The update was successful. Redirecting you to ownCloud now." : "Обновяването е успешно. Сега Ви пренасочваме към ownCloud.",
     "Couldn't reset password because the token is invalid" : "Промяната на паролата е невъзможно, защото връзката за удостоверение не е валидна",
     "Couldn't send reset email. Please make sure your username is correct." : "Неуспешно изпращане на имейл за възстановяване на паролата. Моля, уверете се, че потребителското име е правилно.",
@@ -171,7 +169,6 @@
     "File: %s" : "Файл: %s",
     "Line: %s" : "Линия: %s",
     "Trace" : "Проследяване на грешките",
-    "Security Warning" : "Предупреждение за сигурноста",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашата директория за данни и файлове Ви вероятно са достъпни от интернет, поради това, че файлът \".htaccess\" не функционира.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "За информация как правилно да настроиш сървъра си, моля прегледай <a href=\"%s\" target=\"_blank\">документацията</a>.",
     "Create an <strong>admin account</strong>" : "Създаване на <strong>администраторски профил</strong>.",
@@ -185,7 +182,6 @@
     "Database name" : "Име на базата данни",
     "Database tablespace" : "Tablespace на базата данни",
     "Database host" : "Хост за базата данни",
-    "Performance Warning" : "Предупреждение за производителността",
     "SQLite will be used as database." : "Ще бъде използвана SQLite за база данни.",
     "For larger installations we recommend to choose a different database backend." : "За по- големи инсталации Ви препоръчваме да изберете друг сървър за бази данни.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особено, когато използвате клиент за работен плот за синхронизация, използването на SQLite e непрепоръчително.",
diff --git a/core/l10n/bn_BD.js b/core/l10n/bn_BD.js
index 990e6cd456b..92e47f1b28a 100644
--- a/core/l10n/bn_BD.js
+++ b/core/l10n/bn_BD.js
@@ -93,7 +93,6 @@ OC.L10N.register(
     "Access forbidden" : "অধিগমনের অনুমতি নেই",
     "File not found" : "ফাইল খুঁজে পাওয়া গেল না",
     "Cheers!" : "শুভেচ্ছা!",
-    "Security Warning" : "নিরাপত্তাজনিত সতর্কতা",
     "Create an <strong>admin account</strong>" : "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
     "Username" : "ব্যবহারকারী",
     "Data folder" : "ডাটা ফোল্ডার ",
diff --git a/core/l10n/bn_BD.json b/core/l10n/bn_BD.json
index 34e59d4e974..b68c9f28410 100644
--- a/core/l10n/bn_BD.json
+++ b/core/l10n/bn_BD.json
@@ -91,7 +91,6 @@
     "Access forbidden" : "অধিগমনের অনুমতি নেই",
     "File not found" : "ফাইল খুঁজে পাওয়া গেল না",
     "Cheers!" : "শুভেচ্ছা!",
-    "Security Warning" : "নিরাপত্তাজনিত সতর্কতা",
     "Create an <strong>admin account</strong>" : "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
     "Username" : "ব্যবহারকারী",
     "Data folder" : "ডাটা ফোল্ডার ",
diff --git a/core/l10n/bs.js b/core/l10n/bs.js
index f19ad1a2e1b..b776a3f61cf 100644
--- a/core/l10n/bs.js
+++ b/core/l10n/bs.js
@@ -70,7 +70,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Greška pri mijenjanju dozvola",
     "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
     "Shared with you by {owner}" : "Podijeljeno sa vama od {owner}",
-    "Share with user or group …" : "Podijelite s korisnikom ili grupom ...",
     "Share link" : "Podijelite vezu",
     "The public link will expire no later than {days} days after it is created" : "Javna veza ističe najkasnije {days} dana nakon što je kreirana",
     "Link" : "Veza",
@@ -115,7 +114,6 @@ OC.L10N.register(
     "Hello {name}, the weather is {weather}" : "Halo {name}, vrijeme je {weather}",
     "Updating {productName} to version {version}, this may take a while." : "Ažuriranje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
     "Please reload the page." : "Molim, ponovno učitajte stranicu",
-    "The update was unsuccessful. " : "Ažuriranje nije uspjelo.",
     "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspjelo. Preusmjeravam vas na ownCloud.",
     "Couldn't reset password because the token is invalid" : "Nemoguće resetiranje lozinke jer znak nije validan.",
     "Couldn't send reset email. Please make sure your username is correct." : "Slanje emaila resetovanja nije moguće. Osigurajte se da vam je ispravno korisničko ime.",
@@ -152,7 +150,6 @@ OC.L10N.register(
     "Message: %s" : "Poruka: %s",
     "File: %s" : "Datoteka: %s",
     "Line: %s" : "Red: %s",
-    "Security Warning" : "Sigurnosno Upozorenje",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vaš direktorij podataka i datoteke vjerojatno se mogu pristupiti s interneta jer .htaccess datoteka ne radi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informacije kako da valjano konfigurišete vaš server, molim pogledajte <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
     "Create an <strong>admin account</strong>" : "Kreirajte <strong>administracioni račun</strong>",
diff --git a/core/l10n/bs.json b/core/l10n/bs.json
index c13453afa21..af6bcaed5a0 100644
--- a/core/l10n/bs.json
+++ b/core/l10n/bs.json
@@ -68,7 +68,6 @@
     "Error while changing permissions" : "Greška pri mijenjanju dozvola",
     "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
     "Shared with you by {owner}" : "Podijeljeno sa vama od {owner}",
-    "Share with user or group …" : "Podijelite s korisnikom ili grupom ...",
     "Share link" : "Podijelite vezu",
     "The public link will expire no later than {days} days after it is created" : "Javna veza ističe najkasnije {days} dana nakon što je kreirana",
     "Link" : "Veza",
@@ -113,7 +112,6 @@
     "Hello {name}, the weather is {weather}" : "Halo {name}, vrijeme je {weather}",
     "Updating {productName} to version {version}, this may take a while." : "Ažuriranje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
     "Please reload the page." : "Molim, ponovno učitajte stranicu",
-    "The update was unsuccessful. " : "Ažuriranje nije uspjelo.",
     "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspjelo. Preusmjeravam vas na ownCloud.",
     "Couldn't reset password because the token is invalid" : "Nemoguće resetiranje lozinke jer znak nije validan.",
     "Couldn't send reset email. Please make sure your username is correct." : "Slanje emaila resetovanja nije moguće. Osigurajte se da vam je ispravno korisničko ime.",
@@ -150,7 +148,6 @@
     "Message: %s" : "Poruka: %s",
     "File: %s" : "Datoteka: %s",
     "Line: %s" : "Red: %s",
-    "Security Warning" : "Sigurnosno Upozorenje",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vaš direktorij podataka i datoteke vjerojatno se mogu pristupiti s interneta jer .htaccess datoteka ne radi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informacije kako da valjano konfigurišete vaš server, molim pogledajte <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
     "Create an <strong>admin account</strong>" : "Kreirajte <strong>administracioni račun</strong>",
diff --git a/core/l10n/ca.js b/core/l10n/ca.js
index 8a06f1faa27..81a789b2039 100644
--- a/core/l10n/ca.js
+++ b/core/l10n/ca.js
@@ -72,7 +72,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Error en canviar els permisos",
     "Shared with you and the group {group} by {owner}" : "Compartit amb vos i amb el grup {group} per {owner}",
     "Shared with you by {owner}" : "Compartit amb vos per {owner}",
-    "Share with user or group …" : "Comparteix amb usuari o grup...",
     "Share link" : "Enllaç de compartició",
     "The public link will expire no later than {days} days after it is created" : "L'enllaç públic tindrà venciment abans de {days} dies després de crear-lo",
     "Link" : "Enllaç",
@@ -119,7 +118,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["descarregar l'arxiu %n","descarregar arxius %n "],
     "Updating {productName} to version {version}, this may take a while." : "Actualitzant {productName} a la versió {version}. Pot trigar una estona.",
     "Please reload the page." : "Carregueu la pàgina de nou.",
-    "The update was unsuccessful. " : "La actualització no ha tingut èxit",
     "The update was successful. Redirecting you to ownCloud now." : "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
     "Couldn't reset password because the token is invalid" : "No es pot restablir la contrasenya perquè el testimoni no és vàlid",
     "Couldn't send reset email. Please make sure your username is correct." : "No s'ha pogut enviar el correu de restabliment. Assegureu-vos que el vostre nom d'usuari és correcte.",
@@ -158,7 +156,6 @@ OC.L10N.register(
     "Code: %s" : "Codi: %s",
     "Message: %s" : "Missatge: %s",
     "File: %s" : "Fitxer: %s",
-    "Security Warning" : "Avís de seguretat",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
     "Create an <strong>admin account</strong>" : "Crea un <strong>compte d'administrador</strong>",
diff --git a/core/l10n/ca.json b/core/l10n/ca.json
index 4029603b518..70a60d4591a 100644
--- a/core/l10n/ca.json
+++ b/core/l10n/ca.json
@@ -70,7 +70,6 @@
     "Error while changing permissions" : "Error en canviar els permisos",
     "Shared with you and the group {group} by {owner}" : "Compartit amb vos i amb el grup {group} per {owner}",
     "Shared with you by {owner}" : "Compartit amb vos per {owner}",
-    "Share with user or group …" : "Comparteix amb usuari o grup...",
     "Share link" : "Enllaç de compartició",
     "The public link will expire no later than {days} days after it is created" : "L'enllaç públic tindrà venciment abans de {days} dies després de crear-lo",
     "Link" : "Enllaç",
@@ -117,7 +116,6 @@
     "_download %n file_::_download %n files_" : ["descarregar l'arxiu %n","descarregar arxius %n "],
     "Updating {productName} to version {version}, this may take a while." : "Actualitzant {productName} a la versió {version}. Pot trigar una estona.",
     "Please reload the page." : "Carregueu la pàgina de nou.",
-    "The update was unsuccessful. " : "La actualització no ha tingut èxit",
     "The update was successful. Redirecting you to ownCloud now." : "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
     "Couldn't reset password because the token is invalid" : "No es pot restablir la contrasenya perquè el testimoni no és vàlid",
     "Couldn't send reset email. Please make sure your username is correct." : "No s'ha pogut enviar el correu de restabliment. Assegureu-vos que el vostre nom d'usuari és correcte.",
@@ -156,7 +154,6 @@
     "Code: %s" : "Codi: %s",
     "Message: %s" : "Missatge: %s",
     "File: %s" : "Fitxer: %s",
-    "Security Warning" : "Avís de seguretat",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
     "Create an <strong>admin account</strong>" : "Crea un <strong>compte d'administrador</strong>",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index 8f066359488..4a9215eabcc 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -72,7 +72,7 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Váš webový server ještě není správně nastaven pro umožnění synchronizace souborů, protože rozhraní WebDAV je pravděpodobně rozbité.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Tento server nemá funkční připojení k Internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích emailů také nemusí fungovat. Pokud chcete využívat všechny možnosti ownCloud, doporučujeme povolit pro tento server připojení k Internetu.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z Internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Nebyla nakonfigurována paměťová cache. Pro zlepšení výkonu a dostupnosti ji prosím nakonfigurujte. Další informace lze nalézt v naší <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">dokumentaci</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nebyla nakonfigurována paměťová cache. Pro zlepšení výkonu a dostupnosti ji prosím nakonfigurujte. Další informace lze nalézt v naší <a href=\"{docLink}\">dokumentaci</a>.",
     "Error occurred while checking server setup" : "Při ověřování nastavení serveru došlo k chybě",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP hlavička \"{header}\" není nakonfigurována ve shodě s \"{expected}\". To značí možné ohrožení bezpečnosti a soukromí a je doporučeno toto nastavení upravit.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "HTTP hlavička \"Strict-Transport-Security\" není nakonfigurována na minimálně \"2,678,400\" sekund. To značí možné ohrožení bezpečnosti a je doporučeno upravit toto nastavení.",
@@ -86,7 +86,9 @@ OC.L10N.register(
     "Error while changing permissions" : "Chyba při změně oprávnění",
     "Shared with you and the group {group} by {owner}" : "S Vámi a skupinou {group} sdílí {owner}",
     "Shared with you by {owner}" : "S Vámi sdílí {owner}",
-    "Share with user or group …" : "Sdílet s uživatelem nebo skupinou",
+    "Share with users or groups …" : "Sdílet s uživateli nebo skupinami",
+    "Share with users, groups or remote users …" : "Sdílet s uživateli, skupinami nebo vzdálenými uživateli",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Sdílejte s lidmi na ownClouds použitím syntaxe username@example.com/owncloud",
     "Share link" : "Sdílet odkaz",
     "The public link will expire no later than {days} days after it is created" : "Veřejný odkaz vyprší nejpozději {days} dní od svého vytvoření",
     "Link" : "Odkaz",
@@ -99,6 +101,7 @@ OC.L10N.register(
     "Set expiration date" : "Nastavit datum vypršení platnosti",
     "Expiration" : "Konec platnosti",
     "Expiration date" : "Datum vypršení platnosti",
+    "An error occured. Please try again" : "Nastala chyba. Prosím zkuste to znovu",
     "Adding user..." : "Přidávám uživatele...",
     "group" : "skupina",
     "remote" : "vzdálený",
@@ -133,7 +136,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["stáhnout %n soubor","stáhnout %n soubory","stáhnout %n souborů"],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.",
     "Please reload the page." : "Načtěte stránku znovu, prosím.",
-    "The update was unsuccessful. " : "Aktualizace nebyla úspěšná.",
     "The update was successful. Redirecting you to ownCloud now." : "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
     "Couldn't reset password because the token is invalid" : "Heslo nebylo změněno kvůli neplatnému tokenu",
     "Couldn't send reset email. Please make sure your username is correct." : "Nelze odeslat email pro změnu hesla. Ujistěte se prosím, že zadáváte správné uživatelské jméno.",
@@ -178,7 +180,7 @@ OC.L10N.register(
     "File: %s" : "Soubor: %s",
     "Line: %s" : "Řádka: %s",
     "Trace" : "Trasa",
-    "Security Warning" : "Bezpečnostní upozornění",
+    "Security warning" : "Bezpečnostní varování",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
     "Create an <strong>admin account</strong>" : "Vytvořit <strong>účet správce</strong>",
@@ -192,18 +194,22 @@ OC.L10N.register(
     "Database name" : "Název databáze",
     "Database tablespace" : "Tabulkový prostor databáze",
     "Database host" : "Hostitel databáze",
-    "Performance Warning" : "Varování o výkonu",
+    "Performance warning" : "Varování o výkonu",
     "SQLite will be used as database." : "Bude použita SQLite databáze.",
     "For larger installations we recommend to choose a different database backend." : "Pro větší instalace doporučujeme vybrat jiné databázové řešení.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Obzvláště při používání klientské aplikace pro synchronizaci s desktopem není SQLite doporučeno.",
     "Finish setup" : "Dokončit nastavení",
     "Finishing …" : "Dokončuji...",
+    "Need help?" : "Potřebujete pomoc?",
+    "See the documentation" : "Shlédnout dokumentaci",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím {linkstart}povolte JavaScript{linkend} a znovu načtěte stránku.",
     "%s is available. Get more information on how to update." : "%s je dostupná. Získejte více informací k postupu aktualizace.",
     "Log out" : "Odhlásit se",
     "Search" : "Hledat",
     "Server side authentication failed!" : "Autentizace na serveru selhala!",
     "Please contact your administrator." : "Kontaktujte prosím svého správce systému.",
+    "An internal error occured." : "Nastala vnitřní chyba.",
+    "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.",
     "Forgot your password? Reset it!" : "Zapomenuté heslo? Nastavte si nové!",
     "remember" : "zapamatovat",
     "Log in" : "Přihlásit",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index b4708f25f90..b8038603c2d 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -70,7 +70,7 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Váš webový server ještě není správně nastaven pro umožnění synchronizace souborů, protože rozhraní WebDAV je pravděpodobně rozbité.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Tento server nemá funkční připojení k Internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích emailů také nemusí fungovat. Pokud chcete využívat všechny možnosti ownCloud, doporučujeme povolit pro tento server připojení k Internetu.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z Internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Nebyla nakonfigurována paměťová cache. Pro zlepšení výkonu a dostupnosti ji prosím nakonfigurujte. Další informace lze nalézt v naší <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">dokumentaci</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nebyla nakonfigurována paměťová cache. Pro zlepšení výkonu a dostupnosti ji prosím nakonfigurujte. Další informace lze nalézt v naší <a href=\"{docLink}\">dokumentaci</a>.",
     "Error occurred while checking server setup" : "Při ověřování nastavení serveru došlo k chybě",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP hlavička \"{header}\" není nakonfigurována ve shodě s \"{expected}\". To značí možné ohrožení bezpečnosti a soukromí a je doporučeno toto nastavení upravit.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "HTTP hlavička \"Strict-Transport-Security\" není nakonfigurována na minimálně \"2,678,400\" sekund. To značí možné ohrožení bezpečnosti a je doporučeno upravit toto nastavení.",
@@ -84,7 +84,9 @@
     "Error while changing permissions" : "Chyba při změně oprávnění",
     "Shared with you and the group {group} by {owner}" : "S Vámi a skupinou {group} sdílí {owner}",
     "Shared with you by {owner}" : "S Vámi sdílí {owner}",
-    "Share with user or group …" : "Sdílet s uživatelem nebo skupinou",
+    "Share with users or groups …" : "Sdílet s uživateli nebo skupinami",
+    "Share with users, groups or remote users …" : "Sdílet s uživateli, skupinami nebo vzdálenými uživateli",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Sdílejte s lidmi na ownClouds použitím syntaxe username@example.com/owncloud",
     "Share link" : "Sdílet odkaz",
     "The public link will expire no later than {days} days after it is created" : "Veřejný odkaz vyprší nejpozději {days} dní od svého vytvoření",
     "Link" : "Odkaz",
@@ -97,6 +99,7 @@
     "Set expiration date" : "Nastavit datum vypršení platnosti",
     "Expiration" : "Konec platnosti",
     "Expiration date" : "Datum vypršení platnosti",
+    "An error occured. Please try again" : "Nastala chyba. Prosím zkuste to znovu",
     "Adding user..." : "Přidávám uživatele...",
     "group" : "skupina",
     "remote" : "vzdálený",
@@ -131,7 +134,6 @@
     "_download %n file_::_download %n files_" : ["stáhnout %n soubor","stáhnout %n soubory","stáhnout %n souborů"],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.",
     "Please reload the page." : "Načtěte stránku znovu, prosím.",
-    "The update was unsuccessful. " : "Aktualizace nebyla úspěšná.",
     "The update was successful. Redirecting you to ownCloud now." : "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
     "Couldn't reset password because the token is invalid" : "Heslo nebylo změněno kvůli neplatnému tokenu",
     "Couldn't send reset email. Please make sure your username is correct." : "Nelze odeslat email pro změnu hesla. Ujistěte se prosím, že zadáváte správné uživatelské jméno.",
@@ -176,7 +178,7 @@
     "File: %s" : "Soubor: %s",
     "Line: %s" : "Řádka: %s",
     "Trace" : "Trasa",
-    "Security Warning" : "Bezpečnostní upozornění",
+    "Security warning" : "Bezpečnostní varování",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
     "Create an <strong>admin account</strong>" : "Vytvořit <strong>účet správce</strong>",
@@ -190,18 +192,22 @@
     "Database name" : "Název databáze",
     "Database tablespace" : "Tabulkový prostor databáze",
     "Database host" : "Hostitel databáze",
-    "Performance Warning" : "Varování o výkonu",
+    "Performance warning" : "Varování o výkonu",
     "SQLite will be used as database." : "Bude použita SQLite databáze.",
     "For larger installations we recommend to choose a different database backend." : "Pro větší instalace doporučujeme vybrat jiné databázové řešení.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Obzvláště při používání klientské aplikace pro synchronizaci s desktopem není SQLite doporučeno.",
     "Finish setup" : "Dokončit nastavení",
     "Finishing …" : "Dokončuji...",
+    "Need help?" : "Potřebujete pomoc?",
+    "See the documentation" : "Shlédnout dokumentaci",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím {linkstart}povolte JavaScript{linkend} a znovu načtěte stránku.",
     "%s is available. Get more information on how to update." : "%s je dostupná. Získejte více informací k postupu aktualizace.",
     "Log out" : "Odhlásit se",
     "Search" : "Hledat",
     "Server side authentication failed!" : "Autentizace na serveru selhala!",
     "Please contact your administrator." : "Kontaktujte prosím svého správce systému.",
+    "An internal error occured." : "Nastala vnitřní chyba.",
+    "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.",
     "Forgot your password? Reset it!" : "Zapomenuté heslo? Nastavte si nové!",
     "remember" : "zapamatovat",
     "Log in" : "Přihlásit",
diff --git a/core/l10n/cy_GB.js b/core/l10n/cy_GB.js
index 59219a671cc..351634259bb 100644
--- a/core/l10n/cy_GB.js
+++ b/core/l10n/cy_GB.js
@@ -68,7 +68,6 @@ OC.L10N.register(
     "Admin" : "Gweinyddu",
     "Help" : "Cymorth",
     "Access forbidden" : "Mynediad wedi'i wahardd",
-    "Security Warning" : "Rhybudd Diogelwch",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
     "Create an <strong>admin account</strong>" : "Crewch <strong>gyfrif gweinyddol</strong>",
     "Username" : "Enw defnyddiwr",
diff --git a/core/l10n/cy_GB.json b/core/l10n/cy_GB.json
index 0fc86a7f4e3..88cf0713eeb 100644
--- a/core/l10n/cy_GB.json
+++ b/core/l10n/cy_GB.json
@@ -66,7 +66,6 @@
     "Admin" : "Gweinyddu",
     "Help" : "Cymorth",
     "Access forbidden" : "Mynediad wedi'i wahardd",
-    "Security Warning" : "Rhybudd Diogelwch",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
     "Create an <strong>admin account</strong>" : "Crewch <strong>gyfrif gweinyddol</strong>",
     "Username" : "Enw defnyddiwr",
diff --git a/core/l10n/da.js b/core/l10n/da.js
index f8ecc65c2bc..82f959646c1 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -72,7 +72,7 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Din webserver er endnu ikke sat korrekt op til at tillade filsynkronisering, fordi WebDAV-grænsefladen ser ud til at være i stykker.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af applikationer fra tredjepart ikke fungerer. Det vil sandsynligvis heller ikke være muligt at tilgå filer fra eksterne drev eller afsendelse af e-mail med notifikationer virker sandsynligvis heller ikke. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Din data mappe og dine filer er muligvis tilgængelige fra internettet. Filen .htaccess fungerer ikke. Vi anbefaler på det kraftigste, at du konfigurerer din webserver således at datamappen ikke længere er tilgængelig, eller at du flytter datamappen uden for webserverens dokumentrod.  ",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Ingen hukommelseslager er konfigureret. For at forbedre din ydelse, venligst konfigurér et hukommelseslager hvis dette er muligt. Mere information kan findes i vores <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">dokumentation</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Der er ikke konfigureret et hukommelsesmellemlager. For at forbedre din ydelse, skal du konfigurere et mellemlager, hvis den er tilgængelig. Du finder mere information i din <a href=\"{docLink}\">dokumentation</a>.",
     "Error occurred while checking server setup" : "Der opstod fejl under tjek af serveropsætningen",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-hovedet \"{header}\" er ikke konfigureret til at være lig med \"{expected}\". Dette er en potentiel sikkerhedsrisiko, og vi anbefaler at du justerer denne indstilling.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "HTTP-hovedet \"Strict-Transport-Security\" er ikke konfigureret til mindst \"2.678.400\" sekunder. Dette er en potentiel sikkerhedsrisiko, og vi anbefaler at du justerer denne indstilling.",
@@ -86,7 +86,9 @@ OC.L10N.register(
     "Error while changing permissions" : "Fejl under justering af rettigheder",
     "Shared with you and the group {group} by {owner}" : "Delt med dig og gruppen {group} af {owner}",
     "Shared with you by {owner}" : "Delt med dig af {owner}",
-    "Share with user or group …" : "Del med bruger eller gruppe ...",
+    "Share with users or groups …" : "Del med brugere eller grupper",
+    "Share with users, groups or remote users …" : "Del med brugere, grupper eller eksterne brugere...",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud",
     "Share link" : "Del link",
     "The public link will expire no later than {days} days after it is created" : "Det offentlige link udløber senest {days} dage efter det blev oprettet",
     "Link" : "Link",
@@ -99,6 +101,7 @@ OC.L10N.register(
     "Set expiration date" : "Vælg udløbsdato",
     "Expiration" : "Udløb",
     "Expiration date" : "Udløbsdato",
+    "An error occured. Please try again" : "Der skete en fejl. Prøv venligst igen",
     "Adding user..." : "Tilføjer bruger...",
     "group" : "gruppe",
     "remote" : "ekstern",
@@ -133,7 +136,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["hent %n fil","hent %n filer"],
     "Updating {productName} to version {version}, this may take a while." : "Opdaterer {productName} til version {version}, det kan tage et stykke tid.",
     "Please reload the page." : "Genindlæs venligst siden",
-    "The update was unsuccessful. " : "Opdateringen blev ikke gennemført.",
     "The update was successful. Redirecting you to ownCloud now." : "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
     "Couldn't reset password because the token is invalid" : "Kunne ikke nulstille kodeordet, fordi symboludtrykket er ugyldigt",
     "Couldn't send reset email. Please make sure your username is correct." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Kontroller venligst om dit brugernavnet er korrekt",
@@ -178,7 +180,7 @@ OC.L10N.register(
     "File: %s" : "Fil: %s",
     "Line: %s" : "Linje: %s",
     "Trace" : "Sporing",
-    "Security Warning" : "Sikkerhedsadvarsel",
+    "Security warning" : "Sikkerheds advarsel",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
     "Create an <strong>admin account</strong>" : "Opret en <strong>administratorkonto</strong>",
@@ -192,18 +194,22 @@ OC.L10N.register(
     "Database name" : "Navn på database",
     "Database tablespace" : "Database tabelplads",
     "Database host" : "Databasehost",
-    "Performance Warning" : "Advarsel vedr. ydelsen",
+    "Performance warning" : "Ydelses advarsel",
     "SQLite will be used as database." : "SQLite vil blive brugt som database.",
     "For larger installations we recommend to choose a different database backend." : "Til større installationer anbefaler vi at vælge en anden database-backend.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Brug af SQLite frarådes især når skrivebordsklienten anvendes til filsynkronisering.",
     "Finish setup" : "Afslut opsætning",
     "Finishing …" : "Færdigbehandler ...",
+    "Need help?" : "Brug for hjælp?",
+    "See the documentation" : "Se dokumentationen",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Denne applikation kræver JavaScript for at fungere korrekt. {linkstart}Slå venligst JavaScript til{linkend} og genindlæs siden. ",
     "%s is available. Get more information on how to update." : "%s er tilgængelig. Få mere information om, hvordan du opdaterer.",
     "Log out" : "Log ud",
     "Search" : "Søg",
     "Server side authentication failed!" : "Server side godkendelse mislykkedes!",
     "Please contact your administrator." : "Kontakt venligst din administrator",
+    "An internal error occured." : "Der skete en intern fejl.",
+    "Please try again or contact your administrator." : "Kontakt venligst din administrator.",
     "Forgot your password? Reset it!" : "Glemt din adgangskode? Nulstil det!",
     "remember" : "husk",
     "Log in" : "Log ind",
diff --git a/core/l10n/da.json b/core/l10n/da.json
index 7d10f656362..3ea3546fc65 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -70,7 +70,7 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Din webserver er endnu ikke sat korrekt op til at tillade filsynkronisering, fordi WebDAV-grænsefladen ser ud til at være i stykker.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af applikationer fra tredjepart ikke fungerer. Det vil sandsynligvis heller ikke være muligt at tilgå filer fra eksterne drev eller afsendelse af e-mail med notifikationer virker sandsynligvis heller ikke. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Din data mappe og dine filer er muligvis tilgængelige fra internettet. Filen .htaccess fungerer ikke. Vi anbefaler på det kraftigste, at du konfigurerer din webserver således at datamappen ikke længere er tilgængelig, eller at du flytter datamappen uden for webserverens dokumentrod.  ",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Ingen hukommelseslager er konfigureret. For at forbedre din ydelse, venligst konfigurér et hukommelseslager hvis dette er muligt. Mere information kan findes i vores <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">dokumentation</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Der er ikke konfigureret et hukommelsesmellemlager. For at forbedre din ydelse, skal du konfigurere et mellemlager, hvis den er tilgængelig. Du finder mere information i din <a href=\"{docLink}\">dokumentation</a>.",
     "Error occurred while checking server setup" : "Der opstod fejl under tjek af serveropsætningen",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-hovedet \"{header}\" er ikke konfigureret til at være lig med \"{expected}\". Dette er en potentiel sikkerhedsrisiko, og vi anbefaler at du justerer denne indstilling.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "HTTP-hovedet \"Strict-Transport-Security\" er ikke konfigureret til mindst \"2.678.400\" sekunder. Dette er en potentiel sikkerhedsrisiko, og vi anbefaler at du justerer denne indstilling.",
@@ -84,7 +84,9 @@
     "Error while changing permissions" : "Fejl under justering af rettigheder",
     "Shared with you and the group {group} by {owner}" : "Delt med dig og gruppen {group} af {owner}",
     "Shared with you by {owner}" : "Delt med dig af {owner}",
-    "Share with user or group …" : "Del med bruger eller gruppe ...",
+    "Share with users or groups …" : "Del med brugere eller grupper",
+    "Share with users, groups or remote users …" : "Del med brugere, grupper eller eksterne brugere...",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud",
     "Share link" : "Del link",
     "The public link will expire no later than {days} days after it is created" : "Det offentlige link udløber senest {days} dage efter det blev oprettet",
     "Link" : "Link",
@@ -97,6 +99,7 @@
     "Set expiration date" : "Vælg udløbsdato",
     "Expiration" : "Udløb",
     "Expiration date" : "Udløbsdato",
+    "An error occured. Please try again" : "Der skete en fejl. Prøv venligst igen",
     "Adding user..." : "Tilføjer bruger...",
     "group" : "gruppe",
     "remote" : "ekstern",
@@ -131,7 +134,6 @@
     "_download %n file_::_download %n files_" : ["hent %n fil","hent %n filer"],
     "Updating {productName} to version {version}, this may take a while." : "Opdaterer {productName} til version {version}, det kan tage et stykke tid.",
     "Please reload the page." : "Genindlæs venligst siden",
-    "The update was unsuccessful. " : "Opdateringen blev ikke gennemført.",
     "The update was successful. Redirecting you to ownCloud now." : "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
     "Couldn't reset password because the token is invalid" : "Kunne ikke nulstille kodeordet, fordi symboludtrykket er ugyldigt",
     "Couldn't send reset email. Please make sure your username is correct." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Kontroller venligst om dit brugernavnet er korrekt",
@@ -176,7 +178,7 @@
     "File: %s" : "Fil: %s",
     "Line: %s" : "Linje: %s",
     "Trace" : "Sporing",
-    "Security Warning" : "Sikkerhedsadvarsel",
+    "Security warning" : "Sikkerheds advarsel",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
     "Create an <strong>admin account</strong>" : "Opret en <strong>administratorkonto</strong>",
@@ -190,18 +192,22 @@
     "Database name" : "Navn på database",
     "Database tablespace" : "Database tabelplads",
     "Database host" : "Databasehost",
-    "Performance Warning" : "Advarsel vedr. ydelsen",
+    "Performance warning" : "Ydelses advarsel",
     "SQLite will be used as database." : "SQLite vil blive brugt som database.",
     "For larger installations we recommend to choose a different database backend." : "Til større installationer anbefaler vi at vælge en anden database-backend.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Brug af SQLite frarådes især når skrivebordsklienten anvendes til filsynkronisering.",
     "Finish setup" : "Afslut opsætning",
     "Finishing …" : "Færdigbehandler ...",
+    "Need help?" : "Brug for hjælp?",
+    "See the documentation" : "Se dokumentationen",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Denne applikation kræver JavaScript for at fungere korrekt. {linkstart}Slå venligst JavaScript til{linkend} og genindlæs siden. ",
     "%s is available. Get more information on how to update." : "%s er tilgængelig. Få mere information om, hvordan du opdaterer.",
     "Log out" : "Log ud",
     "Search" : "Søg",
     "Server side authentication failed!" : "Server side godkendelse mislykkedes!",
     "Please contact your administrator." : "Kontakt venligst din administrator",
+    "An internal error occured." : "Der skete en intern fejl.",
+    "Please try again or contact your administrator." : "Kontakt venligst din administrator.",
     "Forgot your password? Reset it!" : "Glemt din adgangskode? Nulstil det!",
     "remember" : "husk",
     "Log in" : "Log ind",
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 495f233416b..4409d1f5bc6 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -72,7 +72,7 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Dein Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn Du alle Funktionen nutzen möchtest.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Deinen Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Du es aus dem Document-Root-Verzeichnis des Webservers herausverschiebst.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Es wurde kein Pufferspeicher konfiguriert. Zur Erhöhung der Leistungsfähigkeit konfiguriere, soweit verfügbar, den Pufferspeicher. Weitere Informationen finden Sie in unserer <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">Dokumentation</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Es wurde kein Pufferspeicher konfiguriert. Zur Erhöhung der Leistungsfähigkeit konfiguriere, soweit verfügbar, den Pufferspeicher. Weitere Informationen finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.",
     "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „2.678.400 Sekunden“ eingestellt. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.",
@@ -86,7 +86,9 @@ OC.L10N.register(
     "Error while changing permissions" : "Fehler beim Ändern der Rechte",
     "Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
     "Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt",
-    "Share with user or group …" : "Mit Benutzer oder Gruppe teilen…",
+    "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
+    "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
     "Share link" : "Link teilen",
     "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen",
     "Link" : "Link",
@@ -99,6 +101,7 @@ OC.L10N.register(
     "Set expiration date" : "Setze ein Ablaufdatum",
     "Expiration" : "Ablaufdatum",
     "Expiration date" : "Ablaufdatum",
+    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal",
     "Adding user..." : "Benutzer wird hinzugefügt…",
     "group" : "Gruppe",
     "remote" : "Entfernte Freigabe",
@@ -133,7 +136,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
     "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
     "Please reload the page." : "Bitte lade die Seite neu.",
-    "The update was unsuccessful. " : "Die Aktualisierung war nicht erfolgreich.",
     "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
     "Couldn't reset password because the token is invalid" : "Das Passwort konnte aufgrund eines ungültigen Tokens nicht zurückgesetzt werden",
     "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Bitte stelle sicher, dass Dein Benutzername korrekt ist.",
@@ -178,7 +180,7 @@ OC.L10N.register(
     "File: %s" : "Datei: %s",
     "Line: %s" : "Zeile: %s",
     "Trace" : "Spur",
-    "Security Warning" : "Sicherheitswarnung",
+    "Security warning" : "Sicherheitshinweis",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Informationen zum richtigen Konfigurieren Deines Servers kannst Du der <a href=\"%s\" target=\"_blank\">Dokumentation</a> entnehmen.",
     "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
@@ -192,18 +194,22 @@ OC.L10N.register(
     "Database name" : "Datenbank-Name",
     "Database tablespace" : "Datenbank-Tablespace",
     "Database host" : "Datenbank-Host",
-    "Performance Warning" : "Leistungswarnung",
+    "Performance warning" : "Leistungswarnung",
     "SQLite will be used as database." : "SQLite wird als Datenbank benutzt.",
     "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "Finish setup" : "Installation abschließen",
     "Finishing …" : "Abschließen…",
+    "Need help?" : "Hilfe nötig?",
+    "See the documentation" : "Schau in die Dokumentation",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Diese Anwendung benötigt zum ordnungsgemäßen Betrieb JavaScript. Bitte {linkstart}aktiviere JavaScript{linkend} und lade die Seite neu.",
     "%s is available. Get more information on how to update." : "%s ist verfügbar. Hole weitere Informationen zu Aktualisierungen ein.",
     "Log out" : "Abmelden",
     "Search" : "Suche",
     "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!",
     "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.",
+    "An internal error occured." : "Es ist ein interner Fehler aufgetreten.",
+    "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere Deinen Administrator.",
     "Forgot your password? Reset it!" : "Du hast Dein Passwort vergessen? Setze es zurück!",
     "remember" : "merken",
     "Log in" : "Einloggen",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 0a5ff2816ba..700e647f1aa 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -70,7 +70,7 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Dein Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn Du alle Funktionen nutzen möchtest.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Deinen Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Du es aus dem Document-Root-Verzeichnis des Webservers herausverschiebst.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Es wurde kein Pufferspeicher konfiguriert. Zur Erhöhung der Leistungsfähigkeit konfiguriere, soweit verfügbar, den Pufferspeicher. Weitere Informationen finden Sie in unserer <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">Dokumentation</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Es wurde kein Pufferspeicher konfiguriert. Zur Erhöhung der Leistungsfähigkeit konfiguriere, soweit verfügbar, den Pufferspeicher. Weitere Informationen finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.",
     "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „2.678.400 Sekunden“ eingestellt. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.",
@@ -84,7 +84,9 @@
     "Error while changing permissions" : "Fehler beim Ändern der Rechte",
     "Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
     "Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt",
-    "Share with user or group …" : "Mit Benutzer oder Gruppe teilen…",
+    "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
+    "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
     "Share link" : "Link teilen",
     "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen",
     "Link" : "Link",
@@ -97,6 +99,7 @@
     "Set expiration date" : "Setze ein Ablaufdatum",
     "Expiration" : "Ablaufdatum",
     "Expiration date" : "Ablaufdatum",
+    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal",
     "Adding user..." : "Benutzer wird hinzugefügt…",
     "group" : "Gruppe",
     "remote" : "Entfernte Freigabe",
@@ -131,7 +134,6 @@
     "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
     "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
     "Please reload the page." : "Bitte lade die Seite neu.",
-    "The update was unsuccessful. " : "Die Aktualisierung war nicht erfolgreich.",
     "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
     "Couldn't reset password because the token is invalid" : "Das Passwort konnte aufgrund eines ungültigen Tokens nicht zurückgesetzt werden",
     "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Bitte stelle sicher, dass Dein Benutzername korrekt ist.",
@@ -176,7 +178,7 @@
     "File: %s" : "Datei: %s",
     "Line: %s" : "Zeile: %s",
     "Trace" : "Spur",
-    "Security Warning" : "Sicherheitswarnung",
+    "Security warning" : "Sicherheitshinweis",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Informationen zum richtigen Konfigurieren Deines Servers kannst Du der <a href=\"%s\" target=\"_blank\">Dokumentation</a> entnehmen.",
     "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
@@ -190,18 +192,22 @@
     "Database name" : "Datenbank-Name",
     "Database tablespace" : "Datenbank-Tablespace",
     "Database host" : "Datenbank-Host",
-    "Performance Warning" : "Leistungswarnung",
+    "Performance warning" : "Leistungswarnung",
     "SQLite will be used as database." : "SQLite wird als Datenbank benutzt.",
     "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "Finish setup" : "Installation abschließen",
     "Finishing …" : "Abschließen…",
+    "Need help?" : "Hilfe nötig?",
+    "See the documentation" : "Schau in die Dokumentation",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Diese Anwendung benötigt zum ordnungsgemäßen Betrieb JavaScript. Bitte {linkstart}aktiviere JavaScript{linkend} und lade die Seite neu.",
     "%s is available. Get more information on how to update." : "%s ist verfügbar. Hole weitere Informationen zu Aktualisierungen ein.",
     "Log out" : "Abmelden",
     "Search" : "Suche",
     "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!",
     "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.",
+    "An internal error occured." : "Es ist ein interner Fehler aufgetreten.",
+    "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere Deinen Administrator.",
     "Forgot your password? Reset it!" : "Du hast Dein Passwort vergessen? Setze es zurück!",
     "remember" : "merken",
     "Log in" : "Einloggen",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index 58b301f999b..fcde9c7f363 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -72,7 +72,7 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ihr Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn Sie alle Funktionen nutzen möchten.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Ihren Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Sie es aus dem Document-Root-Verzeichnis des Webservers herausverschieben.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Es wurde kein Pufferspeicher konfiguriert. Zur Erhöhung der Leistungsfähigkeit konfigurieren Sie, soweit verfügbar, den Pufferspeicher. Weitere Informationen finden Sie in unserer <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">Dokumentation</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Es wurde kein Pufferspeicher konfiguriert. Zur Erhöhung der Leistungsfähigkeit konfigurieren Sie, soweit verfügbar, den Pufferspeicher. Weitere Informationen finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.",
     "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „2.678.400 Sekunden“ eingestellt. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.",
@@ -86,7 +86,9 @@ OC.L10N.register(
     "Error while changing permissions" : "Fehler bei der Änderung der Rechte",
     "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
     "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
-    "Share with user or group …" : "Mit Benutzer oder Gruppe teilen…",
+    "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
+    "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
     "Share link" : "Link teilen",
     "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen",
     "Link" : "Link",
@@ -99,6 +101,7 @@ OC.L10N.register(
     "Set expiration date" : "Ein Ablaufdatum setzen",
     "Expiration" : "Ablaufdatum",
     "Expiration date" : "Ablaufdatum",
+    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal",
     "Adding user..." : "Benutzer wird hinzugefügt…",
     "group" : "Gruppe",
     "remote" : "Entfernte Freigabe",
@@ -133,7 +136,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
     "Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.",
     "Please reload the page." : "Bitte laden Sie die Seite neu.",
-    "The update was unsuccessful. " : "Die Aktualisierung war nicht erfolgreich.",
     "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
     "Couldn't reset password because the token is invalid" : "Das Passwort konnte aufgrund eines ungültigen Tokens nicht zurückgesetzt werden",
     "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Bitte stellen Sie sicher, dass Ihr Benutzername richtig ist.",
@@ -178,7 +180,7 @@ OC.L10N.register(
     "File: %s" : "Datei: %s",
     "Line: %s" : "Zeile: %s",
     "Trace" : "Spur",
-    "Security Warning" : "Sicherheitshinweis",
+    "Security warning" : "Sicherheitshinweis",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Informationen zum richtigen Konfigurieren Ihres Servers können Sie der <a href=\"%s\" target=\"_blank\">Dokumentation</a> entnehmen.",
     "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
@@ -192,18 +194,22 @@ OC.L10N.register(
     "Database name" : "Datenbank-Name",
     "Database tablespace" : "Datenbank-Tablespace",
     "Database host" : "Datenbank-Host",
-    "Performance Warning" : "Leistungswarnung",
+    "Performance warning" : "Leistungswarnung",
     "SQLite will be used as database." : "SQLite wird als Datenbank benutzt.",
     "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "Finish setup" : "Installation abschließen",
     "Finishing …" : "Abschließen…",
+    "Need help?" : "Hilfe nötig?",
+    "See the documentation" : "Schauen Sie in die Dokumentation",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Diese Anwendung benötigt zum ordnungsgemäßen Betrieb JavaScript. Bitte {linkstart}aktivieren Sie JavaScript{linkend} und laden Sie die Seite neu.",
     "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
     "Log out" : "Abmelden",
     "Search" : "Suche",
     "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!",
     "Please contact your administrator." : "Bitte kontaktieren Sie Ihren Administrator.",
+    "An internal error occured." : "Es ist ein interner Fehler aufgetreten.",
+    "Please try again or contact your administrator." : "Bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator.",
     "Forgot your password? Reset it!" : "Sie haben Ihr Passwort vergessen? Setzen Sie es zurück!",
     "remember" : "merken",
     "Log in" : "Einloggen",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 4567222cf3d..e787fb0fa2b 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -70,7 +70,7 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ihr Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn Sie alle Funktionen nutzen möchten.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Ihren Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Sie es aus dem Document-Root-Verzeichnis des Webservers herausverschieben.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Es wurde kein Pufferspeicher konfiguriert. Zur Erhöhung der Leistungsfähigkeit konfigurieren Sie, soweit verfügbar, den Pufferspeicher. Weitere Informationen finden Sie in unserer <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">Dokumentation</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Es wurde kein Pufferspeicher konfiguriert. Zur Erhöhung der Leistungsfähigkeit konfigurieren Sie, soweit verfügbar, den Pufferspeicher. Weitere Informationen finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.",
     "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „2.678.400 Sekunden“ eingestellt. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.",
@@ -84,7 +84,9 @@
     "Error while changing permissions" : "Fehler bei der Änderung der Rechte",
     "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
     "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
-    "Share with user or group …" : "Mit Benutzer oder Gruppe teilen…",
+    "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
+    "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
     "Share link" : "Link teilen",
     "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen",
     "Link" : "Link",
@@ -97,6 +99,7 @@
     "Set expiration date" : "Ein Ablaufdatum setzen",
     "Expiration" : "Ablaufdatum",
     "Expiration date" : "Ablaufdatum",
+    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal",
     "Adding user..." : "Benutzer wird hinzugefügt…",
     "group" : "Gruppe",
     "remote" : "Entfernte Freigabe",
@@ -131,7 +134,6 @@
     "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
     "Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.",
     "Please reload the page." : "Bitte laden Sie die Seite neu.",
-    "The update was unsuccessful. " : "Die Aktualisierung war nicht erfolgreich.",
     "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
     "Couldn't reset password because the token is invalid" : "Das Passwort konnte aufgrund eines ungültigen Tokens nicht zurückgesetzt werden",
     "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Bitte stellen Sie sicher, dass Ihr Benutzername richtig ist.",
@@ -176,7 +178,7 @@
     "File: %s" : "Datei: %s",
     "Line: %s" : "Zeile: %s",
     "Trace" : "Spur",
-    "Security Warning" : "Sicherheitshinweis",
+    "Security warning" : "Sicherheitshinweis",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Informationen zum richtigen Konfigurieren Ihres Servers können Sie der <a href=\"%s\" target=\"_blank\">Dokumentation</a> entnehmen.",
     "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
@@ -190,18 +192,22 @@
     "Database name" : "Datenbank-Name",
     "Database tablespace" : "Datenbank-Tablespace",
     "Database host" : "Datenbank-Host",
-    "Performance Warning" : "Leistungswarnung",
+    "Performance warning" : "Leistungswarnung",
     "SQLite will be used as database." : "SQLite wird als Datenbank benutzt.",
     "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "Finish setup" : "Installation abschließen",
     "Finishing …" : "Abschließen…",
+    "Need help?" : "Hilfe nötig?",
+    "See the documentation" : "Schauen Sie in die Dokumentation",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Diese Anwendung benötigt zum ordnungsgemäßen Betrieb JavaScript. Bitte {linkstart}aktivieren Sie JavaScript{linkend} und laden Sie die Seite neu.",
     "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
     "Log out" : "Abmelden",
     "Search" : "Suche",
     "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!",
     "Please contact your administrator." : "Bitte kontaktieren Sie Ihren Administrator.",
+    "An internal error occured." : "Es ist ein interner Fehler aufgetreten.",
+    "Please try again or contact your administrator." : "Bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator.",
     "Forgot your password? Reset it!" : "Sie haben Ihr Passwort vergessen? Setzen Sie es zurück!",
     "remember" : "merken",
     "Log in" : "Einloggen",
diff --git a/core/l10n/el.js b/core/l10n/el.js
index 59c62886499..4e5d2104e98 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -72,7 +72,7 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν είναι κατεστραμμένη.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Αυτός ο διακομιστής δεν έχει ενεργή σύνδεση στο διαδίκτυο. Αυτό σημαίνει ότι κάποιες υπηρεσίες όπως η σύνδεση με εξωτερικούς αποθηκευτικούς χώρους, ειδοποιήσεις για ενημερώσεις ή η εγκατάσταση εφαρμογών 3ων δεν θα είναι διαθέσιμες. Η πρόσβαση απομακρυσμένων αρχείων και η αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου μπορεί επίσης να μην είναι διαθέσιμες. Προτείνουμε να ενεργοποιήσετε την πρόσβαση στο διαδίκτυο για αυτόν το διακομιστή εάν θέλετε να χρησιμοποιήσετε όλες τις υπηρεσίες.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανόν διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess δεν λειτουργεί. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος δεδομένων να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο δεδομένων εκτός του καταλόγου της ρίζας εγγράφων-document root του διακομιστή.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Δεν έχει οριστει προσωρινή μνημη.  Για να βελτιώσετε την απόδοσή σας παρακαλούμε να διαμορφώσετε ένα χώρο προσωρινής αποθήκευσης εάν υπάρχει διαθέσιμος. Περαιτέρω πληροφορίες μπορείτε να βρείτε στο <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Δεν έχει οριστεί προσωρινή μνήμη.  Για να βελτιώσετε την απόδοσή σας παρακαλούμε να διαμορφώσετε ένα χώρο προσωρινής αποθήκευσης εάν υπάρχει διαθέσιμος. Περαιτέρω πληροφορίες μπορείτε να βρείτε στην <a href=\"{docLink}\">τεκμηρίωση</a>.",
     "Error occurred while checking server setup" : "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "H \"{header}\" κεφαλίδα HTTP δεν έχει ρυθμιστεί ώστε να ισούται με \"{expected}\". Αυτό αποτελεί ενδεχόμενο κίνδυνο ασφάλειας ή ιδιωτικότητας και συστήνουμε τη διόρθωση αυτής της ρύθμισης.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "Η «Strict-Transport-Security\" κεφαλίδα HTTP δεν έχει ρυθμιστεί για τουλάχιστον \"2678400\" δευτερόλεπτα. Αυτό αποτελεί ενδεχόμενο κίνδυνο ασφάλειας και συστήνουμε τη διόρθωση αυτής της ρύθμισης.",
@@ -86,7 +86,9 @@ OC.L10N.register(
     "Error while changing permissions" : "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
     "Shared with you and the group {group} by {owner}" : "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
     "Shared with you by {owner}" : "Διαμοιράστηκε με σας από τον {owner}",
-    "Share with user or group …" : "Διαμοιρασμός με χρήστη ή ομάδα ...",
+    "Share with users or groups …" : "Διαμοιρασμός με χρήστες ή ομάδες ...",
+    "Share with users, groups or remote users …" : "Διαμοιρασμός με χρήστες, ομάδες ή απομακρυσμένους χρήστες ...",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud",
     "Share link" : "Διαμοιρασμός συνδέσμου",
     "The public link will expire no later than {days} days after it is created" : "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του",
     "Link" : "Σύνδεσμος",
@@ -99,6 +101,7 @@ OC.L10N.register(
     "Set expiration date" : "Ορισμός ημ. λήξης",
     "Expiration" : "Λήξη",
     "Expiration date" : "Ημερομηνία λήξης",
+    "An error occured. Please try again" : "Ένα σφάλμα προέκυψε. Παρακαλώ προσπαθήστε ξανά",
     "Adding user..." : "Προσθήκη χρήστη ...",
     "group" : "ομάδα",
     "remote" : "απομακρυσμένα",
@@ -133,7 +136,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["λήψη %n αρχείου","λήψη %n αρχείων"],
     "Updating {productName} to version {version}, this may take a while." : "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.",
     "Please reload the page." : "Παρακαλώ επαναφορτώστε τη σελίδα.",
-    "The update was unsuccessful. " : "Η ενημέρωση δεν ήταν επιτυχής.",
     "The update was successful. Redirecting you to ownCloud now." : "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
     "Couldn't reset password because the token is invalid" : "Αδυναμία επαναφοράς κωδικού πρόσβασης καθώς το τεκμήριο είναι άκυρο",
     "Couldn't send reset email. Please make sure your username is correct." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ ελέγξτε ότι το όνομα χρήστη σας είναι ορθό.",
@@ -178,7 +180,7 @@ OC.L10N.register(
     "File: %s" : "Αρχείο: %s",
     "Line: %s" : "Γραμμή: %s",
     "Trace" : "Ανίχνευση",
-    "Security Warning" : "Προειδοποίηση Ασφαλείας",
+    "Security warning" : "Προειδοποίηση Ασφαλείας",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Για πληροφορίες πως να ρυθμίσετε ορθά τον διακομιστή σας, παρακαλώ δείτε την <a href=\"%s\" target=\"_blank\">τεκμηρίωση</a>.",
     "Create an <strong>admin account</strong>" : "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
@@ -192,18 +194,22 @@ OC.L10N.register(
     "Database name" : "Όνομα βάσης δεδομένων",
     "Database tablespace" : "Κενά Πινάκων Βάσης Δεδομένων",
     "Database host" : "Διακομιστής βάσης δεδομένων",
-    "Performance Warning" : "Απόδοση προειδοποίησης",
+    "Performance warning" : "Προειδοποίηση απόδοσης",
     "SQLite will be used as database." : "Η SQLite θα χρησιμοποιηθεί ως βάση δεδομένων.",
     "For larger installations we recommend to choose a different database backend." : "Για μεγαλύτερες εγκαταστάσεις συνιστούμε να επιλέξετε διαφορετικό σύστημα υποστήριξης βάσης δεδομένων.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Ειδικά όταν χρησιμοποιείτε τον πελάτη για συγχρονισμό στον υπολογιστή σας, δεν συνίσταται η χρήση της SQLite.",
     "Finish setup" : "Ολοκλήρωση εγκατάστασης",
     "Finishing …" : "Ολοκλήρωση...",
+    "Need help?" : "Θέλετε βοήθεια;",
+    "See the documentation" : "Δείτε την τεκμηρίωση",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Αυτή η εφαρμογή απαιτεί JavaScript για σωστή λειτουργία. Παρακαλώ {linkstart} ενεργοποιήστε τη JavaScrip {linkend} και επαναφορτώστε τη σελίδα.",
     "%s is available. Get more information on how to update." : "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε.",
     "Log out" : "Αποσύνδεση",
     "Search" : "Αναζήτηση",
     "Server side authentication failed!" : "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!",
     "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
+    "An internal error occured." : "Παρουσιάστηκε εσωτερικό σφάλμα.",
+    "Please try again or contact your administrator." : "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με τον διαχειριστή σας.",
     "Forgot your password? Reset it!" : "Ξεχάσατε τον κωδικό πρόσβασής σας; Επαναφέρετέ τον!",
     "remember" : "απομνημόνευση",
     "Log in" : "Είσοδος",
diff --git a/core/l10n/el.json b/core/l10n/el.json
index 8b53f635aa6..3202309de2e 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -70,7 +70,7 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν είναι κατεστραμμένη.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Αυτός ο διακομιστής δεν έχει ενεργή σύνδεση στο διαδίκτυο. Αυτό σημαίνει ότι κάποιες υπηρεσίες όπως η σύνδεση με εξωτερικούς αποθηκευτικούς χώρους, ειδοποιήσεις για ενημερώσεις ή η εγκατάσταση εφαρμογών 3ων δεν θα είναι διαθέσιμες. Η πρόσβαση απομακρυσμένων αρχείων και η αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου μπορεί επίσης να μην είναι διαθέσιμες. Προτείνουμε να ενεργοποιήσετε την πρόσβαση στο διαδίκτυο για αυτόν το διακομιστή εάν θέλετε να χρησιμοποιήσετε όλες τις υπηρεσίες.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανόν διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess δεν λειτουργεί. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος δεδομένων να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο δεδομένων εκτός του καταλόγου της ρίζας εγγράφων-document root του διακομιστή.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Δεν έχει οριστει προσωρινή μνημη.  Για να βελτιώσετε την απόδοσή σας παρακαλούμε να διαμορφώσετε ένα χώρο προσωρινής αποθήκευσης εάν υπάρχει διαθέσιμος. Περαιτέρω πληροφορίες μπορείτε να βρείτε στο <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Δεν έχει οριστεί προσωρινή μνήμη.  Για να βελτιώσετε την απόδοσή σας παρακαλούμε να διαμορφώσετε ένα χώρο προσωρινής αποθήκευσης εάν υπάρχει διαθέσιμος. Περαιτέρω πληροφορίες μπορείτε να βρείτε στην <a href=\"{docLink}\">τεκμηρίωση</a>.",
     "Error occurred while checking server setup" : "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "H \"{header}\" κεφαλίδα HTTP δεν έχει ρυθμιστεί ώστε να ισούται με \"{expected}\". Αυτό αποτελεί ενδεχόμενο κίνδυνο ασφάλειας ή ιδιωτικότητας και συστήνουμε τη διόρθωση αυτής της ρύθμισης.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "Η «Strict-Transport-Security\" κεφαλίδα HTTP δεν έχει ρυθμιστεί για τουλάχιστον \"2678400\" δευτερόλεπτα. Αυτό αποτελεί ενδεχόμενο κίνδυνο ασφάλειας και συστήνουμε τη διόρθωση αυτής της ρύθμισης.",
@@ -84,7 +84,9 @@
     "Error while changing permissions" : "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
     "Shared with you and the group {group} by {owner}" : "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
     "Shared with you by {owner}" : "Διαμοιράστηκε με σας από τον {owner}",
-    "Share with user or group …" : "Διαμοιρασμός με χρήστη ή ομάδα ...",
+    "Share with users or groups …" : "Διαμοιρασμός με χρήστες ή ομάδες ...",
+    "Share with users, groups or remote users …" : "Διαμοιρασμός με χρήστες, ομάδες ή απομακρυσμένους χρήστες ...",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud",
     "Share link" : "Διαμοιρασμός συνδέσμου",
     "The public link will expire no later than {days} days after it is created" : "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του",
     "Link" : "Σύνδεσμος",
@@ -97,6 +99,7 @@
     "Set expiration date" : "Ορισμός ημ. λήξης",
     "Expiration" : "Λήξη",
     "Expiration date" : "Ημερομηνία λήξης",
+    "An error occured. Please try again" : "Ένα σφάλμα προέκυψε. Παρακαλώ προσπαθήστε ξανά",
     "Adding user..." : "Προσθήκη χρήστη ...",
     "group" : "ομάδα",
     "remote" : "απομακρυσμένα",
@@ -131,7 +134,6 @@
     "_download %n file_::_download %n files_" : ["λήψη %n αρχείου","λήψη %n αρχείων"],
     "Updating {productName} to version {version}, this may take a while." : "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.",
     "Please reload the page." : "Παρακαλώ επαναφορτώστε τη σελίδα.",
-    "The update was unsuccessful. " : "Η ενημέρωση δεν ήταν επιτυχής.",
     "The update was successful. Redirecting you to ownCloud now." : "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
     "Couldn't reset password because the token is invalid" : "Αδυναμία επαναφοράς κωδικού πρόσβασης καθώς το τεκμήριο είναι άκυρο",
     "Couldn't send reset email. Please make sure your username is correct." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ ελέγξτε ότι το όνομα χρήστη σας είναι ορθό.",
@@ -176,7 +178,7 @@
     "File: %s" : "Αρχείο: %s",
     "Line: %s" : "Γραμμή: %s",
     "Trace" : "Ανίχνευση",
-    "Security Warning" : "Προειδοποίηση Ασφαλείας",
+    "Security warning" : "Προειδοποίηση Ασφαλείας",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Για πληροφορίες πως να ρυθμίσετε ορθά τον διακομιστή σας, παρακαλώ δείτε την <a href=\"%s\" target=\"_blank\">τεκμηρίωση</a>.",
     "Create an <strong>admin account</strong>" : "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
@@ -190,18 +192,22 @@
     "Database name" : "Όνομα βάσης δεδομένων",
     "Database tablespace" : "Κενά Πινάκων Βάσης Δεδομένων",
     "Database host" : "Διακομιστής βάσης δεδομένων",
-    "Performance Warning" : "Απόδοση προειδοποίησης",
+    "Performance warning" : "Προειδοποίηση απόδοσης",
     "SQLite will be used as database." : "Η SQLite θα χρησιμοποιηθεί ως βάση δεδομένων.",
     "For larger installations we recommend to choose a different database backend." : "Για μεγαλύτερες εγκαταστάσεις συνιστούμε να επιλέξετε διαφορετικό σύστημα υποστήριξης βάσης δεδομένων.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Ειδικά όταν χρησιμοποιείτε τον πελάτη για συγχρονισμό στον υπολογιστή σας, δεν συνίσταται η χρήση της SQLite.",
     "Finish setup" : "Ολοκλήρωση εγκατάστασης",
     "Finishing …" : "Ολοκλήρωση...",
+    "Need help?" : "Θέλετε βοήθεια;",
+    "See the documentation" : "Δείτε την τεκμηρίωση",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Αυτή η εφαρμογή απαιτεί JavaScript για σωστή λειτουργία. Παρακαλώ {linkstart} ενεργοποιήστε τη JavaScrip {linkend} και επαναφορτώστε τη σελίδα.",
     "%s is available. Get more information on how to update." : "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε.",
     "Log out" : "Αποσύνδεση",
     "Search" : "Αναζήτηση",
     "Server side authentication failed!" : "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!",
     "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
+    "An internal error occured." : "Παρουσιάστηκε εσωτερικό σφάλμα.",
+    "Please try again or contact your administrator." : "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με τον διαχειριστή σας.",
     "Forgot your password? Reset it!" : "Ξεχάσατε τον κωδικό πρόσβασής σας; Επαναφέρετέ τον!",
     "remember" : "απομνημόνευση",
     "Log in" : "Είσοδος",
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index b17cb22c29f..f477c17618c 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -84,7 +84,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Error whilst changing permissions",
     "Shared with you and the group {group} by {owner}" : "Shared with you and the group {group} by {owner}",
     "Shared with you by {owner}" : "Shared with you by {owner}",
-    "Share with user or group …" : "Share with user or group …",
     "Share link" : "Share link",
     "The public link will expire no later than {days} days after it is created" : "The public link will expire no later than {days} days after it is created",
     "Link" : "Link",
@@ -131,7 +130,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["download %n file","download %n files"],
     "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.",
     "Please reload the page." : "Please reload the page.",
-    "The update was unsuccessful. " : "The update was unsuccessful. ",
     "The update was successful. Redirecting you to ownCloud now." : "The update was successful. Redirecting you to ownCloud now.",
     "Couldn't reset password because the token is invalid" : "Couldn't reset password because the token is invalid",
     "Couldn't send reset email. Please make sure your username is correct." : "Couldn't send reset email. Please make sure your username is correct.",
@@ -176,7 +174,6 @@ OC.L10N.register(
     "File: %s" : "File: %s",
     "Line: %s" : "Line: %s",
     "Trace" : "Trace",
-    "Security Warning" : "Security Warning",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
     "Create an <strong>admin account</strong>" : "Create an <strong>admin account</strong>",
@@ -190,7 +187,6 @@ OC.L10N.register(
     "Database name" : "Database name",
     "Database tablespace" : "Database tablespace",
     "Database host" : "Database host",
-    "Performance Warning" : "Performance Warning",
     "SQLite will be used as database." : "SQLite will be used as database.",
     "For larger installations we recommend to choose a different database backend." : "For larger installations we recommend to choose a different database backend.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especially when using the desktop client for file syncing, the use of SQLite is discouraged.",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index c18734585fc..7696f4027b0 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -82,7 +82,6 @@
     "Error while changing permissions" : "Error whilst changing permissions",
     "Shared with you and the group {group} by {owner}" : "Shared with you and the group {group} by {owner}",
     "Shared with you by {owner}" : "Shared with you by {owner}",
-    "Share with user or group …" : "Share with user or group …",
     "Share link" : "Share link",
     "The public link will expire no later than {days} days after it is created" : "The public link will expire no later than {days} days after it is created",
     "Link" : "Link",
@@ -129,7 +128,6 @@
     "_download %n file_::_download %n files_" : ["download %n file","download %n files"],
     "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.",
     "Please reload the page." : "Please reload the page.",
-    "The update was unsuccessful. " : "The update was unsuccessful. ",
     "The update was successful. Redirecting you to ownCloud now." : "The update was successful. Redirecting you to ownCloud now.",
     "Couldn't reset password because the token is invalid" : "Couldn't reset password because the token is invalid",
     "Couldn't send reset email. Please make sure your username is correct." : "Couldn't send reset email. Please make sure your username is correct.",
@@ -174,7 +172,6 @@
     "File: %s" : "File: %s",
     "Line: %s" : "Line: %s",
     "Trace" : "Trace",
-    "Security Warning" : "Security Warning",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
     "Create an <strong>admin account</strong>" : "Create an <strong>admin account</strong>",
@@ -188,7 +185,6 @@
     "Database name" : "Database name",
     "Database tablespace" : "Database tablespace",
     "Database host" : "Database host",
-    "Performance Warning" : "Performance Warning",
     "SQLite will be used as database." : "SQLite will be used as database.",
     "For larger installations we recommend to choose a different database backend." : "For larger installations we recommend to choose a different database backend.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especially when using the desktop client for file syncing, the use of SQLite is discouraged.",
diff --git a/core/l10n/eo.js b/core/l10n/eo.js
index 96525cb5723..384c60388e0 100644
--- a/core/l10n/eo.js
+++ b/core/l10n/eo.js
@@ -50,7 +50,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Eraro dum ŝanĝo de permesoj",
     "Shared with you and the group {group} by {owner}" : "Kunhavigita kun vi kaj la grupo {group} de {owner}",
     "Shared with you by {owner}" : "Kunhavigita kun vi de {owner}",
-    "Share with user or group …" : "Kunhavigi kun uzanto aŭ grupo...",
     "Share link" : "Konhavigi ligilon",
     "Password protect" : "Protekti per pasvorto",
     "Password" : "Pasvorto",
@@ -97,7 +96,6 @@ OC.L10N.register(
     "Error tagging" : "Eraris etikedado",
     "Error untagging" : "Eraris maletikedado",
     "Access forbidden" : "Aliro estas malpermesata",
-    "Security Warning" : "Sekureca averto",
     "Create an <strong>admin account</strong>" : "Krei <strong>administran konton</strong>",
     "Username" : "Uzantonomo",
     "Data folder" : "Datuma dosierujo",
diff --git a/core/l10n/eo.json b/core/l10n/eo.json
index 4eaa7845ef3..ac1d5fdb05f 100644
--- a/core/l10n/eo.json
+++ b/core/l10n/eo.json
@@ -48,7 +48,6 @@
     "Error while changing permissions" : "Eraro dum ŝanĝo de permesoj",
     "Shared with you and the group {group} by {owner}" : "Kunhavigita kun vi kaj la grupo {group} de {owner}",
     "Shared with you by {owner}" : "Kunhavigita kun vi de {owner}",
-    "Share with user or group …" : "Kunhavigi kun uzanto aŭ grupo...",
     "Share link" : "Konhavigi ligilon",
     "Password protect" : "Protekti per pasvorto",
     "Password" : "Pasvorto",
@@ -95,7 +94,6 @@
     "Error tagging" : "Eraris etikedado",
     "Error untagging" : "Eraris maletikedado",
     "Access forbidden" : "Aliro estas malpermesata",
-    "Security Warning" : "Sekureca averto",
     "Create an <strong>admin account</strong>" : "Krei <strong>administran konton</strong>",
     "Username" : "Uzantonomo",
     "Data folder" : "Datuma dosierujo",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index 5d11b85b70b..0227320a4d4 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -72,7 +72,6 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Este servidor no tiene una conexión a Internet. Esto significa que algunas de las características como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones o instalación de aplicaciones de terceros no funcionan. Podría no funcionar el acceso a los archivos de forma remota y el envío de correos electrónicos de notificación. Sugerimos habilitar la conexión a Internet de este servidor, si quiere tener todas las funciones.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Su directorio de datos y sus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "La memoria de caché no ha sido configurada. Para aumentar la performance por favor configure el módulo \"memcache\" si está disponible. Encontrará más información en <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\"> nuestra documentación</a>.",
     "Error occurred while checking server setup" : "Ha ocurrido un error al revisar la configuración del servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "La \"{header}\" cabecera HTTP no está configurado para ser igual a \"{expected}\". Esto puede suponer un riesgo para la seguridad o la privacidad, por lo que se recomienda ajustar esta opción.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "La \"Strict-Transport-Security\" Cabecera HTTP no está configurada a al menos \"2,678,400\" segundos. Esto es un riesgo potencial de seguridad y debe ajustar esta opción.",
@@ -86,7 +85,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Error al cambiar permisos",
     "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido contigo por {owner}",
-    "Share with user or group …" : "Compartido con el usuario o con el grupo ...",
     "Share link" : "Enlace compartido",
     "The public link will expire no later than {days} days after it is created" : "El vínculo público no expirará antes de {days} desde que se creó",
     "Link" : "Enlace",
@@ -133,7 +131,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["descargar %n ficheros","descargar %n ficheros"],
     "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a la versión {version}. Esto puede tardar un poco.",
     "Please reload the page." : "Recargue/Actualice la página",
-    "The update was unsuccessful. " : "La actualización ha fallado.",
     "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
     "Couldn't reset password because the token is invalid" : "No se puede restablecer la contraseña porque el vale de identificación es inválido.",
     "Couldn't send reset email. Please make sure your username is correct." : "No se pudo enviar el correo electrónico para el restablecimiento. Por favor, asegúrese de que su nombre de usuario es el correcto.",
@@ -178,7 +175,6 @@ OC.L10N.register(
     "File: %s" : "Archivo: %s",
     "Line: %s" : "Línea: %s",
     "Trace" : "Trazas",
-    "Security Warning" : "Advertencia de seguridad",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
@@ -192,7 +188,6 @@ OC.L10N.register(
     "Database name" : "Nombre de la base de datos",
     "Database tablespace" : "Espacio de tablas de la base de datos",
     "Database host" : "Host de la base de datos",
-    "Performance Warning" : "Advertencia de rendimiento",
     "SQLite will be used as database." : "Se utilizará SQLite como base de datos.",
     "For larger installations we recommend to choose a different database backend." : "Para grandes instalaciones recomendamos seleccionar una base de datos diferente",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite esta desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index 478621bfed6..6216c17f014 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -70,7 +70,6 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Este servidor no tiene una conexión a Internet. Esto significa que algunas de las características como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones o instalación de aplicaciones de terceros no funcionan. Podría no funcionar el acceso a los archivos de forma remota y el envío de correos electrónicos de notificación. Sugerimos habilitar la conexión a Internet de este servidor, si quiere tener todas las funciones.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Su directorio de datos y sus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "La memoria de caché no ha sido configurada. Para aumentar la performance por favor configure el módulo \"memcache\" si está disponible. Encontrará más información en <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\"> nuestra documentación</a>.",
     "Error occurred while checking server setup" : "Ha ocurrido un error al revisar la configuración del servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "La \"{header}\" cabecera HTTP no está configurado para ser igual a \"{expected}\". Esto puede suponer un riesgo para la seguridad o la privacidad, por lo que se recomienda ajustar esta opción.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "La \"Strict-Transport-Security\" Cabecera HTTP no está configurada a al menos \"2,678,400\" segundos. Esto es un riesgo potencial de seguridad y debe ajustar esta opción.",
@@ -84,7 +83,6 @@
     "Error while changing permissions" : "Error al cambiar permisos",
     "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido contigo por {owner}",
-    "Share with user or group …" : "Compartido con el usuario o con el grupo ...",
     "Share link" : "Enlace compartido",
     "The public link will expire no later than {days} days after it is created" : "El vínculo público no expirará antes de {days} desde que se creó",
     "Link" : "Enlace",
@@ -131,7 +129,6 @@
     "_download %n file_::_download %n files_" : ["descargar %n ficheros","descargar %n ficheros"],
     "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a la versión {version}. Esto puede tardar un poco.",
     "Please reload the page." : "Recargue/Actualice la página",
-    "The update was unsuccessful. " : "La actualización ha fallado.",
     "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
     "Couldn't reset password because the token is invalid" : "No se puede restablecer la contraseña porque el vale de identificación es inválido.",
     "Couldn't send reset email. Please make sure your username is correct." : "No se pudo enviar el correo electrónico para el restablecimiento. Por favor, asegúrese de que su nombre de usuario es el correcto.",
@@ -176,7 +173,6 @@
     "File: %s" : "Archivo: %s",
     "Line: %s" : "Línea: %s",
     "Trace" : "Trazas",
-    "Security Warning" : "Advertencia de seguridad",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
@@ -190,7 +186,6 @@
     "Database name" : "Nombre de la base de datos",
     "Database tablespace" : "Espacio de tablas de la base de datos",
     "Database host" : "Host de la base de datos",
-    "Performance Warning" : "Advertencia de rendimiento",
     "SQLite will be used as database." : "Se utilizará SQLite como base de datos.",
     "For larger installations we recommend to choose a different database backend." : "Para grandes instalaciones recomendamos seleccionar una base de datos diferente",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite esta desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.",
diff --git a/core/l10n/es_AR.js b/core/l10n/es_AR.js
index 2707d446766..34de8d1bddf 100644
--- a/core/l10n/es_AR.js
+++ b/core/l10n/es_AR.js
@@ -60,7 +60,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Error al cambiar permisos",
     "Shared with you and the group {group} by {owner}" : "Compartido con vos y el grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido con vos por {owner}",
-    "Share with user or group …" : "Compartir con usuario o grupo ...",
     "Share link" : "Compartir vínculo",
     "Password protect" : "Proteger con contraseña ",
     "Password" : "Contraseña",
@@ -114,7 +113,6 @@ OC.L10N.register(
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "¡Hola!\n\nsólo te quería decir que %s acaba de compartir %s contigo.\nVerlo: %s\n\n",
     "The share will expire on %s." : "El compartir expirará en %s.",
     "Cheers!" : "¡Saludos!",
-    "Security Warning" : "Advertencia de seguridad",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
diff --git a/core/l10n/es_AR.json b/core/l10n/es_AR.json
index f995dbbb8b7..e6b66145b56 100644
--- a/core/l10n/es_AR.json
+++ b/core/l10n/es_AR.json
@@ -58,7 +58,6 @@
     "Error while changing permissions" : "Error al cambiar permisos",
     "Shared with you and the group {group} by {owner}" : "Compartido con vos y el grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido con vos por {owner}",
-    "Share with user or group …" : "Compartir con usuario o grupo ...",
     "Share link" : "Compartir vínculo",
     "Password protect" : "Proteger con contraseña ",
     "Password" : "Contraseña",
@@ -112,7 +111,6 @@
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "¡Hola!\n\nsólo te quería decir que %s acaba de compartir %s contigo.\nVerlo: %s\n\n",
     "The share will expire on %s." : "El compartir expirará en %s.",
     "Cheers!" : "¡Saludos!",
-    "Security Warning" : "Advertencia de seguridad",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
diff --git a/core/l10n/es_MX.js b/core/l10n/es_MX.js
index 16f55486397..12c213409d6 100644
--- a/core/l10n/es_MX.js
+++ b/core/l10n/es_MX.js
@@ -54,7 +54,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Error al cambiar permisos",
     "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido contigo por {owner}",
-    "Share with user or group …" : "Compartido con el usuario o con el grupo …",
     "Share link" : "Enlace compartido",
     "Password protect" : "Protección con contraseña",
     "Password" : "Contraseña",
@@ -108,7 +107,6 @@ OC.L10N.register(
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hola:\n\nTan solo queremos informarte que %s compartió %s contigo.\nMíralo aquí: %s\n\n",
     "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
     "Cheers!" : "¡Saludos!",
-    "Security Warning" : "Advertencia de seguridad",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
diff --git a/core/l10n/es_MX.json b/core/l10n/es_MX.json
index 4f7ce4d2612..9261effe9aa 100644
--- a/core/l10n/es_MX.json
+++ b/core/l10n/es_MX.json
@@ -52,7 +52,6 @@
     "Error while changing permissions" : "Error al cambiar permisos",
     "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido contigo por {owner}",
-    "Share with user or group …" : "Compartido con el usuario o con el grupo …",
     "Share link" : "Enlace compartido",
     "Password protect" : "Protección con contraseña",
     "Password" : "Contraseña",
@@ -106,7 +105,6 @@
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hola:\n\nTan solo queremos informarte que %s compartió %s contigo.\nMíralo aquí: %s\n\n",
     "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
     "Cheers!" : "¡Saludos!",
-    "Security Warning" : "Advertencia de seguridad",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index 28fa21902f3..e4acdc2bf65 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -71,7 +71,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Viga õiguste muutmisel",
     "Shared with you and the group {group} by {owner}" : "Jagatud sinu ja {group} grupiga {owner} poolt",
     "Shared with you by {owner}" : "Sinuga jagas {owner}",
-    "Share with user or group …" : "Jaga kasutaja või grupiga ...",
     "Share link" : "Jaga linki",
     "The public link will expire no later than {days} days after it is created" : "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
     "Password protect" : "Parooliga kaitstud",
@@ -153,7 +152,6 @@ OC.L10N.register(
     "File: %s" : "Fail: %s",
     "Line: %s" : "Rida: %s",
     "Trace" : "Jälita",
-    "Security Warning" : "Turvahoiatus",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
     "Create an <strong>admin account</strong>" : "Loo <strong>admini konto</strong>",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index e1f66362a17..f4d2dce4435 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -69,7 +69,6 @@
     "Error while changing permissions" : "Viga õiguste muutmisel",
     "Shared with you and the group {group} by {owner}" : "Jagatud sinu ja {group} grupiga {owner} poolt",
     "Shared with you by {owner}" : "Sinuga jagas {owner}",
-    "Share with user or group …" : "Jaga kasutaja või grupiga ...",
     "Share link" : "Jaga linki",
     "The public link will expire no later than {days} days after it is created" : "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
     "Password protect" : "Parooliga kaitstud",
@@ -151,7 +150,6 @@
     "File: %s" : "Fail: %s",
     "Line: %s" : "Rida: %s",
     "Trace" : "Jälita",
-    "Security Warning" : "Turvahoiatus",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
     "Create an <strong>admin account</strong>" : "Loo <strong>admini konto</strong>",
diff --git a/core/l10n/eu.js b/core/l10n/eu.js
index fd7a046fed9..92a412d41bd 100644
--- a/core/l10n/eu.js
+++ b/core/l10n/eu.js
@@ -72,7 +72,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Errore bat egon da baimenak aldatzean",
     "Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin elkarbanatuta",
     "Shared with you by {owner}" : "{owner}-k zurekin elkarbanatuta",
-    "Share with user or group …" : "Elkarbanatu erabiltzaile edo taldearekin...",
     "Share link" : "Elkarbanatu lotura",
     "The public link will expire no later than {days} days after it is created" : "Esteka publikoak iraungi egingo du, askoz jota, sortu eta  {days} egunetara.",
     "Link" : "Esteka",
@@ -119,7 +118,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["%n fitxategia jaitsi","jaitsi %n fitxategiak"],
     "Updating {productName} to version {version}, this may take a while." : "Eguneratu  {productName} {version} bertsiora, bere denbora behar du.",
     "Please reload the page." : "Mesedez birkargatu orria.",
-    "The update was unsuccessful. " : "Eguneraketa ongi burutu da.",
     "The update was successful. Redirecting you to ownCloud now." : "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
     "Couldn't reset password because the token is invalid" : "Ezin izan da pasahitza berrezarri tokena baliogabea delako",
     "Couldn't send reset email. Please make sure your username is correct." : "Ezin izan da berrezartzeko eposta bidali. Ziurtatu zure erabiltzaile izena egokia dela.",
@@ -163,7 +161,6 @@ OC.L10N.register(
     "File: %s" : "Fitxategia: %s",
     "Line: %s" : "Lerroa: %s",
     "Trace" : "Arrastoa",
-    "Security Warning" : "Segurtasun abisua",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
     "Create an <strong>admin account</strong>" : "Sortu <strong>kudeatzaile kontu<strong> bat",
diff --git a/core/l10n/eu.json b/core/l10n/eu.json
index edeea587f5f..3ebe821ddc0 100644
--- a/core/l10n/eu.json
+++ b/core/l10n/eu.json
@@ -70,7 +70,6 @@
     "Error while changing permissions" : "Errore bat egon da baimenak aldatzean",
     "Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin elkarbanatuta",
     "Shared with you by {owner}" : "{owner}-k zurekin elkarbanatuta",
-    "Share with user or group …" : "Elkarbanatu erabiltzaile edo taldearekin...",
     "Share link" : "Elkarbanatu lotura",
     "The public link will expire no later than {days} days after it is created" : "Esteka publikoak iraungi egingo du, askoz jota, sortu eta  {days} egunetara.",
     "Link" : "Esteka",
@@ -117,7 +116,6 @@
     "_download %n file_::_download %n files_" : ["%n fitxategia jaitsi","jaitsi %n fitxategiak"],
     "Updating {productName} to version {version}, this may take a while." : "Eguneratu  {productName} {version} bertsiora, bere denbora behar du.",
     "Please reload the page." : "Mesedez birkargatu orria.",
-    "The update was unsuccessful. " : "Eguneraketa ongi burutu da.",
     "The update was successful. Redirecting you to ownCloud now." : "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
     "Couldn't reset password because the token is invalid" : "Ezin izan da pasahitza berrezarri tokena baliogabea delako",
     "Couldn't send reset email. Please make sure your username is correct." : "Ezin izan da berrezartzeko eposta bidali. Ziurtatu zure erabiltzaile izena egokia dela.",
@@ -161,7 +159,6 @@
     "File: %s" : "Fitxategia: %s",
     "Line: %s" : "Lerroa: %s",
     "Trace" : "Arrastoa",
-    "Security Warning" : "Segurtasun abisua",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
     "Create an <strong>admin account</strong>" : "Sortu <strong>kudeatzaile kontu<strong> bat",
diff --git a/core/l10n/fa.js b/core/l10n/fa.js
index cc4de38d724..a454ba75ee0 100644
--- a/core/l10n/fa.js
+++ b/core/l10n/fa.js
@@ -63,7 +63,6 @@ OC.L10N.register(
     "Error while changing permissions" : "خطا در حال تغییر مجوز",
     "Shared with you and the group {group} by {owner}" : "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
     "Shared with you by {owner}" : "به اشتراک گذاشته شده با شما توسط { دارنده}",
-    "Share with user or group …" : "به اشتراک گذاری با کاربر یا گروه",
     "Share link" : "اشتراک گذاشتن لینک",
     "Password protect" : "نگهداری کردن رمز عبور",
     "Password" : "گذرواژه",
@@ -111,7 +110,6 @@ OC.L10N.register(
     "Error unfavoriting" : "خطا هنگام حذف از موارد محبوب",
     "Access forbidden" : "اجازه دسترسی به مناطق ممنوعه را ندارید",
     "Cheers!" : "سلامتی!",
-    "Security Warning" : "اخطار امنیتی",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.",
     "Create an <strong>admin account</strong>" : "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
     "Username" : "نام کاربری",
diff --git a/core/l10n/fa.json b/core/l10n/fa.json
index f83b75a5eae..d7e58ef43ed 100644
--- a/core/l10n/fa.json
+++ b/core/l10n/fa.json
@@ -61,7 +61,6 @@
     "Error while changing permissions" : "خطا در حال تغییر مجوز",
     "Shared with you and the group {group} by {owner}" : "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
     "Shared with you by {owner}" : "به اشتراک گذاشته شده با شما توسط { دارنده}",
-    "Share with user or group …" : "به اشتراک گذاری با کاربر یا گروه",
     "Share link" : "اشتراک گذاشتن لینک",
     "Password protect" : "نگهداری کردن رمز عبور",
     "Password" : "گذرواژه",
@@ -109,7 +108,6 @@
     "Error unfavoriting" : "خطا هنگام حذف از موارد محبوب",
     "Access forbidden" : "اجازه دسترسی به مناطق ممنوعه را ندارید",
     "Cheers!" : "سلامتی!",
-    "Security Warning" : "اخطار امنیتی",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.",
     "Create an <strong>admin account</strong>" : "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
     "Username" : "نام کاربری",
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index 2676f4a8c62..6b055007e7d 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -72,7 +72,7 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "HTTP-palvelinta ei ole määritetty oikein tiedostojen synkronointia varten, koska WebDAV-liittymä vaikuttaa olevan rikki.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Tällä palvelimella ei ole toimivaa internetyhteyttä. Sen seurauksena jotkin ominaisuudet, kuten erillinen tallennustila, ilmoitukset päivityksistä ja kolmansien osapuolten sovellusten asennus eivät toimi. Tiedostojen käyttö etänä tai ilmoitusten lähetys sähköpostitse eivät välttämättä toimi myöskään. Suosittelemme kytkemään palvelimen internetyhteyteen, jos haluat käyttää kaikkia ownCloudin ominaisuuksia.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datahakemistosi ja tiedostosi ovat luultavasti käytettävissä suoraan internetistä. .htaccess-tiedosto ei toimi oikein. Suosittelemme määrittämään http-palvelimen asetukset siten, ettei datahakemisto ole suoraan käytettävissä internetistä, tai siirtämään datahakemiston http-palvelimen juurihakemiston ulkopuolelle.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Muisti-cachea ei ole määritetty. Paranna suorituskykyä ottamalla memcache käyttöön. Lisätietoja on tarjolla <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">ownCloud-dokumentaatiossa</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Muistissa toimivaa cachea ei ole määritetty. Paranna suorituskykyä ottamalla memcache käyttöön. Lisätietoja on saatavilla <a href=\"{docLink}\">dokumentaatiosta</a>.",
     "Error occurred while checking server setup" : "Virhe palvelimen määrityksiä tarkistaessa",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-otsaketta \"{header}\" ei ole määritetty vastaamaan arvoa \"{expected}\". Kyseessä on mahdollinen tietoturvaan tai -suojaan liittyvä riski, joten suosittelemme muuttamaan asetuksen arvoa.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "HTTP-otsaketta \"Strict-Transport-Security\" ei ole määritetty vähintään \"2,678,400\" sekuntiin. Tämä on mahdollinen tietoturvariski, joten suosittelemme kyseisen asetuksen muuttamista.",
@@ -86,7 +86,9 @@ OC.L10N.register(
     "Error while changing permissions" : "Virhe oikeuksia muuttaessa",
     "Shared with you and the group {group} by {owner}" : "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta",
     "Shared with you by {owner}" : "Jaettu kanssasi käyttäjän {owner} toimesta",
-    "Share with user or group …" : "Jaa käyttäjän tai ryhmän kanssa…",
+    "Share with users or groups …" : "Jaa käyttäjien tai ryhmien kanssa…",
+    "Share with users, groups or remote users …" : "Jaa käyttäjien, ryhmien tai etäkäyttäjien kanssa…",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Jaa toisia ownCloud-järjestelmiä käyttävien kesken käyttäen syntaksia käyttäjätunnus@esimerkki.fi/owncloud",
     "Share link" : "Jaa linkki",
     "The public link will expire no later than {days} days after it is created" : "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
     "Link" : "Linkki",
@@ -99,6 +101,7 @@ OC.L10N.register(
     "Set expiration date" : "Aseta päättymispäivä",
     "Expiration" : "Erääntyminen",
     "Expiration date" : "Päättymispäivä",
+    "An error occured. Please try again" : "Tapahtui virhe. Yritä myöhemmin uudestaan",
     "Adding user..." : "Lisätään käyttäjä...",
     "group" : "ryhmä",
     "remote" : "etä",
@@ -133,7 +136,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["lataa %n tiedosto","lataa %n tiedostoa"],
     "Updating {productName} to version {version}, this may take a while." : "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.",
     "Please reload the page." : "Päivitä sivu.",
-    "The update was unsuccessful. " : "Päivitys epäonnistui.",
     "The update was successful. Redirecting you to ownCloud now." : "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
     "Couldn't reset password because the token is invalid" : "Salasanaa ei voitu palauttaa koska valtuutus on virheellinen",
     "Couldn't send reset email. Please make sure your username is correct." : "Palautussähköpostin lähettäminen ei onnistunut. Varmista, että käyttäjätunnuksesi on oikein.",
@@ -178,7 +180,7 @@ OC.L10N.register(
     "File: %s" : "Tiedosto: %s",
     "Line: %s" : "Rivi: %s",
     "Trace" : "Jälki",
-    "Security Warning" : "Turvallisuusvaroitus",
+    "Security warning" : "Turvallisuusvaroitus",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
     "Create an <strong>admin account</strong>" : "Luo <strong>ylläpitäjän tunnus</strong>",
@@ -192,18 +194,22 @@ OC.L10N.register(
     "Database name" : "Tietokannan nimi",
     "Database tablespace" : "Tietokannan taulukkotila",
     "Database host" : "Tietokantapalvelin",
-    "Performance Warning" : "Suorituskykyvaroitus",
+    "Performance warning" : "Suorituskykyvaroitus",
     "SQLite will be used as database." : "SQLitea käytetään tietokantana.",
     "For larger installations we recommend to choose a different database backend." : "Suuria asennuksia varten suositellaan muun tietokannan käyttöä.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Varsinkin työpöytäsovelluksen tiedostosynkronointia käyttäessä SQLiten käyttö ei ole suositeltavaa.",
     "Finish setup" : "Viimeistele asennus",
     "Finishing …" : "Valmistellaan…",
+    "Need help?" : "Tarvitsetko apua?",
+    "See the documentation" : "Tutustu dokumentaatioon",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Tämä sovellus vaatii toimiakseen JavaScript-tuen. {linkstart}Ota JavaScript käyttöön{linkend} ja päivitä sivu.",
     "%s is available. Get more information on how to update." : "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
     "Log out" : "Kirjaudu ulos",
     "Search" : "Etsi",
     "Server side authentication failed!" : "Palvelimen puoleinen tunnistautuminen epäonnistui!",
     "Please contact your administrator." : "Ota yhteys ylläpitäjään.",
+    "An internal error occured." : "Tapahtui sisäinen virhe.",
+    "Please try again or contact your administrator." : "Yritä uudestaan tai ota yhteys ylläpitäjään.",
     "Forgot your password? Reset it!" : "Unohditko salasanasi? Palauta se!",
     "remember" : "muista",
     "Log in" : "Kirjaudu sisään",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index 6e3737c8904..56e35dd186b 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -70,7 +70,7 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "HTTP-palvelinta ei ole määritetty oikein tiedostojen synkronointia varten, koska WebDAV-liittymä vaikuttaa olevan rikki.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Tällä palvelimella ei ole toimivaa internetyhteyttä. Sen seurauksena jotkin ominaisuudet, kuten erillinen tallennustila, ilmoitukset päivityksistä ja kolmansien osapuolten sovellusten asennus eivät toimi. Tiedostojen käyttö etänä tai ilmoitusten lähetys sähköpostitse eivät välttämättä toimi myöskään. Suosittelemme kytkemään palvelimen internetyhteyteen, jos haluat käyttää kaikkia ownCloudin ominaisuuksia.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datahakemistosi ja tiedostosi ovat luultavasti käytettävissä suoraan internetistä. .htaccess-tiedosto ei toimi oikein. Suosittelemme määrittämään http-palvelimen asetukset siten, ettei datahakemisto ole suoraan käytettävissä internetistä, tai siirtämään datahakemiston http-palvelimen juurihakemiston ulkopuolelle.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Muisti-cachea ei ole määritetty. Paranna suorituskykyä ottamalla memcache käyttöön. Lisätietoja on tarjolla <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">ownCloud-dokumentaatiossa</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Muistissa toimivaa cachea ei ole määritetty. Paranna suorituskykyä ottamalla memcache käyttöön. Lisätietoja on saatavilla <a href=\"{docLink}\">dokumentaatiosta</a>.",
     "Error occurred while checking server setup" : "Virhe palvelimen määrityksiä tarkistaessa",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-otsaketta \"{header}\" ei ole määritetty vastaamaan arvoa \"{expected}\". Kyseessä on mahdollinen tietoturvaan tai -suojaan liittyvä riski, joten suosittelemme muuttamaan asetuksen arvoa.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "HTTP-otsaketta \"Strict-Transport-Security\" ei ole määritetty vähintään \"2,678,400\" sekuntiin. Tämä on mahdollinen tietoturvariski, joten suosittelemme kyseisen asetuksen muuttamista.",
@@ -84,7 +84,9 @@
     "Error while changing permissions" : "Virhe oikeuksia muuttaessa",
     "Shared with you and the group {group} by {owner}" : "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta",
     "Shared with you by {owner}" : "Jaettu kanssasi käyttäjän {owner} toimesta",
-    "Share with user or group …" : "Jaa käyttäjän tai ryhmän kanssa…",
+    "Share with users or groups …" : "Jaa käyttäjien tai ryhmien kanssa…",
+    "Share with users, groups or remote users …" : "Jaa käyttäjien, ryhmien tai etäkäyttäjien kanssa…",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Jaa toisia ownCloud-järjestelmiä käyttävien kesken käyttäen syntaksia käyttäjätunnus@esimerkki.fi/owncloud",
     "Share link" : "Jaa linkki",
     "The public link will expire no later than {days} days after it is created" : "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
     "Link" : "Linkki",
@@ -97,6 +99,7 @@
     "Set expiration date" : "Aseta päättymispäivä",
     "Expiration" : "Erääntyminen",
     "Expiration date" : "Päättymispäivä",
+    "An error occured. Please try again" : "Tapahtui virhe. Yritä myöhemmin uudestaan",
     "Adding user..." : "Lisätään käyttäjä...",
     "group" : "ryhmä",
     "remote" : "etä",
@@ -131,7 +134,6 @@
     "_download %n file_::_download %n files_" : ["lataa %n tiedosto","lataa %n tiedostoa"],
     "Updating {productName} to version {version}, this may take a while." : "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.",
     "Please reload the page." : "Päivitä sivu.",
-    "The update was unsuccessful. " : "Päivitys epäonnistui.",
     "The update was successful. Redirecting you to ownCloud now." : "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
     "Couldn't reset password because the token is invalid" : "Salasanaa ei voitu palauttaa koska valtuutus on virheellinen",
     "Couldn't send reset email. Please make sure your username is correct." : "Palautussähköpostin lähettäminen ei onnistunut. Varmista, että käyttäjätunnuksesi on oikein.",
@@ -176,7 +178,7 @@
     "File: %s" : "Tiedosto: %s",
     "Line: %s" : "Rivi: %s",
     "Trace" : "Jälki",
-    "Security Warning" : "Turvallisuusvaroitus",
+    "Security warning" : "Turvallisuusvaroitus",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
     "Create an <strong>admin account</strong>" : "Luo <strong>ylläpitäjän tunnus</strong>",
@@ -190,18 +192,22 @@
     "Database name" : "Tietokannan nimi",
     "Database tablespace" : "Tietokannan taulukkotila",
     "Database host" : "Tietokantapalvelin",
-    "Performance Warning" : "Suorituskykyvaroitus",
+    "Performance warning" : "Suorituskykyvaroitus",
     "SQLite will be used as database." : "SQLitea käytetään tietokantana.",
     "For larger installations we recommend to choose a different database backend." : "Suuria asennuksia varten suositellaan muun tietokannan käyttöä.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Varsinkin työpöytäsovelluksen tiedostosynkronointia käyttäessä SQLiten käyttö ei ole suositeltavaa.",
     "Finish setup" : "Viimeistele asennus",
     "Finishing …" : "Valmistellaan…",
+    "Need help?" : "Tarvitsetko apua?",
+    "See the documentation" : "Tutustu dokumentaatioon",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Tämä sovellus vaatii toimiakseen JavaScript-tuen. {linkstart}Ota JavaScript käyttöön{linkend} ja päivitä sivu.",
     "%s is available. Get more information on how to update." : "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
     "Log out" : "Kirjaudu ulos",
     "Search" : "Etsi",
     "Server side authentication failed!" : "Palvelimen puoleinen tunnistautuminen epäonnistui!",
     "Please contact your administrator." : "Ota yhteys ylläpitäjään.",
+    "An internal error occured." : "Tapahtui sisäinen virhe.",
+    "Please try again or contact your administrator." : "Yritä uudestaan tai ota yhteys ylläpitäjään.",
     "Forgot your password? Reset it!" : "Unohditko salasanasi? Palauta se!",
     "remember" : "muista",
     "Log in" : "Kirjaudu sisään",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 878a795b00a..2fc56125218 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -72,7 +72,7 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Votre serveur web n'est pas correctement configuré pour permettre la synchronisation de fichiers : l'interface WebDAV semble ne pas fonctionner.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mails ne seront pas fonctionnels également. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou bien de le déplacer à l'extérieur de la racine du serveur web.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Aucun cache de la mémoire n'est configuré. Si possible, configurez un \"memcache\" pour augmenter les performances. Pour plus d'information consultez la <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Aucun cache de la mémoire n'est configuré. Si possible, configurez un \"memcache\" pour augmenter les performances. Pour plus d'information consultez la <a href=\"{docLink}\">documentation</a>.",
     "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\" créant potentiellement un risque relié à la sécurité et à la vie privée. Il est donc recommandé d'ajuster ce paramètre.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée pour durer \"2,678,400\" secondes. C'est un risque de sécurité potentiel et il est donc recommandé d'ajuster ce paramètre.",
@@ -86,7 +86,9 @@ OC.L10N.register(
     "Error while changing permissions" : "Erreur lors du changement des permissions",
     "Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}",
     "Shared with you by {owner}" : "Partagé avec vous par {owner}",
-    "Share with user or group …" : "Partager avec un utilisateur ou un groupe...",
+    "Share with users or groups …" : "Partager avec des utilisateurs ou un groupes...",
+    "Share with users, groups or remote users …" : "Partager avec des utilisateurs, groupes, ou utilisateurs distants",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partagez avec des personnes sur d'autres ownClouds en utilisant la syntaxe utilisateur@exemple.com/owncloud",
     "Share link" : "Partager par lien public",
     "The public link will expire no later than {days} days after it is created" : "Ce lien public expirera au plus tard {days} jours après sa création.",
     "Link" : "Lien",
@@ -99,6 +101,7 @@ OC.L10N.register(
     "Set expiration date" : "Spécifier une date d'expiration",
     "Expiration" : "Expiration",
     "Expiration date" : "Date d'expiration",
+    "An error occured. Please try again" : "Une erreur est survenue. Merci de réessayer",
     "Adding user..." : "Ajout de l'utilisateur...",
     "group" : "groupe",
     "remote" : "distant",
@@ -133,8 +136,7 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["Télécharger %n fichier","Télécharger %n fichiers"],
     "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
     "Please reload the page." : "Veuillez recharger la page.",
-    "The update was unsuccessful. " : "La mise à jour a échoué.",
-    "The update was successful. Redirecting you to ownCloud now." : "La mise à jour a réussi. Vous êtes maintenant redirigé(e) vers ownCloud.",
+    "The update was successful. Redirecting you to ownCloud now." : "La mise à jour a réussi. Vous êtes maintenant redirigé vers ownCloud.",
     "Couldn't reset password because the token is invalid" : "Impossible de réinitialiser le mot de passe car le jeton n'est pas valable.",
     "Couldn't send reset email. Please make sure your username is correct." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez vérifier que votre nom d'utilisateur est correct.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation car il n'y a aucune adresse de courriel pour cet utilisateur. Veuillez contacter votre administrateur.",
@@ -145,7 +147,7 @@ OC.L10N.register(
     "Reset password" : "Réinitialiser le mot de passe",
     "Searching other places" : "Recherche en cours dans d'autres emplacements",
     "No search result in other places" : "Aucun résultat dans d'autres emplacements",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} résultat de recherche dans d'autres lieux","{count} résultats de recherche dans d'autres emplacements"],
+    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} résultat dans d'autres emplacements","{count} résultats dans d'autres emplacements"],
     "Personal" : "Personnel",
     "Users" : "Utilisateurs",
     "Apps" : "Applications",
@@ -178,7 +180,7 @@ OC.L10N.register(
     "File: %s" : "Fichier : %s",
     "Line: %s" : "Ligne : %s",
     "Trace" : "Trace",
-    "Security Warning" : "Avertissement de sécurité",
+    "Security warning" : "Avertissement de sécurité",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Votre répertoire de données est certainement accessible depuis l'internet car le fichier .htaccess ne fonctionne pas.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
     "Create an <strong>admin account</strong>" : "Créer un <strong>compte administrateur</strong>",
@@ -192,18 +194,22 @@ OC.L10N.register(
     "Database name" : "Nom de la base de données",
     "Database tablespace" : "Tablespace de la base de données",
     "Database host" : "Hôte de la base de données",
-    "Performance Warning" : "Avertissement de performance",
+    "Performance warning" : "Avertissement de performance",
     "SQLite will be used as database." : "SQLite sera utilisé comme gestionnaire de base de données.",
     "For larger installations we recommend to choose a different database backend." : "Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "En particulier si vous utilisez le client de bureau pour synchroniser vos données : l'utilisation de SQLite est alors déconseillée.",
     "Finish setup" : "Terminer l'installation",
     "Finishing …" : "Finalisation …",
+    "Need help?" : "Besoin d'aide?",
+    "See the documentation" : "Lire la documentation",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Cette application requiert JavaScript pour fonctionner correctement. Veuillez {linkstart}activer JavaScript{linkend} et recharger la page.",
     "%s is available. Get more information on how to update." : "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour.",
     "Log out" : "Se déconnecter",
     "Search" : "Rechercher",
     "Server side authentication failed!" : "L'authentification sur le serveur a échoué !",
     "Please contact your administrator." : "Veuillez contacter votre administrateur.",
+    "An internal error occured." : "Un erreur interne est survenue.",
+    "Please try again or contact your administrator." : "Veuillez réessayer ou contacter votre administrateur.",
     "Forgot your password? Reset it!" : "Mot de passe oublié ? Réinitialisez-le !",
     "remember" : "se souvenir de moi",
     "Log in" : "Connexion",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index ce7d7eaf35f..482c9530734 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -70,7 +70,7 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Votre serveur web n'est pas correctement configuré pour permettre la synchronisation de fichiers : l'interface WebDAV semble ne pas fonctionner.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mails ne seront pas fonctionnels également. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou bien de le déplacer à l'extérieur de la racine du serveur web.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Aucun cache de la mémoire n'est configuré. Si possible, configurez un \"memcache\" pour augmenter les performances. Pour plus d'information consultez la <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Aucun cache de la mémoire n'est configuré. Si possible, configurez un \"memcache\" pour augmenter les performances. Pour plus d'information consultez la <a href=\"{docLink}\">documentation</a>.",
     "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\" créant potentiellement un risque relié à la sécurité et à la vie privée. Il est donc recommandé d'ajuster ce paramètre.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée pour durer \"2,678,400\" secondes. C'est un risque de sécurité potentiel et il est donc recommandé d'ajuster ce paramètre.",
@@ -84,7 +84,9 @@
     "Error while changing permissions" : "Erreur lors du changement des permissions",
     "Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}",
     "Shared with you by {owner}" : "Partagé avec vous par {owner}",
-    "Share with user or group …" : "Partager avec un utilisateur ou un groupe...",
+    "Share with users or groups …" : "Partager avec des utilisateurs ou un groupes...",
+    "Share with users, groups or remote users …" : "Partager avec des utilisateurs, groupes, ou utilisateurs distants",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partagez avec des personnes sur d'autres ownClouds en utilisant la syntaxe utilisateur@exemple.com/owncloud",
     "Share link" : "Partager par lien public",
     "The public link will expire no later than {days} days after it is created" : "Ce lien public expirera au plus tard {days} jours après sa création.",
     "Link" : "Lien",
@@ -97,6 +99,7 @@
     "Set expiration date" : "Spécifier une date d'expiration",
     "Expiration" : "Expiration",
     "Expiration date" : "Date d'expiration",
+    "An error occured. Please try again" : "Une erreur est survenue. Merci de réessayer",
     "Adding user..." : "Ajout de l'utilisateur...",
     "group" : "groupe",
     "remote" : "distant",
@@ -131,8 +134,7 @@
     "_download %n file_::_download %n files_" : ["Télécharger %n fichier","Télécharger %n fichiers"],
     "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
     "Please reload the page." : "Veuillez recharger la page.",
-    "The update was unsuccessful. " : "La mise à jour a échoué.",
-    "The update was successful. Redirecting you to ownCloud now." : "La mise à jour a réussi. Vous êtes maintenant redirigé(e) vers ownCloud.",
+    "The update was successful. Redirecting you to ownCloud now." : "La mise à jour a réussi. Vous êtes maintenant redirigé vers ownCloud.",
     "Couldn't reset password because the token is invalid" : "Impossible de réinitialiser le mot de passe car le jeton n'est pas valable.",
     "Couldn't send reset email. Please make sure your username is correct." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez vérifier que votre nom d'utilisateur est correct.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation car il n'y a aucune adresse de courriel pour cet utilisateur. Veuillez contacter votre administrateur.",
@@ -143,7 +145,7 @@
     "Reset password" : "Réinitialiser le mot de passe",
     "Searching other places" : "Recherche en cours dans d'autres emplacements",
     "No search result in other places" : "Aucun résultat dans d'autres emplacements",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} résultat de recherche dans d'autres lieux","{count} résultats de recherche dans d'autres emplacements"],
+    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} résultat dans d'autres emplacements","{count} résultats dans d'autres emplacements"],
     "Personal" : "Personnel",
     "Users" : "Utilisateurs",
     "Apps" : "Applications",
@@ -176,7 +178,7 @@
     "File: %s" : "Fichier : %s",
     "Line: %s" : "Ligne : %s",
     "Trace" : "Trace",
-    "Security Warning" : "Avertissement de sécurité",
+    "Security warning" : "Avertissement de sécurité",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Votre répertoire de données est certainement accessible depuis l'internet car le fichier .htaccess ne fonctionne pas.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
     "Create an <strong>admin account</strong>" : "Créer un <strong>compte administrateur</strong>",
@@ -190,18 +192,22 @@
     "Database name" : "Nom de la base de données",
     "Database tablespace" : "Tablespace de la base de données",
     "Database host" : "Hôte de la base de données",
-    "Performance Warning" : "Avertissement de performance",
+    "Performance warning" : "Avertissement de performance",
     "SQLite will be used as database." : "SQLite sera utilisé comme gestionnaire de base de données.",
     "For larger installations we recommend to choose a different database backend." : "Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "En particulier si vous utilisez le client de bureau pour synchroniser vos données : l'utilisation de SQLite est alors déconseillée.",
     "Finish setup" : "Terminer l'installation",
     "Finishing …" : "Finalisation …",
+    "Need help?" : "Besoin d'aide?",
+    "See the documentation" : "Lire la documentation",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Cette application requiert JavaScript pour fonctionner correctement. Veuillez {linkstart}activer JavaScript{linkend} et recharger la page.",
     "%s is available. Get more information on how to update." : "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour.",
     "Log out" : "Se déconnecter",
     "Search" : "Rechercher",
     "Server side authentication failed!" : "L'authentification sur le serveur a échoué !",
     "Please contact your administrator." : "Veuillez contacter votre administrateur.",
+    "An internal error occured." : "Un erreur interne est survenue.",
+    "Please try again or contact your administrator." : "Veuillez réessayer ou contacter votre administrateur.",
     "Forgot your password? Reset it!" : "Mot de passe oublié ? Réinitialisez-le !",
     "remember" : "se souvenir de moi",
     "Log in" : "Connexion",
diff --git a/core/l10n/gl.js b/core/l10n/gl.js
index 8c4f4b82b5c..bcb19cd0ec5 100644
--- a/core/l10n/gl.js
+++ b/core/l10n/gl.js
@@ -72,7 +72,7 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "O servidor aínda non está configurado correctamente para permitir a sincronización de ficheiros, semella que a interface WebDAV non está a funcionar.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Este servidor non ten conexión activa a Internet. Isto significa que algunhas características como a montaxe do almacenamento externo, as notificacións sobre actualizacións ou a instalación de engadidos de terceiros non funcionarán. Así mesmo,  o acceso remoto a ficheiros e enviar correos de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet para este servidor se quere ter todos estes servizos.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "O directorio de datos e os seus ficheiros probabelmente son accesíbeis desde a Internet. O ficheiro .htaccess non funciona. Recomendámoslle que configure o seu servidor web de xeito que o directorio de datos non sexa accesíbel ou que mova o directorio de datos fora do directorio root do servidor web.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Non foi configurada a memoria cache. Se é posíbel configure un «memcache», se está dispoñíbel, para mellorar o rendemento. Pode atopar máis información na nosa <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentación</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Non foi configurada a memoria cache. Para mellorar o rendemento configure unha «memcache», se está dispoñíbel. Pode atopar máis información na nosa <a href=\"{docLink}\">documentación</a>.",
     "Error occurred while checking server setup" : "Aconteceu un erro mentras se comprobaba a configuración do servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "A cabeceira HTTP «{header}» non está configurada como igual a «{expected}». Isto é un posíbel risco para a seguridade ou a intimidade, recomendámoslle que axuste esta opción.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "A cabeceira HTTP «Strict-Transport-Security» non está configurado para menos de «2,678,400» segundos . Isto é un posíbel risco para a seguridade, recomendámoslle que axuste esta opción.",
@@ -86,7 +86,9 @@ OC.L10N.register(
     "Error while changing permissions" : "Produciuse un erro ao cambiar os permisos",
     "Shared with you and the group {group} by {owner}" : "Compartido con vostede e co grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido con vostede por {owner}",
-    "Share with user or group …" : "Compartir cun usuario ou grupo ...",
+    "Share with users or groups …" : "Compartir con usuarios ou grupos ...",
+    "Share with users, groups or remote users …" : "Compartir con usuarios, grupos ou usuarios remotos ...",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con outra xente ou con outros ownClouds empregando a sintaxe «nomeusuario@exemplo.com/ouwncloud»",
     "Share link" : "Ligazón para compartir",
     "The public link will expire no later than {days} days after it is created" : "A ligazón pública caducará, a máis tardar, {days} días após a súa creación",
     "Link" : "Ligazón",
@@ -99,6 +101,7 @@ OC.L10N.register(
     "Set expiration date" : "Definir a data de caducidade",
     "Expiration" : "Caducidade",
     "Expiration date" : "Data de caducidade",
+    "An error occured. Please try again" : "Produciuse un erro, tenteo de novo",
     "Adding user..." : "Engadindo usuario...",
     "group" : "grupo",
     "remote" : "remoto",
@@ -133,7 +136,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["descargar %n ficheiro","descargar %n ficheiros"],
     "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a versión {version}, isto pode levar un anaco.",
     "Please reload the page." : "Volva cargar a páxina.",
-    "The update was unsuccessful. " : "Fracasou a actualización.",
     "The update was successful. Redirecting you to ownCloud now." : "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
     "Couldn't reset password because the token is invalid" : "No, foi posíbel restabelecer o contrasinal, a marca non é correcta",
     "Couldn't send reset email. Please make sure your username is correct." : "Non foi posíbel enviar o coreo do restablecemento. Asegúrese de que o nome de usuario é o correcto.",
@@ -178,7 +180,7 @@ OC.L10N.register(
     "File: %s" : "Ficheiro: %s",
     "Line: %s" : "Liña: %s",
     "Trace" : "Traza",
-    "Security Warning" : "Aviso de seguranza",
+    "Security warning" : "Aviso de seguridade",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear unha <strong>contra de administrador</strong>",
@@ -192,18 +194,22 @@ OC.L10N.register(
     "Database name" : "Nome da base de datos",
     "Database tablespace" : "Táboa de espazos da base de datos",
     "Database host" : "Servidor da base de datos",
-    "Performance Warning" : "Aviso de rendemento",
+    "Performance warning" : "Aviso de rendemento",
     "SQLite will be used as database." : "Utilizarase SQLite como base de datos",
     "For larger installations we recommend to choose a different database backend." : "Para instalacións grandes, recomendámoslle que empregue unha infraestrutura de base de datos diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Concretamente, se emprega o cliente de escritorio para sincronización, desaconséllase o uso de SQLite.",
     "Finish setup" : "Rematar a configuración",
     "Finishing …" : "Rematando ...",
+    "Need help?" : "Precisa axuda?",
+    "See the documentation" : "Vexa a documentación",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicación require JavaScript para un correcto funcionamento. {linkstart}Active  JavaScript{linkend} e volva cargar a páxina.",
     "%s is available. Get more information on how to update." : "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
     "Log out" : "Desconectar",
     "Search" : "Buscar",
     "Server side authentication failed!" : "A autenticación fracasou do lado do servidor!",
     "Please contact your administrator." : "Contacte co administrador.",
+    "An internal error occured." : "Produciuse un erro interno.",
+    "Please try again or contact your administrator." : "Tenteo de novo ou póñase en contacto co administrador.",
     "Forgot your password? Reset it!" : "Esqueceu o contrasinal? Restabelézao!",
     "remember" : "lembrar",
     "Log in" : "Conectar",
diff --git a/core/l10n/gl.json b/core/l10n/gl.json
index 5a9e5260a6a..1216fe7838c 100644
--- a/core/l10n/gl.json
+++ b/core/l10n/gl.json
@@ -70,7 +70,7 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "O servidor aínda non está configurado correctamente para permitir a sincronización de ficheiros, semella que a interface WebDAV non está a funcionar.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Este servidor non ten conexión activa a Internet. Isto significa que algunhas características como a montaxe do almacenamento externo, as notificacións sobre actualizacións ou a instalación de engadidos de terceiros non funcionarán. Así mesmo,  o acceso remoto a ficheiros e enviar correos de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet para este servidor se quere ter todos estes servizos.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "O directorio de datos e os seus ficheiros probabelmente son accesíbeis desde a Internet. O ficheiro .htaccess non funciona. Recomendámoslle que configure o seu servidor web de xeito que o directorio de datos non sexa accesíbel ou que mova o directorio de datos fora do directorio root do servidor web.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Non foi configurada a memoria cache. Se é posíbel configure un «memcache», se está dispoñíbel, para mellorar o rendemento. Pode atopar máis información na nosa <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentación</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Non foi configurada a memoria cache. Para mellorar o rendemento configure unha «memcache», se está dispoñíbel. Pode atopar máis información na nosa <a href=\"{docLink}\">documentación</a>.",
     "Error occurred while checking server setup" : "Aconteceu un erro mentras se comprobaba a configuración do servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "A cabeceira HTTP «{header}» non está configurada como igual a «{expected}». Isto é un posíbel risco para a seguridade ou a intimidade, recomendámoslle que axuste esta opción.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "A cabeceira HTTP «Strict-Transport-Security» non está configurado para menos de «2,678,400» segundos . Isto é un posíbel risco para a seguridade, recomendámoslle que axuste esta opción.",
@@ -84,7 +84,9 @@
     "Error while changing permissions" : "Produciuse un erro ao cambiar os permisos",
     "Shared with you and the group {group} by {owner}" : "Compartido con vostede e co grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido con vostede por {owner}",
-    "Share with user or group …" : "Compartir cun usuario ou grupo ...",
+    "Share with users or groups …" : "Compartir con usuarios ou grupos ...",
+    "Share with users, groups or remote users …" : "Compartir con usuarios, grupos ou usuarios remotos ...",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con outra xente ou con outros ownClouds empregando a sintaxe «nomeusuario@exemplo.com/ouwncloud»",
     "Share link" : "Ligazón para compartir",
     "The public link will expire no later than {days} days after it is created" : "A ligazón pública caducará, a máis tardar, {days} días após a súa creación",
     "Link" : "Ligazón",
@@ -97,6 +99,7 @@
     "Set expiration date" : "Definir a data de caducidade",
     "Expiration" : "Caducidade",
     "Expiration date" : "Data de caducidade",
+    "An error occured. Please try again" : "Produciuse un erro, tenteo de novo",
     "Adding user..." : "Engadindo usuario...",
     "group" : "grupo",
     "remote" : "remoto",
@@ -131,7 +134,6 @@
     "_download %n file_::_download %n files_" : ["descargar %n ficheiro","descargar %n ficheiros"],
     "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a versión {version}, isto pode levar un anaco.",
     "Please reload the page." : "Volva cargar a páxina.",
-    "The update was unsuccessful. " : "Fracasou a actualización.",
     "The update was successful. Redirecting you to ownCloud now." : "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
     "Couldn't reset password because the token is invalid" : "No, foi posíbel restabelecer o contrasinal, a marca non é correcta",
     "Couldn't send reset email. Please make sure your username is correct." : "Non foi posíbel enviar o coreo do restablecemento. Asegúrese de que o nome de usuario é o correcto.",
@@ -176,7 +178,7 @@
     "File: %s" : "Ficheiro: %s",
     "Line: %s" : "Liña: %s",
     "Trace" : "Traza",
-    "Security Warning" : "Aviso de seguranza",
+    "Security warning" : "Aviso de seguridade",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear unha <strong>contra de administrador</strong>",
@@ -190,18 +192,22 @@
     "Database name" : "Nome da base de datos",
     "Database tablespace" : "Táboa de espazos da base de datos",
     "Database host" : "Servidor da base de datos",
-    "Performance Warning" : "Aviso de rendemento",
+    "Performance warning" : "Aviso de rendemento",
     "SQLite will be used as database." : "Utilizarase SQLite como base de datos",
     "For larger installations we recommend to choose a different database backend." : "Para instalacións grandes, recomendámoslle que empregue unha infraestrutura de base de datos diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Concretamente, se emprega o cliente de escritorio para sincronización, desaconséllase o uso de SQLite.",
     "Finish setup" : "Rematar a configuración",
     "Finishing …" : "Rematando ...",
+    "Need help?" : "Precisa axuda?",
+    "See the documentation" : "Vexa a documentación",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicación require JavaScript para un correcto funcionamento. {linkstart}Active  JavaScript{linkend} e volva cargar a páxina.",
     "%s is available. Get more information on how to update." : "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
     "Log out" : "Desconectar",
     "Search" : "Buscar",
     "Server side authentication failed!" : "A autenticación fracasou do lado do servidor!",
     "Please contact your administrator." : "Contacte co administrador.",
+    "An internal error occured." : "Produciuse un erro interno.",
+    "Please try again or contact your administrator." : "Tenteo de novo ou póñase en contacto co administrador.",
     "Forgot your password? Reset it!" : "Esqueceu o contrasinal? Restabelézao!",
     "remember" : "lembrar",
     "Log in" : "Conectar",
diff --git a/core/l10n/he.js b/core/l10n/he.js
index 06c079fc19e..a2eeb817fd4 100644
--- a/core/l10n/he.js
+++ b/core/l10n/he.js
@@ -71,7 +71,6 @@ OC.L10N.register(
     "Admin" : "מנהל",
     "Help" : "עזרה",
     "Access forbidden" : "הגישה נחסמה",
-    "Security Warning" : "אזהרת אבטחה",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
     "Create an <strong>admin account</strong>" : "יצירת <strong>חשבון מנהל</strong>",
     "Username" : "שם משתמש",
diff --git a/core/l10n/he.json b/core/l10n/he.json
index 8e584f38d05..0955e9283a1 100644
--- a/core/l10n/he.json
+++ b/core/l10n/he.json
@@ -69,7 +69,6 @@
     "Admin" : "מנהל",
     "Help" : "עזרה",
     "Access forbidden" : "הגישה נחסמה",
-    "Security Warning" : "אזהרת אבטחה",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
     "Create an <strong>admin account</strong>" : "יצירת <strong>חשבון מנהל</strong>",
     "Username" : "שם משתמש",
diff --git a/core/l10n/hi.js b/core/l10n/hi.js
index 91c1b36294c..4edc0dbeb35 100644
--- a/core/l10n/hi.js
+++ b/core/l10n/hi.js
@@ -37,7 +37,6 @@ OC.L10N.register(
     "Users" : "उपयोगकर्ता",
     "Apps" : "Apps",
     "Help" : "सहयोग",
-    "Security Warning" : "सुरक्षा चेतावनी ",
     "Create an <strong>admin account</strong>" : "व्यवस्थापक खाता बनाएँ",
     "Username" : "प्रयोक्ता का नाम",
     "Data folder" : "डाटा फोल्डर",
diff --git a/core/l10n/hi.json b/core/l10n/hi.json
index 77d6c9a71e4..cf6b6bb4773 100644
--- a/core/l10n/hi.json
+++ b/core/l10n/hi.json
@@ -35,7 +35,6 @@
     "Users" : "उपयोगकर्ता",
     "Apps" : "Apps",
     "Help" : "सहयोग",
-    "Security Warning" : "सुरक्षा चेतावनी ",
     "Create an <strong>admin account</strong>" : "व्यवस्थापक खाता बनाएँ",
     "Username" : "प्रयोक्ता का नाम",
     "Data folder" : "डाटा फोल्डर",
diff --git a/core/l10n/hr.js b/core/l10n/hr.js
index d721beab0a2..920c49ae96f 100644
--- a/core/l10n/hr.js
+++ b/core/l10n/hr.js
@@ -72,7 +72,6 @@ OC.L10N.register(
     "Error while changing permissions" : "POgreška pri mijenjanju dozvola",
     "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
     "Shared with you by {owner}" : "S vama podijelio {owner}",
-    "Share with user or group …" : "Podijelite s korisnikom ili grupom ...",
     "Share link" : "Podijelite vezu",
     "The public link will expire no later than {days} days after it is created" : " Javna veza ističe najkasnije {days} dana nakon što je kreirana",
     "Link" : "Poveznica",
@@ -119,7 +118,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["preuzimanje %n datoteke","preuzimanje %n datoteke","preuzimanje %n datoteka"],
     "Updating {productName} to version {version}, this may take a while." : "Uređivanje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
     "Please reload the page." : "Molimo, ponovno učitajte stranicu",
-    "The update was unsuccessful. " : "Usklađivanje je bilo neuspješno.",
     "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspjelo. Upravo ste preusmjeravani na ownCloud.",
     "Couldn't reset password because the token is invalid" : "Resetiranje lozinke nije moguće jer je token neispravan.",
     "Couldn't send reset email. Please make sure your username is correct." : "Resetiranu e-poštu nije moguće poslati.Molimo provjerite ispravnost svoga korisničkog imena.",
@@ -163,7 +161,6 @@ OC.L10N.register(
     "File: %s" : "Datoteka: %s",
     "Line: %s" : "Red: %s",
     "Trace" : "Prati",
-    "Security Warning" : "Sigurnosno upozorenje",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vašem podatkovnom direktoriju i datotekama vjerojatno se može pristupiti s interneta jer .htaccess datoteka ne radi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informaciju kako ispravno konfigurirati vaš poslužitelj, molimo vidite <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
     "Create an <strong>admin account</strong>" : "Kreirajte <strong>admin račun</strong>",
diff --git a/core/l10n/hr.json b/core/l10n/hr.json
index 5bef1ac7e0a..34ce99b616f 100644
--- a/core/l10n/hr.json
+++ b/core/l10n/hr.json
@@ -70,7 +70,6 @@
     "Error while changing permissions" : "POgreška pri mijenjanju dozvola",
     "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
     "Shared with you by {owner}" : "S vama podijelio {owner}",
-    "Share with user or group …" : "Podijelite s korisnikom ili grupom ...",
     "Share link" : "Podijelite vezu",
     "The public link will expire no later than {days} days after it is created" : " Javna veza ističe najkasnije {days} dana nakon što je kreirana",
     "Link" : "Poveznica",
@@ -117,7 +116,6 @@
     "_download %n file_::_download %n files_" : ["preuzimanje %n datoteke","preuzimanje %n datoteke","preuzimanje %n datoteka"],
     "Updating {productName} to version {version}, this may take a while." : "Uređivanje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
     "Please reload the page." : "Molimo, ponovno učitajte stranicu",
-    "The update was unsuccessful. " : "Usklađivanje je bilo neuspješno.",
     "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspjelo. Upravo ste preusmjeravani na ownCloud.",
     "Couldn't reset password because the token is invalid" : "Resetiranje lozinke nije moguće jer je token neispravan.",
     "Couldn't send reset email. Please make sure your username is correct." : "Resetiranu e-poštu nije moguće poslati.Molimo provjerite ispravnost svoga korisničkog imena.",
@@ -161,7 +159,6 @@
     "File: %s" : "Datoteka: %s",
     "Line: %s" : "Red: %s",
     "Trace" : "Prati",
-    "Security Warning" : "Sigurnosno upozorenje",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vašem podatkovnom direktoriju i datotekama vjerojatno se može pristupiti s interneta jer .htaccess datoteka ne radi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informaciju kako ispravno konfigurirati vaš poslužitelj, molimo vidite <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
     "Create an <strong>admin account</strong>" : "Kreirajte <strong>admin račun</strong>",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index 03117226d96..071e9125589 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -75,7 +75,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Nem sikerült módosítani a jogosultságokat",
     "Shared with you and the group {group} by {owner}" : "Megosztotta Önnel és a(z) {group} csoporttal: {owner}",
     "Shared with you by {owner}" : "Megosztotta Önnel: {owner}",
-    "Share with user or group …" : "Megosztani egy felhasználóval vagy csoporttal ...",
     "Share link" : "Megosztás hivatkozással",
     "The public link will expire no later than {days} days after it is created" : "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le",
     "Link" : "Link",
@@ -122,7 +121,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["%n fájl letöltése","%n fájl letöltése"],
     "Updating {productName} to version {version}, this may take a while." : " {productName} frissítése zajlik erre a verzióra: {version}. Ez eltarthat egy darabig.",
     "Please reload the page." : "Kérjük frissítse az oldalt!",
-    "The update was unsuccessful. " : "A frissítés sikerült.",
     "The update was successful. Redirecting you to ownCloud now." : "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
     "Couldn't reset password because the token is invalid" : "Nem lehet a jelszót törölni, mert a token érvénytelen.",
     "Couldn't send reset email. Please make sure your username is correct." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával. ",
@@ -166,7 +164,6 @@ OC.L10N.register(
     "File: %s" : "Fájl: %s",
     "Line: %s" : "Sor: %s",
     "Trace" : "Lekövetés",
-    "Security Warning" : "Biztonsági figyelmeztetés",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
     "Create an <strong>admin account</strong>" : "<strong>Rendszergazdai belépés</strong> létrehozása",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index 89bd567191f..d52b8fb4cb4 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -73,7 +73,6 @@
     "Error while changing permissions" : "Nem sikerült módosítani a jogosultságokat",
     "Shared with you and the group {group} by {owner}" : "Megosztotta Önnel és a(z) {group} csoporttal: {owner}",
     "Shared with you by {owner}" : "Megosztotta Önnel: {owner}",
-    "Share with user or group …" : "Megosztani egy felhasználóval vagy csoporttal ...",
     "Share link" : "Megosztás hivatkozással",
     "The public link will expire no later than {days} days after it is created" : "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le",
     "Link" : "Link",
@@ -120,7 +119,6 @@
     "_download %n file_::_download %n files_" : ["%n fájl letöltése","%n fájl letöltése"],
     "Updating {productName} to version {version}, this may take a while." : " {productName} frissítése zajlik erre a verzióra: {version}. Ez eltarthat egy darabig.",
     "Please reload the page." : "Kérjük frissítse az oldalt!",
-    "The update was unsuccessful. " : "A frissítés sikerült.",
     "The update was successful. Redirecting you to ownCloud now." : "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
     "Couldn't reset password because the token is invalid" : "Nem lehet a jelszót törölni, mert a token érvénytelen.",
     "Couldn't send reset email. Please make sure your username is correct." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával. ",
@@ -164,7 +162,6 @@
     "File: %s" : "Fájl: %s",
     "Line: %s" : "Sor: %s",
     "Trace" : "Lekövetés",
-    "Security Warning" : "Biztonsági figyelmeztetés",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
     "Create an <strong>admin account</strong>" : "<strong>Rendszergazdai belépés</strong> létrehozása",
diff --git a/core/l10n/ia.js b/core/l10n/ia.js
index 5f7df68fdbc..fdadf0c984e 100644
--- a/core/l10n/ia.js
+++ b/core/l10n/ia.js
@@ -63,7 +63,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Error quando on modificava permissiones",
     "Shared with you and the group {group} by {owner}" : "Compartite con te e le gruppo {group} per {owner}",
     "Shared with you by {owner}" : "Compartite con te per {owner} ",
-    "Share with user or group …" : "Compartir con usator o gruppo ...",
     "Share link" : "Compartir ligamine",
     "Password protect" : "Protegite per contrasigno",
     "Password" : "Contrasigno",
@@ -121,7 +120,6 @@ OC.L10N.register(
     "File: %s" : "File: %s",
     "Line: %s" : "Rango: %s",
     "Trace" : "Tracia",
-    "Security Warning" : "Aviso de securitate",
     "Create an <strong>admin account</strong>" : "Crear un <strong>conto de administration</strong>",
     "Username" : "Nomine de usator",
     "Storage & database" : "Immagazinage & base de datos",
diff --git a/core/l10n/ia.json b/core/l10n/ia.json
index 1063be8af1f..f00f484482f 100644
--- a/core/l10n/ia.json
+++ b/core/l10n/ia.json
@@ -61,7 +61,6 @@
     "Error while changing permissions" : "Error quando on modificava permissiones",
     "Shared with you and the group {group} by {owner}" : "Compartite con te e le gruppo {group} per {owner}",
     "Shared with you by {owner}" : "Compartite con te per {owner} ",
-    "Share with user or group …" : "Compartir con usator o gruppo ...",
     "Share link" : "Compartir ligamine",
     "Password protect" : "Protegite per contrasigno",
     "Password" : "Contrasigno",
@@ -119,7 +118,6 @@
     "File: %s" : "File: %s",
     "Line: %s" : "Rango: %s",
     "Trace" : "Tracia",
-    "Security Warning" : "Aviso de securitate",
     "Create an <strong>admin account</strong>" : "Crear un <strong>conto de administration</strong>",
     "Username" : "Nomine de usator",
     "Storage & database" : "Immagazinage & base de datos",
diff --git a/core/l10n/id.js b/core/l10n/id.js
index 55d5668bbdd..696f3238503 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -72,7 +72,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Kesalahan saat mengubah izin",
     "Shared with you and the group {group} by {owner}" : "Dibagikan dengan anda dan grup {group} oleh {owner}",
     "Shared with you by {owner}" : "Dibagikan dengan anda oleh {owner}",
-    "Share with user or group …" : "Bagikan dengan pengguna atau grup ...",
     "Share link" : "Bagikan tautan",
     "The public link will expire no later than {days} days after it is created" : "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
     "Link" : "Tautan",
@@ -119,7 +118,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["unduh %n berkas"],
     "Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini memerlukan waktu.",
     "Please reload the page." : "Silakan muat ulang halaman.",
-    "The update was unsuccessful. " : "Pembaruan tidak berhasil.",
     "The update was successful. Redirecting you to ownCloud now." : "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
     "Couldn't reset password because the token is invalid" : "Tidak dapat menyetel ulang sandi karena token tidak sah",
     "Couldn't send reset email. Please make sure your username is correct." : "Tidak dapat menyetel ulang email. Mohon pastikan nama pengguna Anda benar.",
@@ -163,7 +161,6 @@ OC.L10N.register(
     "File: %s" : "Berkas: %s",
     "Line: %s" : "Baris: %s",
     "Trace" : "Jejak",
-    "Security Warning" : "Peringatan Keamanan",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
     "Create an <strong>admin account</strong>" : "Buat sebuah <strong>akun admin</strong>",
diff --git a/core/l10n/id.json b/core/l10n/id.json
index 2c4a56581ad..63f8ae6a050 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -70,7 +70,6 @@
     "Error while changing permissions" : "Kesalahan saat mengubah izin",
     "Shared with you and the group {group} by {owner}" : "Dibagikan dengan anda dan grup {group} oleh {owner}",
     "Shared with you by {owner}" : "Dibagikan dengan anda oleh {owner}",
-    "Share with user or group …" : "Bagikan dengan pengguna atau grup ...",
     "Share link" : "Bagikan tautan",
     "The public link will expire no later than {days} days after it is created" : "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
     "Link" : "Tautan",
@@ -117,7 +116,6 @@
     "_download %n file_::_download %n files_" : ["unduh %n berkas"],
     "Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini memerlukan waktu.",
     "Please reload the page." : "Silakan muat ulang halaman.",
-    "The update was unsuccessful. " : "Pembaruan tidak berhasil.",
     "The update was successful. Redirecting you to ownCloud now." : "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
     "Couldn't reset password because the token is invalid" : "Tidak dapat menyetel ulang sandi karena token tidak sah",
     "Couldn't send reset email. Please make sure your username is correct." : "Tidak dapat menyetel ulang email. Mohon pastikan nama pengguna Anda benar.",
@@ -161,7 +159,6 @@
     "File: %s" : "Berkas: %s",
     "Line: %s" : "Baris: %s",
     "Trace" : "Jejak",
-    "Security Warning" : "Peringatan Keamanan",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
     "Create an <strong>admin account</strong>" : "Buat sebuah <strong>akun admin</strong>",
diff --git a/core/l10n/is.js b/core/l10n/is.js
index de1cd53ac1a..16dd20521db 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -67,7 +67,6 @@ OC.L10N.register(
     "Admin" : "Stjórnun",
     "Help" : "Hjálp",
     "Access forbidden" : "Aðgangur bannaður",
-    "Security Warning" : "Öryggis aðvörun",
     "Create an <strong>admin account</strong>" : "Útbúa <strong>vefstjóra aðgang</strong>",
     "Username" : "Notendanafn",
     "Data folder" : "Gagnamappa",
diff --git a/core/l10n/is.json b/core/l10n/is.json
index e3b3c3a7a2c..dcd6fc4aa96 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -65,7 +65,6 @@
     "Admin" : "Stjórnun",
     "Help" : "Hjálp",
     "Access forbidden" : "Aðgangur bannaður",
-    "Security Warning" : "Öryggis aðvörun",
     "Create an <strong>admin account</strong>" : "Útbúa <strong>vefstjóra aðgang</strong>",
     "Username" : "Notendanafn",
     "Data folder" : "Gagnamappa",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index 808eec95eee..078ce46cb4d 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -72,7 +72,7 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Questo server non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o di spostare la cartella fuori dalla radice del server web.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Non è stata configurata alcuna cache di memoria. Per migliorare le prestazioni configura memcache, se disponibile. Ulteriori informazioni sono disponibili nella nostra <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentazione</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Non è stata configurata alcuna cache di memoria. Per migliorare le prestazioni configura memcache, se disponibile. Ulteriori informazioni sono disponibili nella nostra <a href=\"{docLink}\">documentazione</a>.",
     "Error occurred while checking server setup" : "Si è verificato un errore durante il controllo della configurazione del server",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'intestazione HTTP \"{header}\" non è configurata come \"{expected}\". \nQuesto è un potenziale rischio di sicurezza o di riservatezza dei dati e noi consigliamo di modificare questa impostazione.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "L'intestazione HTTP \"Strict-Transport-Security\" non è configurata con un valore almeno di \"2,678,400\" secondi. Questo è un potenziale rischio di sicurezza e noi consigliamo di modificare questa impostazione.",
@@ -86,7 +86,9 @@ OC.L10N.register(
     "Error while changing permissions" : "Errore durante la modifica dei permessi",
     "Shared with you and the group {group} by {owner}" : "Condiviso con te e con il gruppo {group} da {owner}",
     "Shared with you by {owner}" : "Condiviso con te da {owner}",
-    "Share with user or group …" : "Condividi con utente o gruppo ...",
+    "Share with users or groups …" : "Condividi con utenti o gruppi...",
+    "Share with users, groups or remote users …" : "Condividi con utenti, gruppi o utenti remoti...",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Condividi con persone su altri ownCloud utilizzando la sintassi nomeutente@esempio.com/owncloud",
     "Share link" : "Condividi collegamento",
     "The public link will expire no later than {days} days after it is created" : "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione",
     "Link" : "Collegamento",
@@ -99,6 +101,7 @@ OC.L10N.register(
     "Set expiration date" : "Imposta data di scadenza",
     "Expiration" : "Scadenza",
     "Expiration date" : "Data di scadenza",
+    "An error occured. Please try again" : "Si è verificato un errore. Prova ancora",
     "Adding user..." : "Aggiunta utente in corso...",
     "group" : "gruppo",
     "remote" : "remota",
@@ -133,7 +136,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["scarica %n file","scarica %s file"],
     "Updating {productName} to version {version}, this may take a while." : "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.",
     "Please reload the page." : "Ricarica la pagina.",
-    "The update was unsuccessful. " : "L'aggiornamento non è riuscito.",
     "The update was successful. Redirecting you to ownCloud now." : "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
     "Couldn't reset password because the token is invalid" : "Impossibile reimpostare la password poiché il token non è valido",
     "Couldn't send reset email. Please make sure your username is correct." : "Impossibile inviare l'email di reimpostazione. Assicurati che il nome utente sia corretto.",
@@ -178,7 +180,7 @@ OC.L10N.register(
     "File: %s" : "File: %s",
     "Line: %s" : "Riga: %s",
     "Trace" : "Traccia",
-    "Security Warning" : "Avviso di sicurezza",
+    "Security warning" : "Avviso di sicurezza",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
     "Create an <strong>admin account</strong>" : "Crea un <strong>account amministratore</strong>",
@@ -192,18 +194,22 @@ OC.L10N.register(
     "Database name" : "Nome del database",
     "Database tablespace" : "Spazio delle tabelle del database",
     "Database host" : "Host del database",
-    "Performance Warning" : "Avviso di prestazioni",
+    "Performance warning" : "Avviso di prestazioni",
     "SQLite will be used as database." : "SQLite sarà utilizzato come database.",
     "For larger installations we recommend to choose a different database backend." : "Per installazioni più grandi consigliamo di scegliere un motore di database diverso.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "In particolar modo, quando si utilizza il client desktop per la sincronizzazione dei file, l'uso di SQLite è sconsigliato.",
     "Finish setup" : "Termina configurazione",
     "Finishing …" : "Completamento...",
+    "Need help?" : "Ti serve aiuto?",
+    "See the documentation" : "Leggi la documentazione",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Questa applicazione richiede JavaScript per un corretto funzionamento. {linkstart}Abilita JavaScript{linkend} e ricarica la pagina.",
     "%s is available. Get more information on how to update." : "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.",
     "Log out" : "Esci",
     "Search" : "Cerca",
     "Server side authentication failed!" : "Autenticazione lato server non riuscita!",
     "Please contact your administrator." : "Contatta il tuo amministratore di sistema.",
+    "An internal error occured." : "Si è verificato un errore interno.",
+    "Please try again or contact your administrator." : "Prova ancora o contatta il tuo amministratore.",
     "Forgot your password? Reset it!" : "Hai dimenticato la password? Reimpostala!",
     "remember" : "ricorda",
     "Log in" : "Accedi",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 666f703e850..74fb35d99b2 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -70,7 +70,7 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Questo server non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o di spostare la cartella fuori dalla radice del server web.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Non è stata configurata alcuna cache di memoria. Per migliorare le prestazioni configura memcache, se disponibile. Ulteriori informazioni sono disponibili nella nostra <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentazione</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Non è stata configurata alcuna cache di memoria. Per migliorare le prestazioni configura memcache, se disponibile. Ulteriori informazioni sono disponibili nella nostra <a href=\"{docLink}\">documentazione</a>.",
     "Error occurred while checking server setup" : "Si è verificato un errore durante il controllo della configurazione del server",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'intestazione HTTP \"{header}\" non è configurata come \"{expected}\". \nQuesto è un potenziale rischio di sicurezza o di riservatezza dei dati e noi consigliamo di modificare questa impostazione.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "L'intestazione HTTP \"Strict-Transport-Security\" non è configurata con un valore almeno di \"2,678,400\" secondi. Questo è un potenziale rischio di sicurezza e noi consigliamo di modificare questa impostazione.",
@@ -84,7 +84,9 @@
     "Error while changing permissions" : "Errore durante la modifica dei permessi",
     "Shared with you and the group {group} by {owner}" : "Condiviso con te e con il gruppo {group} da {owner}",
     "Shared with you by {owner}" : "Condiviso con te da {owner}",
-    "Share with user or group …" : "Condividi con utente o gruppo ...",
+    "Share with users or groups …" : "Condividi con utenti o gruppi...",
+    "Share with users, groups or remote users …" : "Condividi con utenti, gruppi o utenti remoti...",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Condividi con persone su altri ownCloud utilizzando la sintassi nomeutente@esempio.com/owncloud",
     "Share link" : "Condividi collegamento",
     "The public link will expire no later than {days} days after it is created" : "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione",
     "Link" : "Collegamento",
@@ -97,6 +99,7 @@
     "Set expiration date" : "Imposta data di scadenza",
     "Expiration" : "Scadenza",
     "Expiration date" : "Data di scadenza",
+    "An error occured. Please try again" : "Si è verificato un errore. Prova ancora",
     "Adding user..." : "Aggiunta utente in corso...",
     "group" : "gruppo",
     "remote" : "remota",
@@ -131,7 +134,6 @@
     "_download %n file_::_download %n files_" : ["scarica %n file","scarica %s file"],
     "Updating {productName} to version {version}, this may take a while." : "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.",
     "Please reload the page." : "Ricarica la pagina.",
-    "The update was unsuccessful. " : "L'aggiornamento non è riuscito.",
     "The update was successful. Redirecting you to ownCloud now." : "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
     "Couldn't reset password because the token is invalid" : "Impossibile reimpostare la password poiché il token non è valido",
     "Couldn't send reset email. Please make sure your username is correct." : "Impossibile inviare l'email di reimpostazione. Assicurati che il nome utente sia corretto.",
@@ -176,7 +178,7 @@
     "File: %s" : "File: %s",
     "Line: %s" : "Riga: %s",
     "Trace" : "Traccia",
-    "Security Warning" : "Avviso di sicurezza",
+    "Security warning" : "Avviso di sicurezza",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
     "Create an <strong>admin account</strong>" : "Crea un <strong>account amministratore</strong>",
@@ -190,18 +192,22 @@
     "Database name" : "Nome del database",
     "Database tablespace" : "Spazio delle tabelle del database",
     "Database host" : "Host del database",
-    "Performance Warning" : "Avviso di prestazioni",
+    "Performance warning" : "Avviso di prestazioni",
     "SQLite will be used as database." : "SQLite sarà utilizzato come database.",
     "For larger installations we recommend to choose a different database backend." : "Per installazioni più grandi consigliamo di scegliere un motore di database diverso.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "In particolar modo, quando si utilizza il client desktop per la sincronizzazione dei file, l'uso di SQLite è sconsigliato.",
     "Finish setup" : "Termina configurazione",
     "Finishing …" : "Completamento...",
+    "Need help?" : "Ti serve aiuto?",
+    "See the documentation" : "Leggi la documentazione",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Questa applicazione richiede JavaScript per un corretto funzionamento. {linkstart}Abilita JavaScript{linkend} e ricarica la pagina.",
     "%s is available. Get more information on how to update." : "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.",
     "Log out" : "Esci",
     "Search" : "Cerca",
     "Server side authentication failed!" : "Autenticazione lato server non riuscita!",
     "Please contact your administrator." : "Contatta il tuo amministratore di sistema.",
+    "An internal error occured." : "Si è verificato un errore interno.",
+    "Please try again or contact your administrator." : "Prova ancora o contatta il tuo amministratore.",
     "Forgot your password? Reset it!" : "Hai dimenticato la password? Reimpostala!",
     "remember" : "ricorda",
     "Log in" : "Accedi",
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index 8e0c4fd2281..e02cfea53fe 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -83,7 +83,6 @@ OC.L10N.register(
     "Error while changing permissions" : "権限変更でエラー発生",
     "Shared with you and the group {group} by {owner}" : "あなたと {owner} のグループ {group} で共有中",
     "Shared with you by {owner}" : "{owner} と共有中",
-    "Share with user or group …" : "ユーザーもしくはグループと共有 ...",
     "Share link" : "URLで共有",
     "The public link will expire no later than {days} days after it is created" : "URLによる共有は、作成してから {days} 日以内に有効期限切れになります",
     "Link" : "リンク",
@@ -130,7 +129,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["%n個のファイルをダウンロード"],
     "Updating {productName} to version {version}, this may take a while." : "{productName} を バージョン {version} に更新しています。しばらくお待ちください。",
     "Please reload the page." : "ページをリロードしてください。",
-    "The update was unsuccessful. " : "アップデートに失敗しました。",
     "The update was successful. Redirecting you to ownCloud now." : "アップデートに成功しました。今すぐownCloudにリダイレクトします。",
     "Couldn't reset password because the token is invalid" : "トークンが無効なため、パスワードをリセットできませんでした",
     "Couldn't send reset email. Please make sure your username is correct." : "リセットメールを送信できませんでした。ユーザー名が正しいことを確認してください。",
@@ -175,7 +173,6 @@ OC.L10N.register(
     "File: %s" : "ファイル: %s",
     "Line: %s" : "行: %s",
     "Trace" : "トレース",
-    "Security Warning" : "セキュリティ警告",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccessファイルが動作していないため、おそらくあなたのデータディレクトリまたはファイルはインターネットからアクセス可能になっています。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。",
     "Create an <strong>admin account</strong>" : "<strong>管理者アカウント</strong>を作成してください",
@@ -189,7 +186,6 @@ OC.L10N.register(
     "Database name" : "データベース名",
     "Database tablespace" : "データベースの表領域",
     "Database host" : "データベースのホスト名",
-    "Performance Warning" : "パフォーマンス警告",
     "SQLite will be used as database." : "SQLiteをデータベースとして使用しています。",
     "For larger installations we recommend to choose a different database backend." : "大規模な運用では別のデータベースを選択することをお勧めします。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特にデスクトップクライアントをファイル同期に使用する場合，SQLiteは非推奨です.",
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index 04fc78caa0a..685e61815f5 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -81,7 +81,6 @@
     "Error while changing permissions" : "権限変更でエラー発生",
     "Shared with you and the group {group} by {owner}" : "あなたと {owner} のグループ {group} で共有中",
     "Shared with you by {owner}" : "{owner} と共有中",
-    "Share with user or group …" : "ユーザーもしくはグループと共有 ...",
     "Share link" : "URLで共有",
     "The public link will expire no later than {days} days after it is created" : "URLによる共有は、作成してから {days} 日以内に有効期限切れになります",
     "Link" : "リンク",
@@ -128,7 +127,6 @@
     "_download %n file_::_download %n files_" : ["%n個のファイルをダウンロード"],
     "Updating {productName} to version {version}, this may take a while." : "{productName} を バージョン {version} に更新しています。しばらくお待ちください。",
     "Please reload the page." : "ページをリロードしてください。",
-    "The update was unsuccessful. " : "アップデートに失敗しました。",
     "The update was successful. Redirecting you to ownCloud now." : "アップデートに成功しました。今すぐownCloudにリダイレクトします。",
     "Couldn't reset password because the token is invalid" : "トークンが無効なため、パスワードをリセットできませんでした",
     "Couldn't send reset email. Please make sure your username is correct." : "リセットメールを送信できませんでした。ユーザー名が正しいことを確認してください。",
@@ -173,7 +171,6 @@
     "File: %s" : "ファイル: %s",
     "Line: %s" : "行: %s",
     "Trace" : "トレース",
-    "Security Warning" : "セキュリティ警告",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccessファイルが動作していないため、おそらくあなたのデータディレクトリまたはファイルはインターネットからアクセス可能になっています。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。",
     "Create an <strong>admin account</strong>" : "<strong>管理者アカウント</strong>を作成してください",
@@ -187,7 +184,6 @@
     "Database name" : "データベース名",
     "Database tablespace" : "データベースの表領域",
     "Database host" : "データベースのホスト名",
-    "Performance Warning" : "パフォーマンス警告",
     "SQLite will be used as database." : "SQLiteをデータベースとして使用しています。",
     "For larger installations we recommend to choose a different database backend." : "大規模な運用では別のデータベースを選択することをお勧めします。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特にデスクトップクライアントをファイル同期に使用する場合，SQLiteは非推奨です.",
diff --git a/core/l10n/ka_GE.js b/core/l10n/ka_GE.js
index bcb36086514..ed9ab2bbd7f 100644
--- a/core/l10n/ka_GE.js
+++ b/core/l10n/ka_GE.js
@@ -70,7 +70,6 @@ OC.L10N.register(
     "Admin" : "ადმინისტრატორი",
     "Help" : "დახმარება",
     "Access forbidden" : "წვდომა აკრძალულია",
-    "Security Warning" : "უსაფრთხოების გაფრთხილება",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
     "Create an <strong>admin account</strong>" : "შექმენი <strong>ადმინ ექაუნტი</strong>",
     "Username" : "მომხმარებლის სახელი",
diff --git a/core/l10n/ka_GE.json b/core/l10n/ka_GE.json
index 8870b78a7d5..3d5a85a99fd 100644
--- a/core/l10n/ka_GE.json
+++ b/core/l10n/ka_GE.json
@@ -68,7 +68,6 @@
     "Admin" : "ადმინისტრატორი",
     "Help" : "დახმარება",
     "Access forbidden" : "წვდომა აკრძალულია",
-    "Security Warning" : "უსაფრთხოების გაფრთხილება",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
     "Create an <strong>admin account</strong>" : "შექმენი <strong>ადმინ ექაუნტი</strong>",
     "Username" : "მომხმარებლის სახელი",
diff --git a/core/l10n/km.js b/core/l10n/km.js
index a89bac783f2..b3332580e23 100644
--- a/core/l10n/km.js
+++ b/core/l10n/km.js
@@ -77,7 +77,6 @@ OC.L10N.register(
     "Admin" : "អ្នក​គ្រប់​គ្រង",
     "Help" : "ជំនួយ",
     "Access forbidden" : "បាន​ហាមឃាត់​ការ​ចូល",
-    "Security Warning" : "បម្រាម​សុវត្ថិភាព",
     "Create an <strong>admin account</strong>" : "បង្កើត​<strong>គណនី​អភិបាល</strong>",
     "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Storage & database" : "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្នន័យ",
diff --git a/core/l10n/km.json b/core/l10n/km.json
index 4990fdf65b1..fceb9e68722 100644
--- a/core/l10n/km.json
+++ b/core/l10n/km.json
@@ -75,7 +75,6 @@
     "Admin" : "អ្នក​គ្រប់​គ្រង",
     "Help" : "ជំនួយ",
     "Access forbidden" : "បាន​ហាមឃាត់​ការ​ចូល",
-    "Security Warning" : "បម្រាម​សុវត្ថិភាព",
     "Create an <strong>admin account</strong>" : "បង្កើត​<strong>គណនី​អភិបាល</strong>",
     "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Storage & database" : "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្នន័យ",
diff --git a/core/l10n/kn.js b/core/l10n/kn.js
index 727ea7b4a68..6a137619ab2 100644
--- a/core/l10n/kn.js
+++ b/core/l10n/kn.js
@@ -68,7 +68,6 @@ OC.L10N.register(
     "Error while changing permissions" : "ಅನುಮತಿಗಳನ್ನು ಬದಲಾವಣೆ ಮಾಡುವಾಗ ದೋಷವಾಗಿದೆ",
     "Shared with you and the group {group} by {owner}" : "ನಿಮಗೆ ಮತ್ತು {group} ಗುಂಪಿನೂಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
     "Shared with you by {owner}" : "ನಿಮ್ಮೊಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
-    "Share with user or group …" : "ಬಳಕೆದಾರ ಅಥವಾ ಗುಂಪನ್ನು ಜೊತೆ ಹಂಚಿಕೊಳ್ಳಿ ...",
     "Share link" : "ಸಂಪರ್ಕ ಕೊಂಡಿಯನ್ನು  ಹಂಚಿಕೊಳ್ಳಬಹುದು",
     "The public link will expire no later than {days} days after it is created" : "ರಚನೆಯಾದ {days} ದಿನಗಳ ನಂತರ ಈ ಸಾರ್ವಜನಿಕ ಸಂಪರ್ಕ ಕೊಂಡಿ ಅಂತ್ಯಗೊಳ್ಳಲಿದೆ",
     "Link" : "ಸಂಪರ್ಕ ಕೊಂಡಿ",
@@ -112,7 +111,6 @@ OC.L10N.register(
     "Hello {name}, the weather is {weather}" : "ನಮಸ್ಕಾರ {name}, ಸದ್ಯ {weather} ಹವಾಮಾನವಿದೆ",
     "_download %n file_::_download %n files_" : ["%n ಕಡತಗಳನ್ನು ಸ್ಥಳೀಯ ಪ್ರತಿಯಾಗಿಸಿ"],
     "Please reload the page." : "ಪುಟವನ್ನು ಪುನಃ ನವೀಕರಿಸಿ.",
-    "The update was unsuccessful. " : "ಆಧುನೀಕರಿಣೆ ಯಶಸ್ವಿಯಾಗಿಲ್ಲ.",
     "Couldn't reset password because the token is invalid" : "ಚಿಹ್ನೆ ಅಮಾನ್ಯವಾಗಿದೆ, ಗುಪ್ತಪದ ಮರುಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ",
     "Couldn't send reset email. Please make sure your username is correct." : "ಬದಲಾವಣೆಯ ಇ-ಅಂಚೆಯನ್ನು ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ನಿಮ್ಮ ಬಳಕೆದಾರ ಹೆಸರು ಸರಿಯಾಗಿದೆ ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "ಈ ಬಳಕೆದಾರನ ಹೆಸರಿನ್ನಲ್ಲಿ ಯಾವುದೇ ಇ-ಅಂಚೆ ವಿಳಾಸ ಇಲ್ಲದರಿರುವುದರಿಂದ ಬದಲಾವಣೆಯ ಇ-ಅಂಚೆಯನ್ನು  ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ. ನಿಮ್ಮ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ.",
@@ -146,7 +144,6 @@ OC.L10N.register(
     "File: %s" : "ಕಡತ: %s",
     "Line: %s" : "ಕೋಂಡಿ: %s",
     "Trace" : "ಕುರುಹು",
-    "Security Warning" : "ಭದ್ರತಾ ಎಚ್ಚರಿಕೆ",
     "Username" : "ಬಳಕೆಯ ಹೆಸರು",
     "Storage & database" : "ಶೇಖರಣಾ ಮತ್ತು ದತ್ತಸಂಚಯ",
     "Data folder" : "ಮಾಹಿತಿ ಕೋಶ",
diff --git a/core/l10n/kn.json b/core/l10n/kn.json
index 2036ab91e8d..2489a394723 100644
--- a/core/l10n/kn.json
+++ b/core/l10n/kn.json
@@ -66,7 +66,6 @@
     "Error while changing permissions" : "ಅನುಮತಿಗಳನ್ನು ಬದಲಾವಣೆ ಮಾಡುವಾಗ ದೋಷವಾಗಿದೆ",
     "Shared with you and the group {group} by {owner}" : "ನಿಮಗೆ ಮತ್ತು {group} ಗುಂಪಿನೂಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
     "Shared with you by {owner}" : "ನಿಮ್ಮೊಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
-    "Share with user or group …" : "ಬಳಕೆದಾರ ಅಥವಾ ಗುಂಪನ್ನು ಜೊತೆ ಹಂಚಿಕೊಳ್ಳಿ ...",
     "Share link" : "ಸಂಪರ್ಕ ಕೊಂಡಿಯನ್ನು  ಹಂಚಿಕೊಳ್ಳಬಹುದು",
     "The public link will expire no later than {days} days after it is created" : "ರಚನೆಯಾದ {days} ದಿನಗಳ ನಂತರ ಈ ಸಾರ್ವಜನಿಕ ಸಂಪರ್ಕ ಕೊಂಡಿ ಅಂತ್ಯಗೊಳ್ಳಲಿದೆ",
     "Link" : "ಸಂಪರ್ಕ ಕೊಂಡಿ",
@@ -110,7 +109,6 @@
     "Hello {name}, the weather is {weather}" : "ನಮಸ್ಕಾರ {name}, ಸದ್ಯ {weather} ಹವಾಮಾನವಿದೆ",
     "_download %n file_::_download %n files_" : ["%n ಕಡತಗಳನ್ನು ಸ್ಥಳೀಯ ಪ್ರತಿಯಾಗಿಸಿ"],
     "Please reload the page." : "ಪುಟವನ್ನು ಪುನಃ ನವೀಕರಿಸಿ.",
-    "The update was unsuccessful. " : "ಆಧುನೀಕರಿಣೆ ಯಶಸ್ವಿಯಾಗಿಲ್ಲ.",
     "Couldn't reset password because the token is invalid" : "ಚಿಹ್ನೆ ಅಮಾನ್ಯವಾಗಿದೆ, ಗುಪ್ತಪದ ಮರುಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ",
     "Couldn't send reset email. Please make sure your username is correct." : "ಬದಲಾವಣೆಯ ಇ-ಅಂಚೆಯನ್ನು ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ನಿಮ್ಮ ಬಳಕೆದಾರ ಹೆಸರು ಸರಿಯಾಗಿದೆ ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "ಈ ಬಳಕೆದಾರನ ಹೆಸರಿನ್ನಲ್ಲಿ ಯಾವುದೇ ಇ-ಅಂಚೆ ವಿಳಾಸ ಇಲ್ಲದರಿರುವುದರಿಂದ ಬದಲಾವಣೆಯ ಇ-ಅಂಚೆಯನ್ನು  ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ. ನಿಮ್ಮ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ.",
@@ -144,7 +142,6 @@
     "File: %s" : "ಕಡತ: %s",
     "Line: %s" : "ಕೋಂಡಿ: %s",
     "Trace" : "ಕುರುಹು",
-    "Security Warning" : "ಭದ್ರತಾ ಎಚ್ಚರಿಕೆ",
     "Username" : "ಬಳಕೆಯ ಹೆಸರು",
     "Storage & database" : "ಶೇಖರಣಾ ಮತ್ತು ದತ್ತಸಂಚಯ",
     "Data folder" : "ಮಾಹಿತಿ ಕೋಶ",
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
index d97729e136b..dac905abd4e 100644
--- a/core/l10n/ko.js
+++ b/core/l10n/ko.js
@@ -72,7 +72,6 @@ OC.L10N.register(
     "Error while changing permissions" : "권한 변경하는 중 오류 발생",
     "Shared with you and the group {group} by {owner}" : "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중",
     "Shared with you by {owner}" : "{owner} 님이 공유 중",
-    "Share with user or group …" : "사용자 및 그룹과 공유...",
     "Share link" : "링크 공유",
     "The public link will expire no later than {days} days after it is created" : "공개 링크를 만든 후 최대 {days}일까지 유지됩니다",
     "Link" : "링크",
@@ -119,7 +118,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["파일 %n개 다운로드"],
     "Updating {productName} to version {version}, this may take a while." : "{productName}을(를) 버전 {version}으로 업데이트하고 있습니다. 시간이 걸릴 수 있습니다.",
     "Please reload the page." : "페이지를 새로 고치십시오.",
-    "The update was unsuccessful. " : "업데이트가 실패하였습니다. ",
     "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
     "Couldn't reset password because the token is invalid" : "토큰이 잘못되었기 때문에 암호를 초기화할 수 없습니다",
     "Couldn't send reset email. Please make sure your username is correct." : "재설정 메일을 보낼 수 없습니다. 사용자 이름이 올바른지 확인하십시오.",
@@ -163,7 +161,6 @@ OC.L10N.register(
     "File: %s" : "파일: %s",
     "Line: %s" : "줄: %s",
     "Trace" : "추적",
-    "Security Warning" : "보안 경고",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하십시오.",
     "Create an <strong>admin account</strong>" : "<strong>관리자 계정</strong> 만들기",
@@ -177,7 +174,6 @@ OC.L10N.register(
     "Database name" : "데이터베이스 이름",
     "Database tablespace" : "데이터베이스 테이블 공간",
     "Database host" : "데이터베이스 호스트",
-    "Performance Warning" : "성능 경고",
     "SQLite will be used as database." : "데이터베이스로 SQLite를 사용하게 됩니다.",
     "For larger installations we recommend to choose a different database backend." : "대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드를 선택할 것을 권장합니다.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정일 때는, SQLite를 사용하지 않는 것이 좋습니다.",
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
index 460a2c4936c..fa870e691c5 100644
--- a/core/l10n/ko.json
+++ b/core/l10n/ko.json
@@ -70,7 +70,6 @@
     "Error while changing permissions" : "권한 변경하는 중 오류 발생",
     "Shared with you and the group {group} by {owner}" : "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중",
     "Shared with you by {owner}" : "{owner} 님이 공유 중",
-    "Share with user or group …" : "사용자 및 그룹과 공유...",
     "Share link" : "링크 공유",
     "The public link will expire no later than {days} days after it is created" : "공개 링크를 만든 후 최대 {days}일까지 유지됩니다",
     "Link" : "링크",
@@ -117,7 +116,6 @@
     "_download %n file_::_download %n files_" : ["파일 %n개 다운로드"],
     "Updating {productName} to version {version}, this may take a while." : "{productName}을(를) 버전 {version}으로 업데이트하고 있습니다. 시간이 걸릴 수 있습니다.",
     "Please reload the page." : "페이지를 새로 고치십시오.",
-    "The update was unsuccessful. " : "업데이트가 실패하였습니다. ",
     "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
     "Couldn't reset password because the token is invalid" : "토큰이 잘못되었기 때문에 암호를 초기화할 수 없습니다",
     "Couldn't send reset email. Please make sure your username is correct." : "재설정 메일을 보낼 수 없습니다. 사용자 이름이 올바른지 확인하십시오.",
@@ -161,7 +159,6 @@
     "File: %s" : "파일: %s",
     "Line: %s" : "줄: %s",
     "Trace" : "추적",
-    "Security Warning" : "보안 경고",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하십시오.",
     "Create an <strong>admin account</strong>" : "<strong>관리자 계정</strong> 만들기",
@@ -175,7 +172,6 @@
     "Database name" : "데이터베이스 이름",
     "Database tablespace" : "데이터베이스 테이블 공간",
     "Database host" : "데이터베이스 호스트",
-    "Performance Warning" : "성능 경고",
     "SQLite will be used as database." : "데이터베이스로 SQLite를 사용하게 됩니다.",
     "For larger installations we recommend to choose a different database backend." : "대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드를 선택할 것을 권장합니다.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정일 때는, SQLite를 사용하지 않는 것이 좋습니다.",
diff --git a/core/l10n/lb.js b/core/l10n/lb.js
index 298c0946970..50d5bfe1399 100644
--- a/core/l10n/lb.js
+++ b/core/l10n/lb.js
@@ -87,7 +87,6 @@ OC.L10N.register(
     "Error untagging" : "Fehler beim Tag läschen",
     "Access forbidden" : "Zougrëff net erlaabt",
     "Cheers!" : "Prost!",
-    "Security Warning" : "Sécherheets-Warnung",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
     "Create an <strong>admin account</strong>" : "En <strong>Admin-Account</strong> uleeën",
     "Username" : "Benotzernumm",
diff --git a/core/l10n/lb.json b/core/l10n/lb.json
index b78d8229398..7e36d60a79b 100644
--- a/core/l10n/lb.json
+++ b/core/l10n/lb.json
@@ -85,7 +85,6 @@
     "Error untagging" : "Fehler beim Tag läschen",
     "Access forbidden" : "Zougrëff net erlaabt",
     "Cheers!" : "Prost!",
-    "Security Warning" : "Sécherheets-Warnung",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
     "Create an <strong>admin account</strong>" : "En <strong>Admin-Account</strong> uleeën",
     "Username" : "Benotzernumm",
diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js
index db08141c3f0..6291880ac0a 100644
--- a/core/l10n/lt_LT.js
+++ b/core/l10n/lt_LT.js
@@ -54,7 +54,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Klaida, keičiant privilegijas",
     "Shared with you and the group {group} by {owner}" : "Pasidalino su Jumis ir {group} grupe {owner}",
     "Shared with you by {owner}" : "Pasidalino su Jumis {owner}",
-    "Share with user or group …" : "Dalintis su vartotoju arba grupe...",
     "Share link" : "Dalintis nuoroda",
     "Password protect" : "Apsaugotas slaptažodžiu",
     "Password" : "Slaptažodis",
@@ -108,7 +107,6 @@ OC.L10N.register(
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėti tai: %s\n",
     "The share will expire on %s." : "Bendrinimo laikas baigsis %s.",
     "Cheers!" : "Sveikinimai!",
-    "Security Warning" : "Saugumo pranešimas",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
     "Create an <strong>admin account</strong>" : "Sukurti <strong>administratoriaus paskyrą</strong>",
diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json
index 0502dd57fa6..72faeb1fcbf 100644
--- a/core/l10n/lt_LT.json
+++ b/core/l10n/lt_LT.json
@@ -52,7 +52,6 @@
     "Error while changing permissions" : "Klaida, keičiant privilegijas",
     "Shared with you and the group {group} by {owner}" : "Pasidalino su Jumis ir {group} grupe {owner}",
     "Shared with you by {owner}" : "Pasidalino su Jumis {owner}",
-    "Share with user or group …" : "Dalintis su vartotoju arba grupe...",
     "Share link" : "Dalintis nuoroda",
     "Password protect" : "Apsaugotas slaptažodžiu",
     "Password" : "Slaptažodis",
@@ -106,7 +105,6 @@
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėti tai: %s\n",
     "The share will expire on %s." : "Bendrinimo laikas baigsis %s.",
     "Cheers!" : "Sveikinimai!",
-    "Security Warning" : "Saugumo pranešimas",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
     "Create an <strong>admin account</strong>" : "Sukurti <strong>administratoriaus paskyrą</strong>",
diff --git a/core/l10n/lv.js b/core/l10n/lv.js
index a0c9a564ea1..dbc54d56ab0 100644
--- a/core/l10n/lv.js
+++ b/core/l10n/lv.js
@@ -86,7 +86,6 @@ OC.L10N.register(
     "Admin" : "Administratori",
     "Help" : "Palīdzība",
     "Access forbidden" : "Pieeja ir liegta",
-    "Security Warning" : "Brīdinājums par drošību",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
     "Create an <strong>admin account</strong>" : "Izveidot <strong>administratora kontu</strong>",
diff --git a/core/l10n/lv.json b/core/l10n/lv.json
index af3c1699e5d..b2efc1f9047 100644
--- a/core/l10n/lv.json
+++ b/core/l10n/lv.json
@@ -84,7 +84,6 @@
     "Admin" : "Administratori",
     "Help" : "Palīdzība",
     "Access forbidden" : "Pieeja ir liegta",
-    "Security Warning" : "Brīdinājums par drošību",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
     "Create an <strong>admin account</strong>" : "Izveidot <strong>administratora kontu</strong>",
diff --git a/core/l10n/mk.js b/core/l10n/mk.js
index 90e52bda687..8980263379c 100644
--- a/core/l10n/mk.js
+++ b/core/l10n/mk.js
@@ -99,7 +99,6 @@ OC.L10N.register(
     "Access forbidden" : "Забранет пристап",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здраво,\n\nСамо да ве известам дека  %s shared %s with you.\nView it: %s\n\n",
     "Cheers!" : "Поздрав!",
-    "Security Warning" : "Безбедносно предупредување",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
     "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>",
     "Username" : "Корисничко име",
diff --git a/core/l10n/mk.json b/core/l10n/mk.json
index 9d7ee58eacd..15037116cc9 100644
--- a/core/l10n/mk.json
+++ b/core/l10n/mk.json
@@ -97,7 +97,6 @@
     "Access forbidden" : "Забранет пристап",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здраво,\n\nСамо да ве известам дека  %s shared %s with you.\nView it: %s\n\n",
     "Cheers!" : "Поздрав!",
-    "Security Warning" : "Безбедносно предупредување",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
     "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>",
     "Username" : "Корисничко име",
diff --git a/core/l10n/ms_MY.js b/core/l10n/ms_MY.js
index db09b1bdb5e..708f07615da 100644
--- a/core/l10n/ms_MY.js
+++ b/core/l10n/ms_MY.js
@@ -44,7 +44,6 @@ OC.L10N.register(
     "Admin" : "Admin",
     "Help" : "Bantuan",
     "Access forbidden" : "Larangan akses",
-    "Security Warning" : "Amaran keselamatan",
     "Create an <strong>admin account</strong>" : "buat <strong>akaun admin</strong>",
     "Username" : "Nama pengguna",
     "Data folder" : "Fail data",
diff --git a/core/l10n/ms_MY.json b/core/l10n/ms_MY.json
index 6edc4ca9785..078304ee383 100644
--- a/core/l10n/ms_MY.json
+++ b/core/l10n/ms_MY.json
@@ -42,7 +42,6 @@
     "Admin" : "Admin",
     "Help" : "Bantuan",
     "Access forbidden" : "Larangan akses",
-    "Security Warning" : "Amaran keselamatan",
     "Create an <strong>admin account</strong>" : "buat <strong>akaun admin</strong>",
     "Username" : "Nama pengguna",
     "Data folder" : "Fail data",
diff --git a/core/l10n/my_MM.js b/core/l10n/my_MM.js
index 6133a6309db..a800e908dcd 100644
--- a/core/l10n/my_MM.js
+++ b/core/l10n/my_MM.js
@@ -32,7 +32,6 @@ OC.L10N.register(
     "Apps" : "Apps",
     "Admin" : "အက်ဒမင်",
     "Help" : "အကူအညီ",
-    "Security Warning" : "လုံခြုံရေးသတိပေးချက်",
     "Create an <strong>admin account</strong>" : "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
     "Username" : "သုံးစွဲသူအမည်",
     "Data folder" : "အချက်အလက်ဖိုလ်ဒါလ်",
diff --git a/core/l10n/my_MM.json b/core/l10n/my_MM.json
index 4a1c9d456dc..329fd194319 100644
--- a/core/l10n/my_MM.json
+++ b/core/l10n/my_MM.json
@@ -30,7 +30,6 @@
     "Apps" : "Apps",
     "Admin" : "အက်ဒမင်",
     "Help" : "အကူအညီ",
-    "Security Warning" : "လုံခြုံရေးသတိပေးချက်",
     "Create an <strong>admin account</strong>" : "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
     "Username" : "သုံးစွဲသူအမည်",
     "Data folder" : "အချက်အလက်ဖိုလ်ဒါလ်",
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
index 3b85a3298c1..8efe631dee9 100644
--- a/core/l10n/nb_NO.js
+++ b/core/l10n/nb_NO.js
@@ -72,7 +72,6 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Web-serveren din er ikke satt opp til å tillate synkronisering av filer ennå, fordi WebDAV-grensesnittet ikke ser ut til å virke.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne serveren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjeparts apper ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Vi anbefaler å aktivere en internett-forbindelse for denne serveren hvis du vil ha full funksjonalitet.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Vi anbefaler sterkt at du konfigurerer web-serveren slik at datamappen ikke kan aksesseres eller at du flytter datamappen ut av web-serverens dokumentrot.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Minne-cache er ikke konfigurert. Hvis mulig, konfigurer en minne-cache for å få bedre ytelse. Mer informasjon finnes <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">dokumentasjonen</a> vår.",
     "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-header \"{header}\" er ikke konfigurert lik \"{expected}\". Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "HTTP-header \"Strict-Transport-Security\" er ikke konfigurert til minst \"2,678,400\" sekunder. Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.",
@@ -86,7 +85,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Feil ved endring av tillatelser",
     "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}",
     "Shared with you by {owner}" : "Delt med deg av {owner}",
-    "Share with user or group …" : "Del med bruker eller gruppe …",
     "Share link" : "Del lenke",
     "The public link will expire no later than {days} days after it is created" : "Den offentlige lenken vil utløpe senest {days} dager etter at den lages",
     "Link" : "Lenke",
@@ -133,7 +131,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["last ned %n fil","last ned %n filer"],
     "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.",
     "Please reload the page." : "Vennligst last siden på nytt.",
-    "The update was unsuccessful. " : "Oppdateringen var mislykket.",
     "The update was successful. Redirecting you to ownCloud now." : "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud.",
     "Couldn't reset password because the token is invalid" : "Klarte ikke å tilbakestille passordet fordi token er ugyldig.",
     "Couldn't send reset email. Please make sure your username is correct." : "Klarte ikke å sende e-post for tilbakestilling av passord. Sjekk at brukernavnet ditt er korrekt.",
@@ -178,7 +175,6 @@ OC.L10N.register(
     "File: %s" : "Fil: %s",
     "Line: %s" : "Linje: %s",
     "Trace" : "Trace",
-    "Security Warning" : "Sikkerhetsadvarsel",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.",
     "Create an <strong>admin account</strong>" : "Opprett en <strong>administrator-konto</strong>",
@@ -192,7 +188,6 @@ OC.L10N.register(
     "Database name" : "Databasenavn",
     "Database tablespace" : "Database tabellområde",
     "Database host" : "Databasevert",
-    "Performance Warning" : "Advarsel om ytelse",
     "SQLite will be used as database." : "SQLite vil bli brukt som database.",
     "For larger installations we recommend to choose a different database backend." : "For større installasjoner anbefaler vi å velge en annen database.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering",
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
index 62942ba9cff..c5738f29b64 100644
--- a/core/l10n/nb_NO.json
+++ b/core/l10n/nb_NO.json
@@ -70,7 +70,6 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Web-serveren din er ikke satt opp til å tillate synkronisering av filer ennå, fordi WebDAV-grensesnittet ikke ser ut til å virke.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne serveren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjeparts apper ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Vi anbefaler å aktivere en internett-forbindelse for denne serveren hvis du vil ha full funksjonalitet.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Vi anbefaler sterkt at du konfigurerer web-serveren slik at datamappen ikke kan aksesseres eller at du flytter datamappen ut av web-serverens dokumentrot.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Minne-cache er ikke konfigurert. Hvis mulig, konfigurer en minne-cache for å få bedre ytelse. Mer informasjon finnes <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">dokumentasjonen</a> vår.",
     "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-header \"{header}\" er ikke konfigurert lik \"{expected}\". Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "HTTP-header \"Strict-Transport-Security\" er ikke konfigurert til minst \"2,678,400\" sekunder. Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.",
@@ -84,7 +83,6 @@
     "Error while changing permissions" : "Feil ved endring av tillatelser",
     "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}",
     "Shared with you by {owner}" : "Delt med deg av {owner}",
-    "Share with user or group …" : "Del med bruker eller gruppe …",
     "Share link" : "Del lenke",
     "The public link will expire no later than {days} days after it is created" : "Den offentlige lenken vil utløpe senest {days} dager etter at den lages",
     "Link" : "Lenke",
@@ -131,7 +129,6 @@
     "_download %n file_::_download %n files_" : ["last ned %n fil","last ned %n filer"],
     "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.",
     "Please reload the page." : "Vennligst last siden på nytt.",
-    "The update was unsuccessful. " : "Oppdateringen var mislykket.",
     "The update was successful. Redirecting you to ownCloud now." : "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud.",
     "Couldn't reset password because the token is invalid" : "Klarte ikke å tilbakestille passordet fordi token er ugyldig.",
     "Couldn't send reset email. Please make sure your username is correct." : "Klarte ikke å sende e-post for tilbakestilling av passord. Sjekk at brukernavnet ditt er korrekt.",
@@ -176,7 +173,6 @@
     "File: %s" : "Fil: %s",
     "Line: %s" : "Linje: %s",
     "Trace" : "Trace",
-    "Security Warning" : "Sikkerhetsadvarsel",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.",
     "Create an <strong>admin account</strong>" : "Opprett en <strong>administrator-konto</strong>",
@@ -190,7 +186,6 @@
     "Database name" : "Databasenavn",
     "Database tablespace" : "Database tabellområde",
     "Database host" : "Databasevert",
-    "Performance Warning" : "Advarsel om ytelse",
     "SQLite will be used as database." : "SQLite vil bli brukt som database.",
     "For larger installations we recommend to choose a different database backend." : "For større installasjoner anbefaler vi å velge en annen database.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index 2738ffc6785..281a9b15877 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -72,7 +72,7 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verstoord lijkt.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet.  We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om uw datadirectory te verplaatsen naar een locatie buiten de document root van de webserver.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kunt u de memcache configureren als die beschikbaar is. Meer informatie vind u in onze <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentatie</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kunt u de memcache configureren als die beschikbaar is. Meer informatie vind u in onze <a href=\"{docLink}\">documentatie</a>.",
     "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "De \"{header}\" HTTP header is niet overeenkomstig met \"{expected}\" geconfigureerd. Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "De \"Strict-Transport-Security\" HTTP header is niet geconfigureerd als minimaal \"2,678,400\" seconden. Dit is een mogelijk beveiligingsrisico en we adviseren deze instelling aan te passen.",
@@ -86,7 +86,9 @@ OC.L10N.register(
     "Error while changing permissions" : "Fout tijdens het veranderen van permissies",
     "Shared with you and the group {group} by {owner}" : "Gedeeld met u en de groep {group} door {owner}",
     "Shared with you by {owner}" : "Gedeeld met u door {owner}",
-    "Share with user or group …" : "Delen met gebruiker of groep ...",
+    "Share with users or groups …" : "Delen met gebruikers of groepen ...",
+    "Share with users, groups or remote users …" : "Delen met gebruikers, groepen of externe gebruikers ...",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Delen met mensen op andere ownClouds via de syntax gebruikersnaam@voorbeeld.org/owncloud",
     "Share link" : "Deel link",
     "The public link will expire no later than {days} days after it is created" : "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken",
     "Link" : "Link",
@@ -99,6 +101,7 @@ OC.L10N.register(
     "Set expiration date" : "Stel vervaldatum in",
     "Expiration" : "Vervaltermijn",
     "Expiration date" : "Vervaldatum",
+    "An error occured. Please try again" : "Er trad een fout op. Probeer het opnieuw",
     "Adding user..." : "Toevoegen gebruiker...",
     "group" : "groep",
     "remote" : "extern",
@@ -133,7 +136,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["download %n bestand","download %n bestanden"],
     "Updating {productName} to version {version}, this may take a while." : "Bijwerken {productName} naar versie {version}, dit kan even duren.",
     "Please reload the page." : "Herlaad deze pagina.",
-    "The update was unsuccessful. " : "De update is niet geslaagd.",
     "The update was successful. Redirecting you to ownCloud now." : "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
     "Couldn't reset password because the token is invalid" : "Kon het wachtwoord niet herstellen, omdat het token ongeldig is",
     "Couldn't send reset email. Please make sure your username is correct." : "Kon e-mail niet versturen. Verifieer of uw gebruikersnaam correct is.",
@@ -178,7 +180,7 @@ OC.L10N.register(
     "File: %s" : "Bestand: %s",
     "Line: %s" : "Regel: %s",
     "Trace" : "Trace",
-    "Security Warning" : "Beveiligingswaarschuwing",
+    "Security warning" : "Beveiligingswaarschuwing",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
     "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan",
@@ -192,18 +194,22 @@ OC.L10N.register(
     "Database name" : "Naam database",
     "Database tablespace" : "Database tablespace",
     "Database host" : "Databaseserver",
-    "Performance Warning" : "Prestatiewaarschuwing",
+    "Performance warning" : "Prestatiewaarschuwing",
     "SQLite will be used as database." : "SQLite wordt gebruikt als database.",
     "For larger installations we recommend to choose a different database backend." : "Voor grotere installaties adviseren we een andere database engine te kiezen.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Vooral wanneer de desktop client wordt gebruik voor bestandssynchronisatie wordt gebruik van sqlite afgeraden.",
     "Finish setup" : "Installatie afronden",
     "Finishing …" : "Afronden ...",
+    "Need help?" : "Hulp nodig?",
+    "See the documentation" : "Zie de documentatie",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Deze applicatie heeft JavaScript nodig. {linkstart}Activeer JavaScript{linkend} en ververs deze pagina.",
     "%s is available. Get more information on how to update." : "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
     "Log out" : "Afmelden",
     "Search" : "Zoeken",
     "Server side authentication failed!" : "Authenticatie bij de server mislukte!",
     "Please contact your administrator." : "Neem contact op met uw systeembeheerder.",
+    "An internal error occured." : "Er heeft zich een interne fout voorgedaan.",
+    "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met uw beheerder.",
     "Forgot your password? Reset it!" : "Wachtwoord vergeten? Herstel het!",
     "remember" : "onthoud gegevens",
     "Log in" : "Meld u aan",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index 6fd11c98302..8768952b592 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -70,7 +70,7 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verstoord lijkt.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet.  We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om uw datadirectory te verplaatsen naar een locatie buiten de document root van de webserver.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kunt u de memcache configureren als die beschikbaar is. Meer informatie vind u in onze <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentatie</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kunt u de memcache configureren als die beschikbaar is. Meer informatie vind u in onze <a href=\"{docLink}\">documentatie</a>.",
     "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "De \"{header}\" HTTP header is niet overeenkomstig met \"{expected}\" geconfigureerd. Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "De \"Strict-Transport-Security\" HTTP header is niet geconfigureerd als minimaal \"2,678,400\" seconden. Dit is een mogelijk beveiligingsrisico en we adviseren deze instelling aan te passen.",
@@ -84,7 +84,9 @@
     "Error while changing permissions" : "Fout tijdens het veranderen van permissies",
     "Shared with you and the group {group} by {owner}" : "Gedeeld met u en de groep {group} door {owner}",
     "Shared with you by {owner}" : "Gedeeld met u door {owner}",
-    "Share with user or group …" : "Delen met gebruiker of groep ...",
+    "Share with users or groups …" : "Delen met gebruikers of groepen ...",
+    "Share with users, groups or remote users …" : "Delen met gebruikers, groepen of externe gebruikers ...",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Delen met mensen op andere ownClouds via de syntax gebruikersnaam@voorbeeld.org/owncloud",
     "Share link" : "Deel link",
     "The public link will expire no later than {days} days after it is created" : "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken",
     "Link" : "Link",
@@ -97,6 +99,7 @@
     "Set expiration date" : "Stel vervaldatum in",
     "Expiration" : "Vervaltermijn",
     "Expiration date" : "Vervaldatum",
+    "An error occured. Please try again" : "Er trad een fout op. Probeer het opnieuw",
     "Adding user..." : "Toevoegen gebruiker...",
     "group" : "groep",
     "remote" : "extern",
@@ -131,7 +134,6 @@
     "_download %n file_::_download %n files_" : ["download %n bestand","download %n bestanden"],
     "Updating {productName} to version {version}, this may take a while." : "Bijwerken {productName} naar versie {version}, dit kan even duren.",
     "Please reload the page." : "Herlaad deze pagina.",
-    "The update was unsuccessful. " : "De update is niet geslaagd.",
     "The update was successful. Redirecting you to ownCloud now." : "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
     "Couldn't reset password because the token is invalid" : "Kon het wachtwoord niet herstellen, omdat het token ongeldig is",
     "Couldn't send reset email. Please make sure your username is correct." : "Kon e-mail niet versturen. Verifieer of uw gebruikersnaam correct is.",
@@ -176,7 +178,7 @@
     "File: %s" : "Bestand: %s",
     "Line: %s" : "Regel: %s",
     "Trace" : "Trace",
-    "Security Warning" : "Beveiligingswaarschuwing",
+    "Security warning" : "Beveiligingswaarschuwing",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
     "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan",
@@ -190,18 +192,22 @@
     "Database name" : "Naam database",
     "Database tablespace" : "Database tablespace",
     "Database host" : "Databaseserver",
-    "Performance Warning" : "Prestatiewaarschuwing",
+    "Performance warning" : "Prestatiewaarschuwing",
     "SQLite will be used as database." : "SQLite wordt gebruikt als database.",
     "For larger installations we recommend to choose a different database backend." : "Voor grotere installaties adviseren we een andere database engine te kiezen.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Vooral wanneer de desktop client wordt gebruik voor bestandssynchronisatie wordt gebruik van sqlite afgeraden.",
     "Finish setup" : "Installatie afronden",
     "Finishing …" : "Afronden ...",
+    "Need help?" : "Hulp nodig?",
+    "See the documentation" : "Zie de documentatie",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Deze applicatie heeft JavaScript nodig. {linkstart}Activeer JavaScript{linkend} en ververs deze pagina.",
     "%s is available. Get more information on how to update." : "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
     "Log out" : "Afmelden",
     "Search" : "Zoeken",
     "Server side authentication failed!" : "Authenticatie bij de server mislukte!",
     "Please contact your administrator." : "Neem contact op met uw systeembeheerder.",
+    "An internal error occured." : "Er heeft zich een interne fout voorgedaan.",
+    "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met uw beheerder.",
     "Forgot your password? Reset it!" : "Wachtwoord vergeten? Herstel het!",
     "remember" : "onthoud gegevens",
     "Log in" : "Meld u aan",
diff --git a/core/l10n/nn_NO.js b/core/l10n/nn_NO.js
index cdead69db1d..126d5d9f2c3 100644
--- a/core/l10n/nn_NO.js
+++ b/core/l10n/nn_NO.js
@@ -94,7 +94,6 @@ OC.L10N.register(
     "Admin" : "Admin",
     "Help" : "Hjelp",
     "Access forbidden" : "Tilgang forbudt",
-    "Security Warning" : "Tryggleiksåtvaring",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
     "Create an <strong>admin account</strong>" : "Lag ein <strong>admin-konto</strong>",
diff --git a/core/l10n/nn_NO.json b/core/l10n/nn_NO.json
index 0d74ec59611..081b51240bb 100644
--- a/core/l10n/nn_NO.json
+++ b/core/l10n/nn_NO.json
@@ -92,7 +92,6 @@
     "Admin" : "Admin",
     "Help" : "Hjelp",
     "Access forbidden" : "Tilgang forbudt",
-    "Security Warning" : "Tryggleiksåtvaring",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
     "Create an <strong>admin account</strong>" : "Lag ein <strong>admin-konto</strong>",
diff --git a/core/l10n/oc.js b/core/l10n/oc.js
index fe0fc3d543c..d09e9cca979 100644
--- a/core/l10n/oc.js
+++ b/core/l10n/oc.js
@@ -57,7 +57,6 @@ OC.L10N.register(
     "Admin" : "Admin",
     "Help" : "Ajuda",
     "Access forbidden" : "Acces enebit",
-    "Security Warning" : "Avertiment de securitat",
     "Create an <strong>admin account</strong>" : "Crea un <strong>compte admin</strong>",
     "Username" : "Non d'usancièr",
     "Data folder" : "Dorsièr de donadas",
diff --git a/core/l10n/oc.json b/core/l10n/oc.json
index a34d64bf875..df752a7b65b 100644
--- a/core/l10n/oc.json
+++ b/core/l10n/oc.json
@@ -55,7 +55,6 @@
     "Admin" : "Admin",
     "Help" : "Ajuda",
     "Access forbidden" : "Acces enebit",
-    "Security Warning" : "Avertiment de securitat",
     "Create an <strong>admin account</strong>" : "Crea un <strong>compte admin</strong>",
     "Username" : "Non d'usancièr",
     "Data folder" : "Dorsièr de donadas",
diff --git a/core/l10n/pa.js b/core/l10n/pa.js
index 40b9ee2734b..49a40a64edd 100644
--- a/core/l10n/pa.js
+++ b/core/l10n/pa.js
@@ -33,7 +33,6 @@ OC.L10N.register(
     "Send" : "ਭੇਜੋ",
     "Warning" : "ਚੇਤਾਵਨੀ",
     "Delete" : "ਹਟਾਓ",
-    "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Search" : "ਖੋਜ"
 },
diff --git a/core/l10n/pa.json b/core/l10n/pa.json
index 37c6d47c628..ef4e2e23271 100644
--- a/core/l10n/pa.json
+++ b/core/l10n/pa.json
@@ -31,7 +31,6 @@
     "Send" : "ਭੇਜੋ",
     "Warning" : "ਚੇਤਾਵਨੀ",
     "Delete" : "ਹਟਾਓ",
-    "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Search" : "ਖੋਜ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/pl.js b/core/l10n/pl.js
index 1b4f717bc9d..9e29fa3fdb2 100644
--- a/core/l10n/pl.js
+++ b/core/l10n/pl.js
@@ -77,7 +77,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Błąd przy zmianie uprawnień",
     "Shared with you and the group {group} by {owner}" : "Udostępnione tobie i grupie {group} przez {owner}",
     "Shared with you by {owner}" : "Udostępnione tobie przez {owner}",
-    "Share with user or group …" : "Współdziel z użytkownikiem lub grupą ...",
     "Share link" : "Udostępnij link",
     "The public link will expire no later than {days} days after it is created" : "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
     "Link" : "Odnośnik",
@@ -124,7 +123,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["pobrano %n plik","pobrano %n plików","pobrano %n plików"],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizuję {productName} do wersji {version}, to może chwilę potrwać.",
     "Please reload the page." : "Proszę przeładować stronę",
-    "The update was unsuccessful. " : "Aktualizowanie zakończyło się niepowodzeniem.",
     "The update was successful. Redirecting you to ownCloud now." : "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
     "Couldn't reset password because the token is invalid" : "Nie można zresetować hasła, ponieważ token jest niepoprawny",
     "Couldn't send reset email. Please make sure your username is correct." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika jest poprawna.",
@@ -167,7 +165,6 @@ OC.L10N.register(
     "File: %s" : "Plik: %s",
     "Line: %s" : "Linia: %s",
     "Trace" : "Ślad",
-    "Security Warning" : "Ostrzeżenie o zabezpieczeniach",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
     "Create an <strong>admin account</strong>" : "Utwórz <strong>konta administratora</strong>",
diff --git a/core/l10n/pl.json b/core/l10n/pl.json
index 3c9a765e481..c409928e26f 100644
--- a/core/l10n/pl.json
+++ b/core/l10n/pl.json
@@ -75,7 +75,6 @@
     "Error while changing permissions" : "Błąd przy zmianie uprawnień",
     "Shared with you and the group {group} by {owner}" : "Udostępnione tobie i grupie {group} przez {owner}",
     "Shared with you by {owner}" : "Udostępnione tobie przez {owner}",
-    "Share with user or group …" : "Współdziel z użytkownikiem lub grupą ...",
     "Share link" : "Udostępnij link",
     "The public link will expire no later than {days} days after it is created" : "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
     "Link" : "Odnośnik",
@@ -122,7 +121,6 @@
     "_download %n file_::_download %n files_" : ["pobrano %n plik","pobrano %n plików","pobrano %n plików"],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizuję {productName} do wersji {version}, to może chwilę potrwać.",
     "Please reload the page." : "Proszę przeładować stronę",
-    "The update was unsuccessful. " : "Aktualizowanie zakończyło się niepowodzeniem.",
     "The update was successful. Redirecting you to ownCloud now." : "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
     "Couldn't reset password because the token is invalid" : "Nie można zresetować hasła, ponieważ token jest niepoprawny",
     "Couldn't send reset email. Please make sure your username is correct." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika jest poprawna.",
@@ -165,7 +163,6 @@
     "File: %s" : "Plik: %s",
     "Line: %s" : "Linia: %s",
     "Trace" : "Ślad",
-    "Security Warning" : "Ostrzeżenie o zabezpieczeniach",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
     "Create an <strong>admin account</strong>" : "Utwórz <strong>konta administratora</strong>",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 5c7ef0363d5..de7cf71dd49 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -72,6 +72,7 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Seu servidor web ainda não está configurado corretamente para permitir a sincronização de arquivos, pois a interface WebDAV parece ser desconfigurada.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Este servidor não tem nenhuma conexão com a Internet. Isto significa que algumas das características como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de terceiros não vai funcionar. Acessar arquivos remotamente e envio de e-mails de notificação pode não funcionar, também. Sugerimos permitir conexão com a Internet para este servidor, se você quer ter todas as funcionalidades.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "O seu diretório de dados e os arquivos estão, provavelmente, acessíveis a partir da Internet. O arquivo .htaccess não está funcionando. Nós sugerimos que você configure o servidor web de uma forma que o diretório de dados não seja acessível ou mova o diretório de dados para fora do diretório raiz de documentos do servidor web.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nenhum cache de memória foi configurado. Para melhorar o seu desempenho, por favor configurar um cache de memória, se disponível. Mais informações podem ser encontradas em nossa <a href=\"{docLink}\"> documentação </a>.",
     "Error occurred while checking server setup" : "Erro ao verificar a configuração do servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O \"{header}\" cabeçalho HTTP não está configurado igual ao \"{expected}\". Este é um risco potencial para a segurança e recomendamos ajustar essa configuração.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "O \"Strict-Transport-Security\" cabeçalho HTTP não está configurado para pelo menos \"2.678.400\" segundos. Este é um risco potencial para a segurança e recomendamos ajustar essa configuração.",
@@ -85,7 +86,9 @@ OC.L10N.register(
     "Error while changing permissions" : "Erro ao mudar permissões",
     "Shared with you and the group {group} by {owner}" : "Compartilhado com você e com o grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartilhado com você por {owner}",
-    "Share with user or group …" : "Compartilhar com usuário ou grupo ...",
+    "Share with users or groups …" : "Compartilhar com usuários ou grupos ...",
+    "Share with users, groups or remote users …" : "Compartilhar com usuários, grupos ou usuários remoto ...",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhar com usuários em outros ownClouds usando a sintaxe username@example.com/owncloud",
     "Share link" : "Compartilhar link",
     "The public link will expire no later than {days} days after it is created" : "O link público irá expirar não antes de {days} depois de ser criado",
     "Link" : "Link",
@@ -98,6 +101,7 @@ OC.L10N.register(
     "Set expiration date" : "Definir data de expiração",
     "Expiration" : "Expiração",
     "Expiration date" : "Data de expiração",
+    "An error occured. Please try again" : "Ocorreu um erro. Por favor tente novamente",
     "Adding user..." : "Adicionando usuário...",
     "group" : "grupo",
     "remote" : "remoto",
@@ -132,7 +136,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["baixar %n arquivo","baixar %n arquivos"],
     "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.",
     "Please reload the page." : "Por favor recarregue a página",
-    "The update was unsuccessful. " : "A atualização não foi bem sucedida.",
     "The update was successful. Redirecting you to ownCloud now." : "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
     "Couldn't reset password because the token is invalid" : "Não foi possível redefinir a senha porque o token é inválido",
     "Couldn't send reset email. Please make sure your username is correct." : "Não foi possível enviar e-mail de redefinição. Verifique se o seu nome de usuário está correto.",
@@ -176,7 +179,7 @@ OC.L10N.register(
     "File: %s" : "Arquivo: %s",
     "Line: %s" : "Linha: %s",
     "Trace" : "Rastreamento",
-    "Security Warning" : "Aviso de Segurança",
+    "Security warning" : "Alerta de Segurança",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
     "Create an <strong>admin account</strong>" : "Criar uma <strong>conta de administrador</strong>",
@@ -190,18 +193,22 @@ OC.L10N.register(
     "Database name" : "Nome do banco de dados",
     "Database tablespace" : "Espaço de tabela do banco de dados",
     "Database host" : "Host do banco de dados",
-    "Performance Warning" : "Alerta de Desempenho",
+    "Performance warning" : "Performance de alerta",
     "SQLite will be used as database." : "SQLite será usado como banco de dados",
     "For larger installations we recommend to choose a different database backend." : "Para instalações maiores é recomendável escolher um backend de banco de dados diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.",
     "Finish setup" : "Concluir configuração",
     "Finishing …" : "Finalizando ...",
+    "Need help?" : "Precisa de ajuda?",
+    "See the documentation" : "Veja a documentação",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicação requer JavaScript para sua correta operação. Por favor {linkstart}habilite JavaScript{linkend} e recerregue a página.",
     "%s is available. Get more information on how to update." : "%s está disponível. Obtenha mais informações sobre como atualizar.",
     "Log out" : "Sair",
     "Search" : "Perquisar",
     "Server side authentication failed!" : "Autenticação do servidor falhou!",
     "Please contact your administrator." : "Por favor, contate o administrador.",
+    "An internal error occured." : "Ocorreu um erro interno.",
+    "Please try again or contact your administrator." : "Por favor tente novamente ou faça contato com o seu administrador.",
     "Forgot your password? Reset it!" : "Esqueceu sua senha? Redefini-la!",
     "remember" : "lembrar",
     "Log in" : "Fazer login",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 9f74215f3ff..7017e79a0ab 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -70,6 +70,7 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Seu servidor web ainda não está configurado corretamente para permitir a sincronização de arquivos, pois a interface WebDAV parece ser desconfigurada.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Este servidor não tem nenhuma conexão com a Internet. Isto significa que algumas das características como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de terceiros não vai funcionar. Acessar arquivos remotamente e envio de e-mails de notificação pode não funcionar, também. Sugerimos permitir conexão com a Internet para este servidor, se você quer ter todas as funcionalidades.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "O seu diretório de dados e os arquivos estão, provavelmente, acessíveis a partir da Internet. O arquivo .htaccess não está funcionando. Nós sugerimos que você configure o servidor web de uma forma que o diretório de dados não seja acessível ou mova o diretório de dados para fora do diretório raiz de documentos do servidor web.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nenhum cache de memória foi configurado. Para melhorar o seu desempenho, por favor configurar um cache de memória, se disponível. Mais informações podem ser encontradas em nossa <a href=\"{docLink}\"> documentação </a>.",
     "Error occurred while checking server setup" : "Erro ao verificar a configuração do servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O \"{header}\" cabeçalho HTTP não está configurado igual ao \"{expected}\". Este é um risco potencial para a segurança e recomendamos ajustar essa configuração.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "O \"Strict-Transport-Security\" cabeçalho HTTP não está configurado para pelo menos \"2.678.400\" segundos. Este é um risco potencial para a segurança e recomendamos ajustar essa configuração.",
@@ -83,7 +84,9 @@
     "Error while changing permissions" : "Erro ao mudar permissões",
     "Shared with you and the group {group} by {owner}" : "Compartilhado com você e com o grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartilhado com você por {owner}",
-    "Share with user or group …" : "Compartilhar com usuário ou grupo ...",
+    "Share with users or groups …" : "Compartilhar com usuários ou grupos ...",
+    "Share with users, groups or remote users …" : "Compartilhar com usuários, grupos ou usuários remoto ...",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhar com usuários em outros ownClouds usando a sintaxe username@example.com/owncloud",
     "Share link" : "Compartilhar link",
     "The public link will expire no later than {days} days after it is created" : "O link público irá expirar não antes de {days} depois de ser criado",
     "Link" : "Link",
@@ -96,6 +99,7 @@
     "Set expiration date" : "Definir data de expiração",
     "Expiration" : "Expiração",
     "Expiration date" : "Data de expiração",
+    "An error occured. Please try again" : "Ocorreu um erro. Por favor tente novamente",
     "Adding user..." : "Adicionando usuário...",
     "group" : "grupo",
     "remote" : "remoto",
@@ -130,7 +134,6 @@
     "_download %n file_::_download %n files_" : ["baixar %n arquivo","baixar %n arquivos"],
     "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.",
     "Please reload the page." : "Por favor recarregue a página",
-    "The update was unsuccessful. " : "A atualização não foi bem sucedida.",
     "The update was successful. Redirecting you to ownCloud now." : "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
     "Couldn't reset password because the token is invalid" : "Não foi possível redefinir a senha porque o token é inválido",
     "Couldn't send reset email. Please make sure your username is correct." : "Não foi possível enviar e-mail de redefinição. Verifique se o seu nome de usuário está correto.",
@@ -174,7 +177,7 @@
     "File: %s" : "Arquivo: %s",
     "Line: %s" : "Linha: %s",
     "Trace" : "Rastreamento",
-    "Security Warning" : "Aviso de Segurança",
+    "Security warning" : "Alerta de Segurança",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
     "Create an <strong>admin account</strong>" : "Criar uma <strong>conta de administrador</strong>",
@@ -188,18 +191,22 @@
     "Database name" : "Nome do banco de dados",
     "Database tablespace" : "Espaço de tabela do banco de dados",
     "Database host" : "Host do banco de dados",
-    "Performance Warning" : "Alerta de Desempenho",
+    "Performance warning" : "Performance de alerta",
     "SQLite will be used as database." : "SQLite será usado como banco de dados",
     "For larger installations we recommend to choose a different database backend." : "Para instalações maiores é recomendável escolher um backend de banco de dados diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.",
     "Finish setup" : "Concluir configuração",
     "Finishing …" : "Finalizando ...",
+    "Need help?" : "Precisa de ajuda?",
+    "See the documentation" : "Veja a documentação",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicação requer JavaScript para sua correta operação. Por favor {linkstart}habilite JavaScript{linkend} e recerregue a página.",
     "%s is available. Get more information on how to update." : "%s está disponível. Obtenha mais informações sobre como atualizar.",
     "Log out" : "Sair",
     "Search" : "Perquisar",
     "Server side authentication failed!" : "Autenticação do servidor falhou!",
     "Please contact your administrator." : "Por favor, contate o administrador.",
+    "An internal error occured." : "Ocorreu um erro interno.",
+    "Please try again or contact your administrator." : "Por favor tente novamente ou faça contato com o seu administrador.",
     "Forgot your password? Reset it!" : "Esqueceu sua senha? Redefini-la!",
     "remember" : "lembrar",
     "Log in" : "Fazer login",
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index e213d23a929..9e5522497f7 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -72,7 +72,7 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Este servidor ownCloud não tem uma ligação de Internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos, notificações sobre actualizações, ou a instalação de aplicações de terceiros não irá funcionar. Aceder aos ficheiros remotamente e enviar notificações de email poderão não funcionar também. Sugerimos que active uma ligação à Internet se pretende obter todas as funcionalidades do ownCloud.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. O seu ficheiro .htaccess não está a funcionar corretamente. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Nenhuma cache de memória foi configurada. Para melhorar o seu desempenho, por favor configure a memcache se possível. Pode encontrar mais informação na nossa <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentação</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nenhuma memória de cache foi configurada. Se possível configure-a de forma a optimizar o desempenho. Mais informações podem ser encontradas na <a href=\"{docLink}\">documentação</a>.",
     "Error occurred while checking server setup" : "Ocorreu um erro durante a verificação da configuração do servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O cabeçalho HTTP \"{header}\" não está configurado para igualar \"{expected}\". Isto é um potencial risco de segurança ou privacidade e recomendamos que o corrija.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "O cabeçalho HTTP \"Strict-Transport-Security\" não está configurado para um mínimo de \"2,678,400\" segundos. Isto é um potencial risco de segurança e recomendamos que o corrija.",
@@ -86,7 +86,8 @@ OC.L10N.register(
     "Error while changing permissions" : "Erro ao mudar permissões",
     "Shared with you and the group {group} by {owner}" : "Partilhado consigo e com o grupo {group} por {owner}",
     "Shared with you by {owner}" : "Partilhado consigo por {owner}",
-    "Share with user or group …" : "Partilhar com utilizador ou grupo...",
+    "Share with users or groups …" : "Partilhar com utilizadores ou grupos...",
+    "Share with users, groups or remote users …" : "Partilhar com utilizadores, grupos ou utilizadores remotos...",
     "Share link" : "Compartilhar hiperligação",
     "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
     "Link" : "Hiperligação",
@@ -99,6 +100,7 @@ OC.L10N.register(
     "Set expiration date" : "Definir a data de expiração",
     "Expiration" : "Data de expiração",
     "Expiration date" : "Data de expiração",
+    "An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo",
     "Adding user..." : "A adicionar o utilizador ...",
     "group" : "grupo",
     "remote" : "remoto",
@@ -133,7 +135,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["transferir %n ficheiro","transferir %n ficheiros"],
     "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
     "Please reload the page." : "Por favor, recarregue a página.",
-    "The update was unsuccessful. " : "Não foi possível atualizar.",
     "The update was successful. Redirecting you to ownCloud now." : "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
     "Couldn't reset password because the token is invalid" : "Não foi possível repor a palavra-passe porque a senha é inválida",
     "Couldn't send reset email. Please make sure your username is correct." : "Ocorreu um problema com o envio do e-mail, por favor confirme o seu utilizador.",
@@ -178,7 +179,7 @@ OC.L10N.register(
     "File: %s" : "Ficheiro: %s",
     "Line: %s" : "Linha: %s",
     "Trace" : "Rasto",
-    "Security Warning" : "Aviso de Segurança",
+    "Security warning" : "Aviso de Segurança",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
     "Create an <strong>admin account</strong>" : "Criar uma <strong>conta administrativa</strong>",
@@ -192,18 +193,22 @@ OC.L10N.register(
     "Database name" : "Nome da base de dados",
     "Database tablespace" : "Tablespace da base de dados",
     "Database host" : "Anfitrião da base de dados",
-    "Performance Warning" : "Aviso de Desempenho",
+    "Performance warning" : "Aviso de Desempenho",
     "SQLite will be used as database." : "SQLite será usado como base de dados.",
     "For larger installations we recommend to choose a different database backend." : "Para instalações maiores, nós recomendamos que escolha uma interface de base de dados diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "O uso de SQLite é desencorajado especialmente se estiver a pensar em dar uso ao cliente desktop para sincronizar os seus ficheiros no seu computador.",
     "Finish setup" : "Terminar consiguração",
     "Finishing …" : "A terminar...",
+    "Need help?" : "Precisa de ajuda?",
+    "See the documentation" : "Veja a documentação",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicação requer JavaScript para funcionar correctamente. Por favor, {linkstart}active o JavaScript{linkend} e recarregue a página.",
     "%s is available. Get more information on how to update." : "%s está disponível. Tenha mais informações como actualizar.",
     "Log out" : "Terminar sessão",
     "Search" : "Procurar",
     "Server side authentication failed!" : "Autenticação do lado do servidor falhou!",
     "Please contact your administrator." : "Por favor contacte o administrador.",
+    "An internal error occured." : "Ocorreu um erro interno.",
+    "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.",
     "Forgot your password? Reset it!" : "Esqueceu-se da sua palavra-passe? Recupere-a!",
     "remember" : "lembrar",
     "Log in" : "Entrar",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index 16670eaaf84..66865fc97d0 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -70,7 +70,7 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Este servidor ownCloud não tem uma ligação de Internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos, notificações sobre actualizações, ou a instalação de aplicações de terceiros não irá funcionar. Aceder aos ficheiros remotamente e enviar notificações de email poderão não funcionar também. Sugerimos que active uma ligação à Internet se pretende obter todas as funcionalidades do ownCloud.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. O seu ficheiro .htaccess não está a funcionar corretamente. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Nenhuma cache de memória foi configurada. Para melhorar o seu desempenho, por favor configure a memcache se possível. Pode encontrar mais informação na nossa <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentação</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nenhuma memória de cache foi configurada. Se possível configure-a de forma a optimizar o desempenho. Mais informações podem ser encontradas na <a href=\"{docLink}\">documentação</a>.",
     "Error occurred while checking server setup" : "Ocorreu um erro durante a verificação da configuração do servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O cabeçalho HTTP \"{header}\" não está configurado para igualar \"{expected}\". Isto é um potencial risco de segurança ou privacidade e recomendamos que o corrija.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "O cabeçalho HTTP \"Strict-Transport-Security\" não está configurado para um mínimo de \"2,678,400\" segundos. Isto é um potencial risco de segurança e recomendamos que o corrija.",
@@ -84,7 +84,8 @@
     "Error while changing permissions" : "Erro ao mudar permissões",
     "Shared with you and the group {group} by {owner}" : "Partilhado consigo e com o grupo {group} por {owner}",
     "Shared with you by {owner}" : "Partilhado consigo por {owner}",
-    "Share with user or group …" : "Partilhar com utilizador ou grupo...",
+    "Share with users or groups …" : "Partilhar com utilizadores ou grupos...",
+    "Share with users, groups or remote users …" : "Partilhar com utilizadores, grupos ou utilizadores remotos...",
     "Share link" : "Compartilhar hiperligação",
     "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
     "Link" : "Hiperligação",
@@ -97,6 +98,7 @@
     "Set expiration date" : "Definir a data de expiração",
     "Expiration" : "Data de expiração",
     "Expiration date" : "Data de expiração",
+    "An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo",
     "Adding user..." : "A adicionar o utilizador ...",
     "group" : "grupo",
     "remote" : "remoto",
@@ -131,7 +133,6 @@
     "_download %n file_::_download %n files_" : ["transferir %n ficheiro","transferir %n ficheiros"],
     "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
     "Please reload the page." : "Por favor, recarregue a página.",
-    "The update was unsuccessful. " : "Não foi possível atualizar.",
     "The update was successful. Redirecting you to ownCloud now." : "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
     "Couldn't reset password because the token is invalid" : "Não foi possível repor a palavra-passe porque a senha é inválida",
     "Couldn't send reset email. Please make sure your username is correct." : "Ocorreu um problema com o envio do e-mail, por favor confirme o seu utilizador.",
@@ -176,7 +177,7 @@
     "File: %s" : "Ficheiro: %s",
     "Line: %s" : "Linha: %s",
     "Trace" : "Rasto",
-    "Security Warning" : "Aviso de Segurança",
+    "Security warning" : "Aviso de Segurança",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
     "Create an <strong>admin account</strong>" : "Criar uma <strong>conta administrativa</strong>",
@@ -190,18 +191,22 @@
     "Database name" : "Nome da base de dados",
     "Database tablespace" : "Tablespace da base de dados",
     "Database host" : "Anfitrião da base de dados",
-    "Performance Warning" : "Aviso de Desempenho",
+    "Performance warning" : "Aviso de Desempenho",
     "SQLite will be used as database." : "SQLite será usado como base de dados.",
     "For larger installations we recommend to choose a different database backend." : "Para instalações maiores, nós recomendamos que escolha uma interface de base de dados diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "O uso de SQLite é desencorajado especialmente se estiver a pensar em dar uso ao cliente desktop para sincronizar os seus ficheiros no seu computador.",
     "Finish setup" : "Terminar consiguração",
     "Finishing …" : "A terminar...",
+    "Need help?" : "Precisa de ajuda?",
+    "See the documentation" : "Veja a documentação",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicação requer JavaScript para funcionar correctamente. Por favor, {linkstart}active o JavaScript{linkend} e recarregue a página.",
     "%s is available. Get more information on how to update." : "%s está disponível. Tenha mais informações como actualizar.",
     "Log out" : "Terminar sessão",
     "Search" : "Procurar",
     "Server side authentication failed!" : "Autenticação do lado do servidor falhou!",
     "Please contact your administrator." : "Por favor contacte o administrador.",
+    "An internal error occured." : "Ocorreu um erro interno.",
+    "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.",
     "Forgot your password? Reset it!" : "Esqueceu-se da sua palavra-passe? Recupere-a!",
     "remember" : "lembrar",
     "Log in" : "Entrar",
diff --git a/core/l10n/ro.js b/core/l10n/ro.js
index 275a01ab913..dbf3fd9e20c 100644
--- a/core/l10n/ro.js
+++ b/core/l10n/ro.js
@@ -62,7 +62,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Eroare la modificarea permisiunilor",
     "Shared with you and the group {group} by {owner}" : "Distribuie cu tine si grupul {group} de {owner}",
     "Shared with you by {owner}" : "Distribuie cu tine de {owner}",
-    "Share with user or group …" : "Partajeaza cu utilizator sau cu grup",
     "Share link" : "Share link",
     "The public link will expire no later than {days} days after it is created" : "Legătura publică va expira nu mai târziu de {days} zile de la ziua creării",
     "Link" : "Legătură",
@@ -112,7 +111,6 @@ OC.L10N.register(
     "Tag already exists" : "Eticheta deja există",
     "Access forbidden" : "Acces restricționat",
     "The share will expire on %s." : "Partajarea va expira în data de %s.",
-    "Security Warning" : "Avertisment de securitate",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
     "Create an <strong>admin account</strong>" : "Crează un <strong>cont de administrator</strong>",
diff --git a/core/l10n/ro.json b/core/l10n/ro.json
index 83c28507549..58c3168fe2b 100644
--- a/core/l10n/ro.json
+++ b/core/l10n/ro.json
@@ -60,7 +60,6 @@
     "Error while changing permissions" : "Eroare la modificarea permisiunilor",
     "Shared with you and the group {group} by {owner}" : "Distribuie cu tine si grupul {group} de {owner}",
     "Shared with you by {owner}" : "Distribuie cu tine de {owner}",
-    "Share with user or group …" : "Partajeaza cu utilizator sau cu grup",
     "Share link" : "Share link",
     "The public link will expire no later than {days} days after it is created" : "Legătura publică va expira nu mai târziu de {days} zile de la ziua creării",
     "Link" : "Legătură",
@@ -110,7 +109,6 @@
     "Tag already exists" : "Eticheta deja există",
     "Access forbidden" : "Acces restricționat",
     "The share will expire on %s." : "Partajarea va expira în data de %s.",
-    "Security Warning" : "Avertisment de securitate",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
     "Create an <strong>admin account</strong>" : "Crează un <strong>cont de administrator</strong>",
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index 974a72c22d0..7fa45910837 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -72,6 +72,7 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ваш веб-сервер еще не настроен должным образом, чтобы позволить синхронизацию файлов, потому что интерфейс WebDAV, кажется, испорчен.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Этот сервер не имеет подключения к Интернету. Это означает, что некоторые из функций, таких как внешнее хранилище, уведомления об обновлениях и установки сторонних приложений не будут работать. Доступ к файлам удаленно и отправки уведомлений по почте могут не работать. Мы предлагаем включить подключение к Интернету для этого сервера, если вы хотите, чтобы все функции работали.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ваш каталог данных и ваши файлы возможно доступны из интернете. .htaccess файл не работает. Мы настоятельно рекомендуем вам настроить ваш веб сервер таким образом, что-бы каталог данных не был больше доступен или переместите каталог данных за пределы корня веб сервера.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Не настроена система кеширования. Для увеличения производительности сервера, по возможности, настройте memcache. Более подробную информацию, вы можете посмотреть в нашей <a href=\"{docLink}\">документации</a>.",
     "Error occurred while checking server setup" : "Произошла ошибка при проверке настроек сервера",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Заголовок HTTP \"{header}\" не настроен на ожидаемый \"{expected}\". Это потенциальная проблема безопасности и мы рекомендуем изменить эти настройки.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "Заголовок HTTP \"Strict-Transport-Security\" должен быть настроен по крайней мере на \"2,678,400\" секунд. Это потенциальная проблема безопасности и мы рекомендуем изменить эти настройки.",
@@ -85,7 +86,9 @@ OC.L10N.register(
     "Error while changing permissions" : "При изменении прав доступа произошла ошибка",
     "Shared with you and the group {group} by {owner}" : "{owner} поделился с вами и группой {group} ",
     "Shared with you by {owner}" : "С вами поделился {owner} ",
-    "Share with user or group …" : "Поделиться с пользователем или группой...",
+    "Share with users or groups …" : "Поделиться с пользователями или группами ...",
+    "Share with users, groups or remote users …" : "Поделиться с пользователями, группами или удаленными пользователями ...",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах ownCloud используя синтакс username@example.com/owncloud",
     "Share link" : "Поделиться ссылкой",
     "The public link will expire no later than {days} days after it is created" : "Срок действия публичной ссылки истекает не позже чем через {days} дней после её создания",
     "Link" : "Ссылка",
@@ -132,7 +135,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["скачать %n файл","скачать %n файла","скачать %n файлов"],
     "Updating {productName} to version {version}, this may take a while." : "Идет обновление {productName} до версии {version}, пожалуйста, подождите.",
     "Please reload the page." : "Обновите страницу.",
-    "The update was unsuccessful. " : "Обновление не удалось.",
     "The update was successful. Redirecting you to ownCloud now." : "Обновление прошло успешно. Перенаправляем в ownCloud.",
     "Couldn't reset password because the token is invalid" : "Невозможно сбросить пароль из-за неверного токена",
     "Couldn't send reset email. Please make sure your username is correct." : "Не удалось отправить письмо для сброса пароля. Убедитесь, что имя пользователя указано верно.",
@@ -177,7 +179,7 @@ OC.L10N.register(
     "File: %s" : "Файл: %s",
     "Line: %s" : "Линия: %s",
     "Trace" : "След",
-    "Security Warning" : "Предупреждение безопасности",
+    "Security warning" : "Предупреждение безопасности",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Правила файла .htaccess не выполняются, возможно, каталог данных и файлы свободно доступны из интернета.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Что-бы правильно настроить сервер, руководствуйтесь <a hrev=\"%s\"target=\"blank\">документацией</a>.",
     "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>",
@@ -191,12 +193,14 @@ OC.L10N.register(
     "Database name" : "Название базы данных",
     "Database tablespace" : "Табличое пространство базы данных",
     "Database host" : "Хост базы данных",
-    "Performance Warning" : "Предупреждение о производительности",
+    "Performance warning" : "Предупреждение о производительности",
     "SQLite will be used as database." : "В качестве базы данных будет использована SQLite.",
     "For larger installations we recommend to choose a different database backend." : "Для крупных проектов мы советуем выбрать другую базу данных.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использование клиента для ПК.",
     "Finish setup" : "Завершить установку",
     "Finishing …" : "Завершение...",
+    "Need help?" : "Нужна помощь?",
+    "See the documentation" : "Посмотреть документацию",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Это приложение требует включённый JavaScript для корректной работы. Пожалуйста, <a href=\"http://enable-javascript.com/\" target=\"_blank\">включите JavaScript</a> и перезагрузите интерфейс.",
     "%s is available. Get more information on how to update." : "Доступна версия %s. Получить дополнительную информацию о порядке обновления.",
     "Log out" : "Выйти",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index 47e23bc895f..2eea95667a4 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -70,6 +70,7 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ваш веб-сервер еще не настроен должным образом, чтобы позволить синхронизацию файлов, потому что интерфейс WebDAV, кажется, испорчен.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Этот сервер не имеет подключения к Интернету. Это означает, что некоторые из функций, таких как внешнее хранилище, уведомления об обновлениях и установки сторонних приложений не будут работать. Доступ к файлам удаленно и отправки уведомлений по почте могут не работать. Мы предлагаем включить подключение к Интернету для этого сервера, если вы хотите, чтобы все функции работали.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ваш каталог данных и ваши файлы возможно доступны из интернете. .htaccess файл не работает. Мы настоятельно рекомендуем вам настроить ваш веб сервер таким образом, что-бы каталог данных не был больше доступен или переместите каталог данных за пределы корня веб сервера.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Не настроена система кеширования. Для увеличения производительности сервера, по возможности, настройте memcache. Более подробную информацию, вы можете посмотреть в нашей <a href=\"{docLink}\">документации</a>.",
     "Error occurred while checking server setup" : "Произошла ошибка при проверке настроек сервера",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Заголовок HTTP \"{header}\" не настроен на ожидаемый \"{expected}\". Это потенциальная проблема безопасности и мы рекомендуем изменить эти настройки.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "Заголовок HTTP \"Strict-Transport-Security\" должен быть настроен по крайней мере на \"2,678,400\" секунд. Это потенциальная проблема безопасности и мы рекомендуем изменить эти настройки.",
@@ -83,7 +84,9 @@
     "Error while changing permissions" : "При изменении прав доступа произошла ошибка",
     "Shared with you and the group {group} by {owner}" : "{owner} поделился с вами и группой {group} ",
     "Shared with you by {owner}" : "С вами поделился {owner} ",
-    "Share with user or group …" : "Поделиться с пользователем или группой...",
+    "Share with users or groups …" : "Поделиться с пользователями или группами ...",
+    "Share with users, groups or remote users …" : "Поделиться с пользователями, группами или удаленными пользователями ...",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах ownCloud используя синтакс username@example.com/owncloud",
     "Share link" : "Поделиться ссылкой",
     "The public link will expire no later than {days} days after it is created" : "Срок действия публичной ссылки истекает не позже чем через {days} дней после её создания",
     "Link" : "Ссылка",
@@ -130,7 +133,6 @@
     "_download %n file_::_download %n files_" : ["скачать %n файл","скачать %n файла","скачать %n файлов"],
     "Updating {productName} to version {version}, this may take a while." : "Идет обновление {productName} до версии {version}, пожалуйста, подождите.",
     "Please reload the page." : "Обновите страницу.",
-    "The update was unsuccessful. " : "Обновление не удалось.",
     "The update was successful. Redirecting you to ownCloud now." : "Обновление прошло успешно. Перенаправляем в ownCloud.",
     "Couldn't reset password because the token is invalid" : "Невозможно сбросить пароль из-за неверного токена",
     "Couldn't send reset email. Please make sure your username is correct." : "Не удалось отправить письмо для сброса пароля. Убедитесь, что имя пользователя указано верно.",
@@ -175,7 +177,7 @@
     "File: %s" : "Файл: %s",
     "Line: %s" : "Линия: %s",
     "Trace" : "След",
-    "Security Warning" : "Предупреждение безопасности",
+    "Security warning" : "Предупреждение безопасности",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Правила файла .htaccess не выполняются, возможно, каталог данных и файлы свободно доступны из интернета.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Что-бы правильно настроить сервер, руководствуйтесь <a hrev=\"%s\"target=\"blank\">документацией</a>.",
     "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>",
@@ -189,12 +191,14 @@
     "Database name" : "Название базы данных",
     "Database tablespace" : "Табличое пространство базы данных",
     "Database host" : "Хост базы данных",
-    "Performance Warning" : "Предупреждение о производительности",
+    "Performance warning" : "Предупреждение о производительности",
     "SQLite will be used as database." : "В качестве базы данных будет использована SQLite.",
     "For larger installations we recommend to choose a different database backend." : "Для крупных проектов мы советуем выбрать другую базу данных.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использование клиента для ПК.",
     "Finish setup" : "Завершить установку",
     "Finishing …" : "Завершение...",
+    "Need help?" : "Нужна помощь?",
+    "See the documentation" : "Посмотреть документацию",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Это приложение требует включённый JavaScript для корректной работы. Пожалуйста, <a href=\"http://enable-javascript.com/\" target=\"_blank\">включите JavaScript</a> и перезагрузите интерфейс.",
     "%s is available. Get more information on how to update." : "Доступна версия %s. Получить дополнительную информацию о порядке обновления.",
     "Log out" : "Выйти",
diff --git a/core/l10n/si_LK.js b/core/l10n/si_LK.js
index e0d100b82d8..11e5ef38e58 100644
--- a/core/l10n/si_LK.js
+++ b/core/l10n/si_LK.js
@@ -53,7 +53,6 @@ OC.L10N.register(
     "Admin" : "පරිපාලක",
     "Help" : "උදව්",
     "Access forbidden" : "ඇතුල් වීම තහනම්",
-    "Security Warning" : "ආරක්ෂක නිවේදනයක්",
     "Username" : "පරිශීලක නම",
     "Data folder" : "දත්ත ෆෝල්ඩරය",
     "Configure the database" : "දත්ත සමුදාය හැඩගැසීම",
diff --git a/core/l10n/si_LK.json b/core/l10n/si_LK.json
index 23d63d883cc..5190ce77e81 100644
--- a/core/l10n/si_LK.json
+++ b/core/l10n/si_LK.json
@@ -51,7 +51,6 @@
     "Admin" : "පරිපාලක",
     "Help" : "උදව්",
     "Access forbidden" : "ඇතුල් වීම තහනම්",
-    "Security Warning" : "ආරක්ෂක නිවේදනයක්",
     "Username" : "පරිශීලක නම",
     "Data folder" : "දත්ත ෆෝල්ඩරය",
     "Configure the database" : "දත්ත සමුදාය හැඩගැසීම",
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
index 39e625d1203..91ade857ce8 100644
--- a/core/l10n/sk_SK.js
+++ b/core/l10n/sk_SK.js
@@ -77,7 +77,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Chyba počas zmeny oprávnení",
     "Shared with you and the group {group} by {owner}" : "Zdieľané s vami a so skupinou {group} používateľom {owner}",
     "Shared with you by {owner}" : "Zdieľané s vami používateľom {owner}",
-    "Share with user or group …" : "Zdieľať s používateľom alebo skupinou ...",
     "Share link" : "Zdieľať linku",
     "The public link will expire no later than {days} days after it is created" : "Verejný odkaz nevyprší skôr než za {days} dní po vytvorení",
     "Link" : "Odkaz",
@@ -124,7 +123,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["stiahnuť %n súbor","stiahnuť %n súbory","stiahnuť %n súborov"],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.",
     "Please reload the page." : "Obnovte prosím stránku.",
-    "The update was unsuccessful. " : "Aktualizácia bola neúspešná.",
     "The update was successful. Redirecting you to ownCloud now." : "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku.",
     "Couldn't reset password because the token is invalid" : "Nemožno zmeniť heslo pre neplatnosť tokenu.",
     "Couldn't send reset email. Please make sure your username is correct." : "Nemožno poslať email pre obnovu. Uistite sa, či vkladáte správne používateľské meno.",
@@ -168,7 +166,6 @@ OC.L10N.register(
     "File: %s" : "Súbor: %s",
     "Line: %s" : "Riadok: %s",
     "Trace" : "Trasa",
-    "Security Warning" : "Bezpečnostné varovanie",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
     "Create an <strong>admin account</strong>" : "Vytvoriť <strong>administrátorský účet</strong>",
@@ -182,7 +179,6 @@ OC.L10N.register(
     "Database name" : "Meno databázy",
     "Database tablespace" : "Tabuľkový priestor databázy",
     "Database host" : "Server databázy",
-    "Performance Warning" : "Varovanie o výkone",
     "SQLite will be used as database." : "Bude použitá SQLite databáza.",
     "For larger installations we recommend to choose a different database backend." : "Pre veľké inštalácie odporúčame vybrať si iné databázové riešenie.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Najmä pri používaní klientských aplikácií na synchronizáciu s desktopom neodporúčame používať SQLite.",
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
index 47a2d06f84c..e46a182a6d6 100644
--- a/core/l10n/sk_SK.json
+++ b/core/l10n/sk_SK.json
@@ -75,7 +75,6 @@
     "Error while changing permissions" : "Chyba počas zmeny oprávnení",
     "Shared with you and the group {group} by {owner}" : "Zdieľané s vami a so skupinou {group} používateľom {owner}",
     "Shared with you by {owner}" : "Zdieľané s vami používateľom {owner}",
-    "Share with user or group …" : "Zdieľať s používateľom alebo skupinou ...",
     "Share link" : "Zdieľať linku",
     "The public link will expire no later than {days} days after it is created" : "Verejný odkaz nevyprší skôr než za {days} dní po vytvorení",
     "Link" : "Odkaz",
@@ -122,7 +121,6 @@
     "_download %n file_::_download %n files_" : ["stiahnuť %n súbor","stiahnuť %n súbory","stiahnuť %n súborov"],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.",
     "Please reload the page." : "Obnovte prosím stránku.",
-    "The update was unsuccessful. " : "Aktualizácia bola neúspešná.",
     "The update was successful. Redirecting you to ownCloud now." : "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku.",
     "Couldn't reset password because the token is invalid" : "Nemožno zmeniť heslo pre neplatnosť tokenu.",
     "Couldn't send reset email. Please make sure your username is correct." : "Nemožno poslať email pre obnovu. Uistite sa, či vkladáte správne používateľské meno.",
@@ -166,7 +164,6 @@
     "File: %s" : "Súbor: %s",
     "Line: %s" : "Riadok: %s",
     "Trace" : "Trasa",
-    "Security Warning" : "Bezpečnostné varovanie",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
     "Create an <strong>admin account</strong>" : "Vytvoriť <strong>administrátorský účet</strong>",
@@ -180,7 +177,6 @@
     "Database name" : "Meno databázy",
     "Database tablespace" : "Tabuľkový priestor databázy",
     "Database host" : "Server databázy",
-    "Performance Warning" : "Varovanie o výkone",
     "SQLite will be used as database." : "Bude použitá SQLite databáza.",
     "For larger installations we recommend to choose a different database backend." : "Pre veľké inštalácie odporúčame vybrať si iné databázové riešenie.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Najmä pri používaní klientských aplikácií na synchronizáciu s desktopom neodporúčame používať SQLite.",
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
index 0b10e4bab83..cebe42ad002 100644
--- a/core/l10n/sl.js
+++ b/core/l10n/sl.js
@@ -73,7 +73,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Napaka med spreminjanjem dovoljenj",
     "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
     "Shared with you by {owner}" : "V souporabi z vami. Lastnik je {owner}.",
-    "Share with user or group …" : "Souporaba z uporabnikom ali skupino ...",
     "Share link" : "Povezava za prejem",
     "The public link will expire no later than {days} days after it is created" : "Javna povezava bo potekla {days} dni po ustvarjanju.",
     "Link" : "Povezava",
@@ -120,7 +119,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["prejmi %n datoteko","prejmi %n datoteki","prejmi %n datoteke","prejmi %n datotek"],
     "Updating {productName} to version {version}, this may take a while." : "Poteka posodabljanje {productName} na različico {version}. Opravilo je lahko dolgotrajno.",
     "Please reload the page." : "Stran je treba ponovno naložiti",
-    "The update was unsuccessful. " : "Posodobitev je spodletela.",
     "The update was successful. Redirecting you to ownCloud now." : "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.",
     "Couldn't reset password because the token is invalid" : "Ni mogoče ponastaviti gesla zaradi neustreznega žetona.",
     "Couldn't send reset email. Please make sure your username is correct." : "Ni mogoče poslati elektronskega sporočila. Prepričajte se, da je uporabniško ime pravilno.",
@@ -163,7 +161,6 @@ OC.L10N.register(
     "File: %s" : "Datoteka: %s",
     "Line: %s" : "Vrstica: %s",
     "Trace" : "Sledenje povezav",
-    "Security Warning" : "Varnostno opozorilo",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
     "Create an <strong>admin account</strong>" : "Ustvari <strong>skrbniški račun</strong>",
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
index 56ef29e6110..77c47e5561a 100644
--- a/core/l10n/sl.json
+++ b/core/l10n/sl.json
@@ -71,7 +71,6 @@
     "Error while changing permissions" : "Napaka med spreminjanjem dovoljenj",
     "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
     "Shared with you by {owner}" : "V souporabi z vami. Lastnik je {owner}.",
-    "Share with user or group …" : "Souporaba z uporabnikom ali skupino ...",
     "Share link" : "Povezava za prejem",
     "The public link will expire no later than {days} days after it is created" : "Javna povezava bo potekla {days} dni po ustvarjanju.",
     "Link" : "Povezava",
@@ -118,7 +117,6 @@
     "_download %n file_::_download %n files_" : ["prejmi %n datoteko","prejmi %n datoteki","prejmi %n datoteke","prejmi %n datotek"],
     "Updating {productName} to version {version}, this may take a while." : "Poteka posodabljanje {productName} na različico {version}. Opravilo je lahko dolgotrajno.",
     "Please reload the page." : "Stran je treba ponovno naložiti",
-    "The update was unsuccessful. " : "Posodobitev je spodletela.",
     "The update was successful. Redirecting you to ownCloud now." : "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.",
     "Couldn't reset password because the token is invalid" : "Ni mogoče ponastaviti gesla zaradi neustreznega žetona.",
     "Couldn't send reset email. Please make sure your username is correct." : "Ni mogoče poslati elektronskega sporočila. Prepričajte se, da je uporabniško ime pravilno.",
@@ -161,7 +159,6 @@
     "File: %s" : "Datoteka: %s",
     "Line: %s" : "Vrstica: %s",
     "Trace" : "Sledenje povezav",
-    "Security Warning" : "Varnostno opozorilo",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
     "Create an <strong>admin account</strong>" : "Ustvari <strong>skrbniški račun</strong>",
diff --git a/core/l10n/sq.js b/core/l10n/sq.js
index a96c26c740b..998670e066a 100644
--- a/core/l10n/sq.js
+++ b/core/l10n/sq.js
@@ -71,7 +71,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Veprim i gabuar gjatë ndryshimit të lejeve",
     "Shared with you and the group {group} by {owner}" : "Ndarë me ju dhe me grupin {group} nga {owner}",
     "Shared with you by {owner}" : "Ndarë me ju nga {owner}",
-    "Share with user or group …" : "Ndajeni me përdorues ose grup ...",
     "Share link" : "Ndaje lidhjen",
     "The public link will expire no later than {days} days after it is created" : "Lidhja publike do të skadojë jo më vonë se {days} ditë pas krijimit",
     "Password protect" : "Mbro me kod",
@@ -153,7 +152,6 @@ OC.L10N.register(
     "File: %s" : "Skedari: %s",
     "Line: %s" : "Rreshti: %s",
     "Trace" : "Gjurmim",
-    "Security Warning" : "Paralajmërim sigurie",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
     "Create an <strong>admin account</strong>" : "Krijo një <strong>llogari administruesi</strong>",
diff --git a/core/l10n/sq.json b/core/l10n/sq.json
index a4dfe949665..b8f08ef8d14 100644
--- a/core/l10n/sq.json
+++ b/core/l10n/sq.json
@@ -69,7 +69,6 @@
     "Error while changing permissions" : "Veprim i gabuar gjatë ndryshimit të lejeve",
     "Shared with you and the group {group} by {owner}" : "Ndarë me ju dhe me grupin {group} nga {owner}",
     "Shared with you by {owner}" : "Ndarë me ju nga {owner}",
-    "Share with user or group …" : "Ndajeni me përdorues ose grup ...",
     "Share link" : "Ndaje lidhjen",
     "The public link will expire no later than {days} days after it is created" : "Lidhja publike do të skadojë jo më vonë se {days} ditë pas krijimit",
     "Password protect" : "Mbro me kod",
@@ -151,7 +150,6 @@
     "File: %s" : "Skedari: %s",
     "Line: %s" : "Rreshti: %s",
     "Trace" : "Gjurmim",
-    "Security Warning" : "Paralajmërim sigurie",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
     "Create an <strong>admin account</strong>" : "Krijo një <strong>llogari administruesi</strong>",
diff --git a/core/l10n/sr.js b/core/l10n/sr.js
index bb34c1f8c09..6bc9a3635f1 100644
--- a/core/l10n/sr.js
+++ b/core/l10n/sr.js
@@ -72,7 +72,7 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ваш сервер није правилно подешен да омогући синхронизацију фајлова. Изгледа да је ВебДАВ сучеље покварено.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Овај сервер нема везу са интернетом. То значи да неке могућности, попут монтирања спољашњег складишта, обавештења о ажурирању или инсталација апликација треће стране, неће радити. Даљински приступ и слање е-поште, такође неће радити. Предлажемо да омогућите интернет везу за овај сервер ако желите да имате све могућности.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ваш директоријум са подацима и ваши фајлови су вероватно доступни са интернета. Фајл .htaccess не ради. Предлажемо да подесите ваш веб сервер на начин да директоријум са подацима не буде доступан или га изместите изван кореног директоријума веб сервера.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Кеширање меморије није подешено. За унапређивање перформанси подесите memcache ако је доступан. Више информација можете наћи у <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">документацији</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Није подешен меморијски кеш. Да бисте побољшали перформансе подесите „memcache“ ако је доступан. Више информација можете наћи у <a href=\"{docLink}\">документацији</a>.",
     "Error occurred while checking server setup" : "Дошло је до грешке при провери поставки сервера",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "ХТТП заглавље „{header}“ није подешено као „{expected}“. Ово је потенцијални безбедносни или ризик за приватност и препоручујемо да подесите ову поставку.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "ХТТП захлавље „Strict-Transport-Security“ није постављено на најмање \"2,678,400\" секунди. Ово је потенцијални безбедносни ризик и препоручујемо да подесите ову поставку.",
@@ -86,7 +86,8 @@ OC.L10N.register(
     "Error while changing permissions" : "Грешка при измени дозвола",
     "Shared with you and the group {group} by {owner}" : "{owner} дели са вама и са групом {group}.",
     "Shared with you by {owner}" : "{owner} дели са вама",
-    "Share with user or group …" : "Дели са корисником или групом...",
+    "Share with users or groups …" : "Дели са корисницима или групама...",
+    "Share with users, groups or remote users …" : "Дели са корисницима, групама или удаљеним корисницима...",
     "Share link" : "Веза дељења",
     "The public link will expire no later than {days} days after it is created" : "Јавна веза ће престати да важи {days} дана након стварања",
     "Link" : "Веза",
@@ -99,6 +100,7 @@ OC.L10N.register(
     "Set expiration date" : "Постави датум истека",
     "Expiration" : "Истиче",
     "Expiration date" : "Датум истека",
+    "An error occured. Please try again" : "Дошло је до грешке. Покушајте поново",
     "Adding user..." : "Додајем корисника...",
     "group" : "група",
     "remote" : "удаљени",
@@ -133,7 +135,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["преузми %n фајл","преузми %n фајла","преузми %n фајлова"],
     "Updating {productName} to version {version}, this may take a while." : "Надограђујем {productName} на издање {version}. Ово би могло да потраје.",
     "Please reload the page." : "Поново учитајте страницу.",
-    "The update was unsuccessful. " : "Ажурирање није успело.",
     "The update was successful. Redirecting you to ownCloud now." : "Ажурирање је успело. Преусмеравам вас на ОунКлауд.",
     "Couldn't reset password because the token is invalid" : "Није могуће ресетовати лозинку, јер je дигитални кључ неважећи",
     "Couldn't send reset email. Please make sure your username is correct." : "Не могу да пошаљем поруку за обнављање лозинке. Проверите да ли је корисничко име исправно.",
@@ -178,7 +179,7 @@ OC.L10N.register(
     "File: %s" : "Фајл: %s",
     "Line: %s" : "Линија: %s",
     "Trace" : "Траг",
-    "Security Warning" : "Сигурносно упозорење",
+    "Security warning" : "Безбедносно упозорење",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваш директоријум са подацима и фајлови су вероватно доступни са интернета јер .htaccess не ради.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Информације о томе како исправно подесити серверможете наћи у<a href=\"%s\" target=\"_blank\">документацији</a>.",
     "Create an <strong>admin account</strong>" : "Направи <strong>административни налог</strong>",
@@ -192,18 +193,22 @@ OC.L10N.register(
     "Database name" : "Назив базе",
     "Database tablespace" : "Радни простор базе података",
     "Database host" : "Домаћин базе",
-    "Performance Warning" : "Упозорење о перформансама",
+    "Performance warning" : "Упозорење о перформансама",
     "SQLite will be used as database." : "СКуЛајт ће бити коришћен за базу података.",
     "For larger installations we recommend to choose a different database backend." : "За веће инсталације препоручујемо да изаберете другу позадину базе података.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Нарочито ако се користи клијент програм у графичком окружењу, коришћење СКуЛајта није препоручљиво.",
     "Finish setup" : "Заврши подешавање",
     "Finishing …" : "Завршавам…",
+    "Need help?" : "Треба вам помоћ?",
+    "See the documentation" : "Погледајте документацију",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Ова апликација захтева Јава скрипт за исправан рад. {linkstart}Омогућите Јава скрипт{linkend} и поново учитајте страницу.",
     "%s is available. Get more information on how to update." : "%s је доступан. Сазнајте више о томе како да ажурирате.",
     "Log out" : "Одјава",
     "Search" : "Претражи",
     "Server side authentication failed!" : "Аутентификација на серверу није успела!",
     "Please contact your administrator." : "Контактирајте вашег администратора.",
+    "An internal error occured." : "Дошло је до интерне грешке.",
+    "Please try again or contact your administrator." : "Покушајте поново или контактирајте вашег администратора.",
     "Forgot your password? Reset it!" : "Заборавили сте вашу лозинку? Обновите је!",
     "remember" : "упамти",
     "Log in" : "Пријава",
diff --git a/core/l10n/sr.json b/core/l10n/sr.json
index f4ce5f91cbe..3ac2cec66a4 100644
--- a/core/l10n/sr.json
+++ b/core/l10n/sr.json
@@ -70,7 +70,7 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ваш сервер није правилно подешен да омогући синхронизацију фајлова. Изгледа да је ВебДАВ сучеље покварено.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Овај сервер нема везу са интернетом. То значи да неке могућности, попут монтирања спољашњег складишта, обавештења о ажурирању или инсталација апликација треће стране, неће радити. Даљински приступ и слање е-поште, такође неће радити. Предлажемо да омогућите интернет везу за овај сервер ако желите да имате све могућности.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ваш директоријум са подацима и ваши фајлови су вероватно доступни са интернета. Фајл .htaccess не ради. Предлажемо да подесите ваш веб сервер на начин да директоријум са подацима не буде доступан или га изместите изван кореног директоријума веб сервера.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "Кеширање меморије није подешено. За унапређивање перформанси подесите memcache ако је доступан. Више информација можете наћи у <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">документацији</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Није подешен меморијски кеш. Да бисте побољшали перформансе подесите „memcache“ ако је доступан. Више информација можете наћи у <a href=\"{docLink}\">документацији</a>.",
     "Error occurred while checking server setup" : "Дошло је до грешке при провери поставки сервера",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "ХТТП заглавље „{header}“ није подешено као „{expected}“. Ово је потенцијални безбедносни или ризик за приватност и препоручујемо да подесите ову поставку.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "ХТТП захлавље „Strict-Transport-Security“ није постављено на најмање \"2,678,400\" секунди. Ово је потенцијални безбедносни ризик и препоручујемо да подесите ову поставку.",
@@ -84,7 +84,8 @@
     "Error while changing permissions" : "Грешка при измени дозвола",
     "Shared with you and the group {group} by {owner}" : "{owner} дели са вама и са групом {group}.",
     "Shared with you by {owner}" : "{owner} дели са вама",
-    "Share with user or group …" : "Дели са корисником или групом...",
+    "Share with users or groups …" : "Дели са корисницима или групама...",
+    "Share with users, groups or remote users …" : "Дели са корисницима, групама или удаљеним корисницима...",
     "Share link" : "Веза дељења",
     "The public link will expire no later than {days} days after it is created" : "Јавна веза ће престати да важи {days} дана након стварања",
     "Link" : "Веза",
@@ -97,6 +98,7 @@
     "Set expiration date" : "Постави датум истека",
     "Expiration" : "Истиче",
     "Expiration date" : "Датум истека",
+    "An error occured. Please try again" : "Дошло је до грешке. Покушајте поново",
     "Adding user..." : "Додајем корисника...",
     "group" : "група",
     "remote" : "удаљени",
@@ -131,7 +133,6 @@
     "_download %n file_::_download %n files_" : ["преузми %n фајл","преузми %n фајла","преузми %n фајлова"],
     "Updating {productName} to version {version}, this may take a while." : "Надограђујем {productName} на издање {version}. Ово би могло да потраје.",
     "Please reload the page." : "Поново учитајте страницу.",
-    "The update was unsuccessful. " : "Ажурирање није успело.",
     "The update was successful. Redirecting you to ownCloud now." : "Ажурирање је успело. Преусмеравам вас на ОунКлауд.",
     "Couldn't reset password because the token is invalid" : "Није могуће ресетовати лозинку, јер je дигитални кључ неважећи",
     "Couldn't send reset email. Please make sure your username is correct." : "Не могу да пошаљем поруку за обнављање лозинке. Проверите да ли је корисничко име исправно.",
@@ -176,7 +177,7 @@
     "File: %s" : "Фајл: %s",
     "Line: %s" : "Линија: %s",
     "Trace" : "Траг",
-    "Security Warning" : "Сигурносно упозорење",
+    "Security warning" : "Безбедносно упозорење",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваш директоријум са подацима и фајлови су вероватно доступни са интернета јер .htaccess не ради.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Информације о томе како исправно подесити серверможете наћи у<a href=\"%s\" target=\"_blank\">документацији</a>.",
     "Create an <strong>admin account</strong>" : "Направи <strong>административни налог</strong>",
@@ -190,18 +191,22 @@
     "Database name" : "Назив базе",
     "Database tablespace" : "Радни простор базе података",
     "Database host" : "Домаћин базе",
-    "Performance Warning" : "Упозорење о перформансама",
+    "Performance warning" : "Упозорење о перформансама",
     "SQLite will be used as database." : "СКуЛајт ће бити коришћен за базу података.",
     "For larger installations we recommend to choose a different database backend." : "За веће инсталације препоручујемо да изаберете другу позадину базе података.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Нарочито ако се користи клијент програм у графичком окружењу, коришћење СКуЛајта није препоручљиво.",
     "Finish setup" : "Заврши подешавање",
     "Finishing …" : "Завршавам…",
+    "Need help?" : "Треба вам помоћ?",
+    "See the documentation" : "Погледајте документацију",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Ова апликација захтева Јава скрипт за исправан рад. {linkstart}Омогућите Јава скрипт{linkend} и поново учитајте страницу.",
     "%s is available. Get more information on how to update." : "%s је доступан. Сазнајте више о томе како да ажурирате.",
     "Log out" : "Одјава",
     "Search" : "Претражи",
     "Server side authentication failed!" : "Аутентификација на серверу није успела!",
     "Please contact your administrator." : "Контактирајте вашег администратора.",
+    "An internal error occured." : "Дошло је до интерне грешке.",
+    "Please try again or contact your administrator." : "Покушајте поново или контактирајте вашег администратора.",
     "Forgot your password? Reset it!" : "Заборавили сте вашу лозинку? Обновите је!",
     "remember" : "упамти",
     "Log in" : "Пријава",
diff --git a/core/l10n/sr@latin.js b/core/l10n/sr@latin.js
index 2b1c20b219e..f6372323e52 100644
--- a/core/l10n/sr@latin.js
+++ b/core/l10n/sr@latin.js
@@ -72,7 +72,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Greška u promeni dozvola",
     "Shared with you and the group {group} by {owner}" : "{owner} podelio sa Vama i grupom {group} ",
     "Shared with you by {owner}" : "Sa vama podelio {owner}",
-    "Share with user or group …" : "Podeli sa korisnikom ili grupom",
     "Share link" : "Podeli prečicu",
     "The public link will expire no later than {days} days after it is created" : "Javna prečica će isteći ne kasnije od {days} dana pošto je kreirana",
     "Link" : "Prečica",
@@ -118,7 +117,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["Preuzmi %n fajl","Preuzmi %n fajlova","Preuzmi %n fajlova"],
     "Updating {productName} to version {version}, this may take a while." : "Osvežavam {productName} na verziju {version}, ovo može potrajati.",
     "Please reload the page." : "Molimo, ponovo učitajte stranu.",
-    "The update was unsuccessful. " : "Osvežavanje je uspelo.",
     "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
     "Couldn't reset password because the token is invalid" : "Nije bilo moguće ponovo postaviti lozinku zbog nevažećeg kontrolnog broja",
     "Couldn't send reset email. Please make sure your username is correct." : "Nije bilo moguće poslati Email za ponovno postavljanje. Molimo Vas da proverite da li je Vaše korisničko ime ispravno.",
@@ -159,7 +157,6 @@ OC.L10N.register(
     "File: %s" : "Fajl: %s",
     "Line: %s" : "Linija: %s",
     "Trace" : "Zapisnik: ",
-    "Security Warning" : "Bezbednosno upozorenje",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informacije kako da pravilno podesite server, molimo Vas da pogledate <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
     "Create an <strong>admin account</strong>" : "Napravi <strong>administrativni nalog</strong>",
diff --git a/core/l10n/sr@latin.json b/core/l10n/sr@latin.json
index 5d7d0f04cbe..c5c7f151c90 100644
--- a/core/l10n/sr@latin.json
+++ b/core/l10n/sr@latin.json
@@ -70,7 +70,6 @@
     "Error while changing permissions" : "Greška u promeni dozvola",
     "Shared with you and the group {group} by {owner}" : "{owner} podelio sa Vama i grupom {group} ",
     "Shared with you by {owner}" : "Sa vama podelio {owner}",
-    "Share with user or group …" : "Podeli sa korisnikom ili grupom",
     "Share link" : "Podeli prečicu",
     "The public link will expire no later than {days} days after it is created" : "Javna prečica će isteći ne kasnije od {days} dana pošto je kreirana",
     "Link" : "Prečica",
@@ -116,7 +115,6 @@
     "_download %n file_::_download %n files_" : ["Preuzmi %n fajl","Preuzmi %n fajlova","Preuzmi %n fajlova"],
     "Updating {productName} to version {version}, this may take a while." : "Osvežavam {productName} na verziju {version}, ovo može potrajati.",
     "Please reload the page." : "Molimo, ponovo učitajte stranu.",
-    "The update was unsuccessful. " : "Osvežavanje je uspelo.",
     "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
     "Couldn't reset password because the token is invalid" : "Nije bilo moguće ponovo postaviti lozinku zbog nevažećeg kontrolnog broja",
     "Couldn't send reset email. Please make sure your username is correct." : "Nije bilo moguće poslati Email za ponovno postavljanje. Molimo Vas da proverite da li je Vaše korisničko ime ispravno.",
@@ -157,7 +155,6 @@
     "File: %s" : "Fajl: %s",
     "Line: %s" : "Linija: %s",
     "Trace" : "Zapisnik: ",
-    "Security Warning" : "Bezbednosno upozorenje",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informacije kako da pravilno podesite server, molimo Vas da pogledate <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
     "Create an <strong>admin account</strong>" : "Napravi <strong>administrativni nalog</strong>",
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
index 15dcf11d026..08c6579dd62 100644
--- a/core/l10n/sv.js
+++ b/core/l10n/sv.js
@@ -72,7 +72,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Fel vid ändring av rättigheter",
     "Shared with you and the group {group} by {owner}" : "Delad med dig och gruppen {group} av {owner}",
     "Shared with you by {owner}" : "Delad med dig av {owner}",
-    "Share with user or group …" : "Dela med användare eller grupp...",
     "Share link" : "Dela länk",
     "The public link will expire no later than {days} days after it is created" : "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
     "Link" : "Länk",
@@ -119,7 +118,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["Ladda ner %n fil","Ladda ner %n filer"],
     "Updating {productName} to version {version}, this may take a while." : "Uppdaterar {productName} till version {version}, detta kan ta en stund.",
     "Please reload the page." : "Vänligen ladda om sidan.",
-    "The update was unsuccessful. " : "Uppdateringen misslyckades.",
     "The update was successful. Redirecting you to ownCloud now." : "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
     "Couldn't reset password because the token is invalid" : "Kunde inte återställa lösenordet på grund av felaktig token",
     "Couldn't send reset email. Please make sure your username is correct." : "Kunde inte skicka återställningsmail. Vänligen kontrollera att ditt användarnamn är korrekt.",
@@ -161,7 +159,6 @@ OC.L10N.register(
     "File: %s" : "Fil: %s",
     "Line: %s" : "Rad: %s",
     "Trace" : "Spåra",
-    "Security Warning" : "Säkerhetsvarning",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
     "Create an <strong>admin account</strong>" : "Skapa ett <strong>administratörskonto</strong>",
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
index b6cfe2bde78..3885cea6e54 100644
--- a/core/l10n/sv.json
+++ b/core/l10n/sv.json
@@ -70,7 +70,6 @@
     "Error while changing permissions" : "Fel vid ändring av rättigheter",
     "Shared with you and the group {group} by {owner}" : "Delad med dig och gruppen {group} av {owner}",
     "Shared with you by {owner}" : "Delad med dig av {owner}",
-    "Share with user or group …" : "Dela med användare eller grupp...",
     "Share link" : "Dela länk",
     "The public link will expire no later than {days} days after it is created" : "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
     "Link" : "Länk",
@@ -117,7 +116,6 @@
     "_download %n file_::_download %n files_" : ["Ladda ner %n fil","Ladda ner %n filer"],
     "Updating {productName} to version {version}, this may take a while." : "Uppdaterar {productName} till version {version}, detta kan ta en stund.",
     "Please reload the page." : "Vänligen ladda om sidan.",
-    "The update was unsuccessful. " : "Uppdateringen misslyckades.",
     "The update was successful. Redirecting you to ownCloud now." : "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
     "Couldn't reset password because the token is invalid" : "Kunde inte återställa lösenordet på grund av felaktig token",
     "Couldn't send reset email. Please make sure your username is correct." : "Kunde inte skicka återställningsmail. Vänligen kontrollera att ditt användarnamn är korrekt.",
@@ -159,7 +157,6 @@
     "File: %s" : "Fil: %s",
     "Line: %s" : "Rad: %s",
     "Trace" : "Spåra",
-    "Security Warning" : "Säkerhetsvarning",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
     "Create an <strong>admin account</strong>" : "Skapa ett <strong>administratörskonto</strong>",
diff --git a/core/l10n/ta_LK.js b/core/l10n/ta_LK.js
index 372e2693ed2..dcafecd50a5 100644
--- a/core/l10n/ta_LK.js
+++ b/core/l10n/ta_LK.js
@@ -62,7 +62,6 @@ OC.L10N.register(
     "Admin" : "நிர்வாகம்",
     "Help" : "உதவி",
     "Access forbidden" : "அணுக தடை",
-    "Security Warning" : "பாதுகாப்பு எச்சரிக்கை",
     "Create an <strong>admin account</strong>" : "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
     "Username" : "பயனாளர் பெயர்",
     "Data folder" : "தரவு கோப்புறை",
diff --git a/core/l10n/ta_LK.json b/core/l10n/ta_LK.json
index 359a3de826c..86bef79211b 100644
--- a/core/l10n/ta_LK.json
+++ b/core/l10n/ta_LK.json
@@ -60,7 +60,6 @@
     "Admin" : "நிர்வாகம்",
     "Help" : "உதவி",
     "Access forbidden" : "அணுக தடை",
-    "Security Warning" : "பாதுகாப்பு எச்சரிக்கை",
     "Create an <strong>admin account</strong>" : "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
     "Username" : "பயனாளர் பெயர்",
     "Data folder" : "தரவு கோப்புறை",
diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js
index 81553391131..651f8308255 100644
--- a/core/l10n/th_TH.js
+++ b/core/l10n/th_TH.js
@@ -70,7 +70,6 @@ OC.L10N.register(
     "Admin" : "ผู้ดูแล",
     "Help" : "ช่วยเหลือ",
     "Access forbidden" : "การเข้าถึงถูกหวงห้าม",
-    "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
     "Create an <strong>admin account</strong>" : "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
     "Username" : "ชื่อผู้ใช้งาน",
     "Data folder" : "โฟลเดอร์เก็บข้อมูล",
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
index c7afd19caa1..982e3e99f82 100644
--- a/core/l10n/th_TH.json
+++ b/core/l10n/th_TH.json
@@ -68,7 +68,6 @@
     "Admin" : "ผู้ดูแล",
     "Help" : "ช่วยเหลือ",
     "Access forbidden" : "การเข้าถึงถูกหวงห้าม",
-    "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
     "Create an <strong>admin account</strong>" : "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
     "Username" : "ชื่อผู้ใช้งาน",
     "Data folder" : "โฟลเดอร์เก็บข้อมูล",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index 46fd77ba9cf..74753743f3f 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -85,7 +85,6 @@ OC.L10N.register(
     "Error while changing permissions" : "İzinleri değiştirirken hata",
     "Shared with you and the group {group} by {owner}" : "{owner} tarafından sizinle ve {group} ile paylaştırılmış",
     "Shared with you by {owner}" : "{owner} tarafından sizinle paylaşıldı",
-    "Share with user or group …" : "Kullanıcı veya grup ile paylaş...",
     "Share link" : "Paylaşma bağlantısı",
     "The public link will expire no later than {days} days after it is created" : "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek",
     "Link" : "Bağlantı",
@@ -132,7 +131,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["%n dosya indir","%n dosya indir"],
     "Updating {productName} to version {version}, this may take a while." : "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.",
     "Please reload the page." : "Lütfen sayfayı yeniden yükleyin.",
-    "The update was unsuccessful. " : "Güncelleştirme başarısız.",
     "The update was successful. Redirecting you to ownCloud now." : "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz.",
     "Couldn't reset password because the token is invalid" : "Belirteç geçersiz olduğundan parola sıfırlanamadı",
     "Couldn't send reset email. Please make sure your username is correct." : "Sıfırlama e-postası gönderilemedi. Lütfen kullanıcı adınızın doğru olduğundan emin olun.",
@@ -177,7 +175,6 @@ OC.L10N.register(
     "File: %s" : "Dosya: %s",
     "Line: %s" : "Satır: %s",
     "Trace" : "İz",
-    "Security Warning" : "Güvenlik Uyarısı",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
     "Create an <strong>admin account</strong>" : "Bir <strong>yönetici hesabı</strong> oluşturun",
@@ -191,7 +188,6 @@ OC.L10N.register(
     "Database name" : "Veritabanı adı",
     "Database tablespace" : "Veritabanı tablo alanı",
     "Database host" : "Veritabanı sunucusu",
-    "Performance Warning" : "Performans Uyarısı",
     "SQLite will be used as database." : "Veritabanı olarak SQLite kullanılacak.",
     "For larger installations we recommend to choose a different database backend." : "Daha büyük kurulumlar için farklı bir veritabanı arka ucu seçmenizi öneriyoruz",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Özellikle dosya eşitleme için masaüstü istemcisi kullanılırken SQLite kullanımı önerilmez.",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index c65f6f90ada..6498c6f22f0 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -83,7 +83,6 @@
     "Error while changing permissions" : "İzinleri değiştirirken hata",
     "Shared with you and the group {group} by {owner}" : "{owner} tarafından sizinle ve {group} ile paylaştırılmış",
     "Shared with you by {owner}" : "{owner} tarafından sizinle paylaşıldı",
-    "Share with user or group …" : "Kullanıcı veya grup ile paylaş...",
     "Share link" : "Paylaşma bağlantısı",
     "The public link will expire no later than {days} days after it is created" : "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek",
     "Link" : "Bağlantı",
@@ -130,7 +129,6 @@
     "_download %n file_::_download %n files_" : ["%n dosya indir","%n dosya indir"],
     "Updating {productName} to version {version}, this may take a while." : "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.",
     "Please reload the page." : "Lütfen sayfayı yeniden yükleyin.",
-    "The update was unsuccessful. " : "Güncelleştirme başarısız.",
     "The update was successful. Redirecting you to ownCloud now." : "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz.",
     "Couldn't reset password because the token is invalid" : "Belirteç geçersiz olduğundan parola sıfırlanamadı",
     "Couldn't send reset email. Please make sure your username is correct." : "Sıfırlama e-postası gönderilemedi. Lütfen kullanıcı adınızın doğru olduğundan emin olun.",
@@ -175,7 +173,6 @@
     "File: %s" : "Dosya: %s",
     "Line: %s" : "Satır: %s",
     "Trace" : "İz",
-    "Security Warning" : "Güvenlik Uyarısı",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
     "Create an <strong>admin account</strong>" : "Bir <strong>yönetici hesabı</strong> oluşturun",
@@ -189,7 +186,6 @@
     "Database name" : "Veritabanı adı",
     "Database tablespace" : "Veritabanı tablo alanı",
     "Database host" : "Veritabanı sunucusu",
-    "Performance Warning" : "Performans Uyarısı",
     "SQLite will be used as database." : "Veritabanı olarak SQLite kullanılacak.",
     "For larger installations we recommend to choose a different database backend." : "Daha büyük kurulumlar için farklı bir veritabanı arka ucu seçmenizi öneriyoruz",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Özellikle dosya eşitleme için masaüstü istemcisi kullanılırken SQLite kullanımı önerilmez.",
diff --git a/core/l10n/ug.js b/core/l10n/ug.js
index 97407fb8039..cced7f31770 100644
--- a/core/l10n/ug.js
+++ b/core/l10n/ug.js
@@ -41,7 +41,6 @@ OC.L10N.register(
     "Users" : "ئىشلەتكۈچىلەر",
     "Apps" : "ئەپلەر",
     "Help" : "ياردەم",
-    "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
     "Username" : "ئىشلەتكۈچى ئاتى",
     "Finish setup" : "تەڭشەك تامام",
     "Log out" : "تىزىمدىن چىق",
diff --git a/core/l10n/ug.json b/core/l10n/ug.json
index 58ed0dbbd17..686a70c2dec 100644
--- a/core/l10n/ug.json
+++ b/core/l10n/ug.json
@@ -39,7 +39,6 @@
     "Users" : "ئىشلەتكۈچىلەر",
     "Apps" : "ئەپلەر",
     "Help" : "ياردەم",
-    "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
     "Username" : "ئىشلەتكۈچى ئاتى",
     "Finish setup" : "تەڭشەك تامام",
     "Log out" : "تىزىمدىن چىق",
diff --git a/core/l10n/uk.js b/core/l10n/uk.js
index 132f4d94ba5..c60dc644eb7 100644
--- a/core/l10n/uk.js
+++ b/core/l10n/uk.js
@@ -84,7 +84,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Помилка при зміні повноважень",
     "Shared with you and the group {group} by {owner}" : " {owner} опублікував для Вас та для групи {group}",
     "Shared with you by {owner}" : "{owner} опублікував для Вас",
-    "Share with user or group …" : "Поділитися з користувачем або групою ...",
     "Share link" : "Опублікувати посилання",
     "The public link will expire no later than {days} days after it is created" : "Доступ до опублікованого посилання буде припинено не пізніше ніж через {days} днів з моменту створення",
     "Link" : "Посилання",
@@ -131,7 +130,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["завантяження %n файлу","завантаження %n файлів","завантаження %n файлів"],
     "Updating {productName} to version {version}, this may take a while." : "Оновлення {productName} до версії {version}, це може займати деякий час.",
     "Please reload the page." : "Будь ласка, перезавантажте сторінку.",
-    "The update was unsuccessful. " : "Оновлення завершилось невдачею.",
     "The update was successful. Redirecting you to ownCloud now." : "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud.",
     "Couldn't reset password because the token is invalid" : "Неможливо скинути пароль, бо маркер є недійсним",
     "Couldn't send reset email. Please make sure your username is correct." : "Не вдалося відправити скидання паролю. Будь ласка, переконайтеся, що ваше ім'я користувача є правильним.",
@@ -176,7 +174,6 @@ OC.L10N.register(
     "File: %s" : "Файл: %s",
     "Line: %s" : "Рядок: %s",
     "Trace" : "Трасування",
-    "Security Warning" : "Попередження про небезпеку",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що  .htaccess файл не працює.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.",
     "Create an <strong>admin account</strong>" : "Створити <strong>обліковий запис адміністратора</strong>",
@@ -190,7 +187,6 @@ OC.L10N.register(
     "Database name" : "Назва бази даних",
     "Database tablespace" : "Таблиця бази даних",
     "Database host" : "Хост бази даних",
-    "Performance Warning" : "Попередження про продуктивність",
     "SQLite will be used as database." : "В якості бази даних буде використана SQLite.",
     "For larger installations we recommend to choose a different database backend." : "Для великих установок ми радимо вибрати іншу базу даних.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особливо викликає сумнів використання SQLite при синхронізації файлів з використанням клієнта для ПК.",
diff --git a/core/l10n/uk.json b/core/l10n/uk.json
index 2674d6dd03f..d3859d43766 100644
--- a/core/l10n/uk.json
+++ b/core/l10n/uk.json
@@ -82,7 +82,6 @@
     "Error while changing permissions" : "Помилка при зміні повноважень",
     "Shared with you and the group {group} by {owner}" : " {owner} опублікував для Вас та для групи {group}",
     "Shared with you by {owner}" : "{owner} опублікував для Вас",
-    "Share with user or group …" : "Поділитися з користувачем або групою ...",
     "Share link" : "Опублікувати посилання",
     "The public link will expire no later than {days} days after it is created" : "Доступ до опублікованого посилання буде припинено не пізніше ніж через {days} днів з моменту створення",
     "Link" : "Посилання",
@@ -129,7 +128,6 @@
     "_download %n file_::_download %n files_" : ["завантяження %n файлу","завантаження %n файлів","завантаження %n файлів"],
     "Updating {productName} to version {version}, this may take a while." : "Оновлення {productName} до версії {version}, це може займати деякий час.",
     "Please reload the page." : "Будь ласка, перезавантажте сторінку.",
-    "The update was unsuccessful. " : "Оновлення завершилось невдачею.",
     "The update was successful. Redirecting you to ownCloud now." : "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud.",
     "Couldn't reset password because the token is invalid" : "Неможливо скинути пароль, бо маркер є недійсним",
     "Couldn't send reset email. Please make sure your username is correct." : "Не вдалося відправити скидання паролю. Будь ласка, переконайтеся, що ваше ім'я користувача є правильним.",
@@ -174,7 +172,6 @@
     "File: %s" : "Файл: %s",
     "Line: %s" : "Рядок: %s",
     "Trace" : "Трасування",
-    "Security Warning" : "Попередження про небезпеку",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що  .htaccess файл не працює.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.",
     "Create an <strong>admin account</strong>" : "Створити <strong>обліковий запис адміністратора</strong>",
@@ -188,7 +185,6 @@
     "Database name" : "Назва бази даних",
     "Database tablespace" : "Таблиця бази даних",
     "Database host" : "Хост бази даних",
-    "Performance Warning" : "Попередження про продуктивність",
     "SQLite will be used as database." : "В якості бази даних буде використана SQLite.",
     "For larger installations we recommend to choose a different database backend." : "Для великих установок ми радимо вибрати іншу базу даних.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особливо викликає сумнів використання SQLite при синхронізації файлів з використанням клієнта для ПК.",
diff --git a/core/l10n/ur_PK.js b/core/l10n/ur_PK.js
index 34f04f662ef..ac43395406d 100644
--- a/core/l10n/ur_PK.js
+++ b/core/l10n/ur_PK.js
@@ -55,7 +55,6 @@ OC.L10N.register(
     "Error while changing permissions" : "اختیارات کو تبدیل کرنے کے دوران  خرابی ",
     "Shared with you and the group {group} by {owner}" : "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}",
     "Shared with you by {owner}" : "اشتراک شدہ آپ سے{مالک}",
-    "Share with user or group …" : "صارف یا مجموعہ کے ساتھ اشتراک کریں ...",
     "Share link" : "اشتراک لنک",
     "Password protect" : "محفوظ پاسورڈ",
     "Password" : "پاسورڈ",
@@ -96,7 +95,6 @@ OC.L10N.register(
     "Help" : "مدد",
     "Access forbidden" : "رسائ منقطع ہے",
     "Cheers!" : "واہ!",
-    "Security Warning" : "حفاظتی انتباہ",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "آپ کی ڈیٹا ڈائریکٹری اور فائلیں امکان ہےانٹرنیٹ سے قابل رسائی ہیں کیونکہ htaccess. فائل کام نہیں کرتا ہے",
     "Create an <strong>admin account</strong>" : "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
     "Username" : "یوزر نیم",
diff --git a/core/l10n/ur_PK.json b/core/l10n/ur_PK.json
index cecfdcbdf8b..6f8d424a0eb 100644
--- a/core/l10n/ur_PK.json
+++ b/core/l10n/ur_PK.json
@@ -53,7 +53,6 @@
     "Error while changing permissions" : "اختیارات کو تبدیل کرنے کے دوران  خرابی ",
     "Shared with you and the group {group} by {owner}" : "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}",
     "Shared with you by {owner}" : "اشتراک شدہ آپ سے{مالک}",
-    "Share with user or group …" : "صارف یا مجموعہ کے ساتھ اشتراک کریں ...",
     "Share link" : "اشتراک لنک",
     "Password protect" : "محفوظ پاسورڈ",
     "Password" : "پاسورڈ",
@@ -94,7 +93,6 @@
     "Help" : "مدد",
     "Access forbidden" : "رسائ منقطع ہے",
     "Cheers!" : "واہ!",
-    "Security Warning" : "حفاظتی انتباہ",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "آپ کی ڈیٹا ڈائریکٹری اور فائلیں امکان ہےانٹرنیٹ سے قابل رسائی ہیں کیونکہ htaccess. فائل کام نہیں کرتا ہے",
     "Create an <strong>admin account</strong>" : "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
     "Username" : "یوزر نیم",
diff --git a/core/l10n/vi.js b/core/l10n/vi.js
index fb47abe33bd..8207cf98462 100644
--- a/core/l10n/vi.js
+++ b/core/l10n/vi.js
@@ -55,7 +55,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Lỗi trong quá trình phân quyền",
     "Shared with you and the group {group} by {owner}" : "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
     "Shared with you by {owner}" : "Đã được chia sẽ bởi {owner}",
-    "Share with user or group …" : "Chia sẻ với người dùng hoặc nhóm",
     "Share link" : "Chia sẻ liên kết",
     "Password protect" : "Mật khẩu bảo vệ",
     "Password" : "Mật khẩu",
@@ -106,7 +105,6 @@ OC.L10N.register(
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Xin chào,\n\nbáo cho bạn biết rằng %s đã chia sẽ %s với bạn.\nXem nó: %s\n\n",
     "The share will expire on %s." : "Chia sẻ này sẽ hết hiệu lực vào %s.",
     "Cheers!" : "Chúc mừng!",
-    "Security Warning" : "Cảnh bảo bảo mật",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.",
     "Create an <strong>admin account</strong>" : "Tạo một <strong>tài khoản quản trị</strong>",
diff --git a/core/l10n/vi.json b/core/l10n/vi.json
index d8508ed9a17..eb67b81e255 100644
--- a/core/l10n/vi.json
+++ b/core/l10n/vi.json
@@ -53,7 +53,6 @@
     "Error while changing permissions" : "Lỗi trong quá trình phân quyền",
     "Shared with you and the group {group} by {owner}" : "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
     "Shared with you by {owner}" : "Đã được chia sẽ bởi {owner}",
-    "Share with user or group …" : "Chia sẻ với người dùng hoặc nhóm",
     "Share link" : "Chia sẻ liên kết",
     "Password protect" : "Mật khẩu bảo vệ",
     "Password" : "Mật khẩu",
@@ -104,7 +103,6 @@
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Xin chào,\n\nbáo cho bạn biết rằng %s đã chia sẽ %s với bạn.\nXem nó: %s\n\n",
     "The share will expire on %s." : "Chia sẻ này sẽ hết hiệu lực vào %s.",
     "Cheers!" : "Chúc mừng!",
-    "Security Warning" : "Cảnh bảo bảo mật",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.",
     "Create an <strong>admin account</strong>" : "Tạo một <strong>tài khoản quản trị</strong>",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index 0ab9ef3d276..d89af3ab622 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -72,7 +72,7 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "由于 WebDAV 接口似乎被破坏，因此你的网页服务器没有正确地设置来允许文件同步。",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "该服务器没有工作在互联网连接，这意味着像挂载外部存储，第三方应用的更新或者安装的通知将不会工作。远程文件访问和邮件通知的发送也可能不会工作。如果你想拥有所有功能，我们建议你为服务器打开互联网连接。",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "你的数据目录和你的文件可能从互联网被访问到。.htaccess 文件不工作。我们强烈建议你配置你的网页服务器，使数据目录不再可访问，或者将数据目录移动到网页服务器根文档目录之外。",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "没有配置内存缓存。为了提高性能，如果 memcache 可用，请配置它。更多信息可以在我们的<a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">文档</a>中找到。",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "内存缓存未配置。如果可用，请配置 memcache 来增强性能。更多信息请查看我们的<a href=\"{docLink}\">文档</a> 。",
     "Error occurred while checking server setup" : "当检查服务器启动时出错",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 头部没有配置和 \"{expected}\" 的一样。这是一个潜在的安全或者隐私风险，我们调整这项设置。",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "\"Strict-Transport-Security\" HTTP 头部未配置到至少“2678400”秒。这是一个潜在的安全风险，我们建议调整该项设置。",
@@ -86,7 +86,6 @@ OC.L10N.register(
     "Error while changing permissions" : "修改权限时出错",
     "Shared with you and the group {group} by {owner}" : "{owner} 共享给您及 {group} 组",
     "Shared with you by {owner}" : "{owner} 与您共享",
-    "Share with user or group …" : "分享给其他用户或组 ...",
     "Share link" : "分享链接",
     "The public link will expire no later than {days} days after it is created" : "这个共享链接将在创建后 {days} 天失效",
     "Link" : "链接",
@@ -133,7 +132,6 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["下载 %n 个文件"],
     "Updating {productName} to version {version}, this may take a while." : "更新 {productName} 到版本 {version}，这可能需要一些时间。",
     "Please reload the page." : "请重新加载页面。",
-    "The update was unsuccessful. " : "升级未成功",
     "The update was successful. Redirecting you to ownCloud now." : "更新成功。正在重定向至 ownCloud。",
     "Couldn't reset password because the token is invalid" : "令牌无效，无法重置密码",
     "Couldn't send reset email. Please make sure your username is correct." : "无法发送重置邮件，请检查您的用户名是否正确。",
@@ -178,7 +176,6 @@ OC.L10N.register(
     "File: %s" : "文件: %s",
     "Line: %s" : "行: %s",
     "Trace" : "追踪",
-    "Security Warning" : "安全警告",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。",
     "Create an <strong>admin account</strong>" : "创建<strong>管理员账号</strong>",
@@ -192,7 +189,6 @@ OC.L10N.register(
     "Database name" : "数据库名",
     "Database tablespace" : "数据库表空间",
     "Database host" : "数据库主机",
-    "Performance Warning" : "性能警告",
     "SQLite will be used as database." : "SQLite 将被作为数据库使用。",
     "For larger installations we recommend to choose a different database backend." : "对于更大的安装，我们建议选择一个不同的数据库后端。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特别当使用桌面客户端来同步文件时，不鼓励使用 SQLite 。",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index 14fd8153b7c..a992e149875 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -70,7 +70,7 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "由于 WebDAV 接口似乎被破坏，因此你的网页服务器没有正确地设置来允许文件同步。",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "该服务器没有工作在互联网连接，这意味着像挂载外部存储，第三方应用的更新或者安装的通知将不会工作。远程文件访问和邮件通知的发送也可能不会工作。如果你想拥有所有功能，我们建议你为服务器打开互联网连接。",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "你的数据目录和你的文件可能从互联网被访问到。.htaccess 文件不工作。我们强烈建议你配置你的网页服务器，使数据目录不再可访问，或者将数据目录移动到网页服务器根文档目录之外。",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">documentation</a>." : "没有配置内存缓存。为了提高性能，如果 memcache 可用，请配置它。更多信息可以在我们的<a href=\"https://doc.owncloud.org/server/8.0/admin_manual/configuration_server/performance_tuning.html\">文档</a>中找到。",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "内存缓存未配置。如果可用，请配置 memcache 来增强性能。更多信息请查看我们的<a href=\"{docLink}\">文档</a> 。",
     "Error occurred while checking server setup" : "当检查服务器启动时出错",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 头部没有配置和 \"{expected}\" 的一样。这是一个潜在的安全或者隐私风险，我们调整这项设置。",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "\"Strict-Transport-Security\" HTTP 头部未配置到至少“2678400”秒。这是一个潜在的安全风险，我们建议调整该项设置。",
@@ -84,7 +84,6 @@
     "Error while changing permissions" : "修改权限时出错",
     "Shared with you and the group {group} by {owner}" : "{owner} 共享给您及 {group} 组",
     "Shared with you by {owner}" : "{owner} 与您共享",
-    "Share with user or group …" : "分享给其他用户或组 ...",
     "Share link" : "分享链接",
     "The public link will expire no later than {days} days after it is created" : "这个共享链接将在创建后 {days} 天失效",
     "Link" : "链接",
@@ -131,7 +130,6 @@
     "_download %n file_::_download %n files_" : ["下载 %n 个文件"],
     "Updating {productName} to version {version}, this may take a while." : "更新 {productName} 到版本 {version}，这可能需要一些时间。",
     "Please reload the page." : "请重新加载页面。",
-    "The update was unsuccessful. " : "升级未成功",
     "The update was successful. Redirecting you to ownCloud now." : "更新成功。正在重定向至 ownCloud。",
     "Couldn't reset password because the token is invalid" : "令牌无效，无法重置密码",
     "Couldn't send reset email. Please make sure your username is correct." : "无法发送重置邮件，请检查您的用户名是否正确。",
@@ -176,7 +174,6 @@
     "File: %s" : "文件: %s",
     "Line: %s" : "行: %s",
     "Trace" : "追踪",
-    "Security Warning" : "安全警告",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。",
     "Create an <strong>admin account</strong>" : "创建<strong>管理员账号</strong>",
@@ -190,7 +187,6 @@
     "Database name" : "数据库名",
     "Database tablespace" : "数据库表空间",
     "Database host" : "数据库主机",
-    "Performance Warning" : "性能警告",
     "SQLite will be used as database." : "SQLite 将被作为数据库使用。",
     "For larger installations we recommend to choose a different database backend." : "对于更大的安装，我们建议选择一个不同的数据库后端。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特别当使用桌面客户端来同步文件时，不鼓励使用 SQLite 。",
diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js
index e78cfb137ee..e482d74666d 100644
--- a/core/l10n/zh_TW.js
+++ b/core/l10n/zh_TW.js
@@ -72,7 +72,6 @@ OC.L10N.register(
     "Error while changing permissions" : "修改權限時發生錯誤",
     "Shared with you and the group {group} by {owner}" : "由 {owner} 分享給您和 {group}",
     "Shared with you by {owner}" : "{owner} 已經和您分享",
-    "Share with user or group …" : "與用戶或群組分享",
     "Share link" : "分享連結",
     "The public link will expire no later than {days} days after it is created" : "這個公開連結會在 {days} 天內失效",
     "Password protect" : "密碼保護",
@@ -149,7 +148,6 @@ OC.L10N.register(
     "File: %s" : "檔案：%s",
     "Line: %s" : "行數：%s",
     "Trace" : "追蹤",
-    "Security Warning" : "安全性警告",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。",
     "Create an <strong>admin account</strong>" : "建立一個<strong>管理者帳號</strong>",
diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json
index 5f0796615c3..770968ea26e 100644
--- a/core/l10n/zh_TW.json
+++ b/core/l10n/zh_TW.json
@@ -70,7 +70,6 @@
     "Error while changing permissions" : "修改權限時發生錯誤",
     "Shared with you and the group {group} by {owner}" : "由 {owner} 分享給您和 {group}",
     "Shared with you by {owner}" : "{owner} 已經和您分享",
-    "Share with user or group …" : "與用戶或群組分享",
     "Share link" : "分享連結",
     "The public link will expire no later than {days} days after it is created" : "這個公開連結會在 {days} 天內失效",
     "Password protect" : "密碼保護",
@@ -147,7 +146,6 @@
     "File: %s" : "檔案：%s",
     "Line: %s" : "行數：%s",
     "Trace" : "追蹤",
-    "Security Warning" : "安全性警告",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。",
     "Create an <strong>admin account</strong>" : "建立一個<strong>管理者帳號</strong>",
diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs_CZ.js
index b110b67b3bf..c4b48a9356f 100644
--- a/lib/l10n/cs_CZ.js
+++ b/lib/l10n/cs_CZ.js
@@ -116,6 +116,8 @@ OC.L10N.register(
     "A valid password must be provided" : "Musíte zadat platné heslo",
     "The username is already being used" : "Uživatelské jméno je již využíváno",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Nejsou instalovány ovladače databází (sqlite, mysql nebo postresql).",
+    "Microsoft Windows Platform is not supported" : "Platforma Microsoft Windows není podporována",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Použití ownCloud Server na platformě Microsoft Windows není podporováno. Doporučujeme použít Linux server ve virtuálním stroji, pokud nemáte možnost migrace na samostatný stroj. Najití Linux balíčků je stejně snadné jako nasazení virtuálních strojů na <a href=\"%s\">%s</a>. Pro migraci stávajících zařízení na Linuxu najdete několik tipů a migrační skript v <a href=\"%s\"> naší dokumentaci</a>.",
     "Cannot write into \"config\" directory" : "Nelze zapisovat do adresáře \"config\"",
     "Cannot write into \"apps\" directory" : "Nelze zapisovat do adresáře \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "To lze obvykle vyřešit %spovolením zápisu webovému serveru do adresáře apps%s nebo zakázáním appstore v konfiguračním souboru.",
diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs_CZ.json
index 7c343da9e42..2d419f3c5cd 100644
--- a/lib/l10n/cs_CZ.json
+++ b/lib/l10n/cs_CZ.json
@@ -114,6 +114,8 @@
     "A valid password must be provided" : "Musíte zadat platné heslo",
     "The username is already being used" : "Uživatelské jméno je již využíváno",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Nejsou instalovány ovladače databází (sqlite, mysql nebo postresql).",
+    "Microsoft Windows Platform is not supported" : "Platforma Microsoft Windows není podporována",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Použití ownCloud Server na platformě Microsoft Windows není podporováno. Doporučujeme použít Linux server ve virtuálním stroji, pokud nemáte možnost migrace na samostatný stroj. Najití Linux balíčků je stejně snadné jako nasazení virtuálních strojů na <a href=\"%s\">%s</a>. Pro migraci stávajících zařízení na Linuxu najdete několik tipů a migrační skript v <a href=\"%s\"> naší dokumentaci</a>.",
     "Cannot write into \"config\" directory" : "Nelze zapisovat do adresáře \"config\"",
     "Cannot write into \"apps\" directory" : "Nelze zapisovat do adresáře \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "To lze obvykle vyřešit %spovolením zápisu webovému serveru do adresáře apps%s nebo zakázáním appstore v konfiguračním souboru.",
diff --git a/lib/l10n/da.js b/lib/l10n/da.js
index 0414d02ea3a..da30fd89020 100644
--- a/lib/l10n/da.js
+++ b/lib/l10n/da.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Set an admin password." : "Angiv et admin kodeord.",
     "Can't create or write into the data directory %s" : "Kan ikke oprette eller skrive ind i datamappen %s",
     "%s shared »%s« with you" : "%s delte »%s« med dig",
+    "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Deling af %s mislykkedes, fordi backenden ikke tillader delinger fra typen %i",
     "Sharing %s failed, because the file does not exist" : "Deling af %s mislykkedes, fordi filen ikke eksisterer",
     "You are not allowed to share %s" : "Du har ikke tilladelse til at dele %s",
@@ -116,6 +117,8 @@ OC.L10N.register(
     "A valid password must be provided" : "En gyldig adgangskode skal angives",
     "The username is already being used" : "Brugernavnet er allerede i brug",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Ingen database driver (sqlite, mysql eller postgresql) er installeret.",
+    "Microsoft Windows Platform is not supported" : "Microsoft Windows platformen er ikke understøttet",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "OwnCloud på en Micorsoft Windows platform er ikke understøttet. Vi foreslår du bruger en Linux server på en virtuel maskine, hvis du ikke har mulighed for at migrere til en fysisk server. Find Linux pakker og nemme udrulnings virtuelle maskine-installationer på <a href=\"%s\">%s</a>. For migrering af eksisterende installationer til Linux kan du finde tips og migrerings scripts i <a href=\"%s\">vores dokumentation</a>.",
     "Cannot write into \"config\" directory" : "Kan ikke skrive til mappen \"config\"",
     "Cannot write into \"apps\" directory" : "Kan ikke skrive til mappen \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dette kan som regel rettes ved at %sgive webserveren skriveadgang til apps-mappen%s eller slå appstore fra i config-filen.",
diff --git a/lib/l10n/da.json b/lib/l10n/da.json
index b4a922109a5..5a46e35cbdd 100644
--- a/lib/l10n/da.json
+++ b/lib/l10n/da.json
@@ -82,6 +82,7 @@
     "Set an admin password." : "Angiv et admin kodeord.",
     "Can't create or write into the data directory %s" : "Kan ikke oprette eller skrive ind i datamappen %s",
     "%s shared »%s« with you" : "%s delte »%s« med dig",
+    "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Deling af %s mislykkedes, fordi backenden ikke tillader delinger fra typen %i",
     "Sharing %s failed, because the file does not exist" : "Deling af %s mislykkedes, fordi filen ikke eksisterer",
     "You are not allowed to share %s" : "Du har ikke tilladelse til at dele %s",
@@ -114,6 +115,8 @@
     "A valid password must be provided" : "En gyldig adgangskode skal angives",
     "The username is already being used" : "Brugernavnet er allerede i brug",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Ingen database driver (sqlite, mysql eller postgresql) er installeret.",
+    "Microsoft Windows Platform is not supported" : "Microsoft Windows platformen er ikke understøttet",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "OwnCloud på en Micorsoft Windows platform er ikke understøttet. Vi foreslår du bruger en Linux server på en virtuel maskine, hvis du ikke har mulighed for at migrere til en fysisk server. Find Linux pakker og nemme udrulnings virtuelle maskine-installationer på <a href=\"%s\">%s</a>. For migrering af eksisterende installationer til Linux kan du finde tips og migrerings scripts i <a href=\"%s\">vores dokumentation</a>.",
     "Cannot write into \"config\" directory" : "Kan ikke skrive til mappen \"config\"",
     "Cannot write into \"apps\" directory" : "Kan ikke skrive til mappen \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dette kan som regel rettes ved at %sgive webserveren skriveadgang til apps-mappen%s eller slå appstore fra i config-filen.",
diff --git a/lib/l10n/de.js b/lib/l10n/de.js
index 308bd5b2b19..73703a77e6a 100644
--- a/lib/l10n/de.js
+++ b/lib/l10n/de.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Set an admin password." : "Ein Administrator-Passwort setzen.",
     "Can't create or write into the data directory %s" : "Das Datenverzeichnis %s kann nicht erstellt oder es kann darin nicht geschrieben werden.",
     "%s shared »%s« with you" : "%s hat „%s“ mit Dir geteilt",
+    "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %i nicht erlaubt.",
     "Sharing %s failed, because the file does not exist" : "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
     "You are not allowed to share %s" : "Die Freigabe von %s ist Dir nicht erlaubt",
@@ -116,6 +117,8 @@ OC.L10N.register(
     "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
     "The username is already being used" : "Dieser Benutzername existiert bereits",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MySQL oder PostgreSQL) installiert.",
+    "Microsoft Windows Platform is not supported" : "Microsoft Windows-Plattform wird nicht unterstützt",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Der Betrieb von ownCloud Server auf der Microsoft Windows-Plattform wird nicht unterstützt. Falls Du keine Möglichkeit zur Migration des Servers an sich hast, wird die Benutzung eines Linux-Servers innerhalb einer virtuellen Maschine empfohlen. Linux-Pakete wie auch leicht in Betrieb zu nehmende Abbilder virtueller Maschinen findest Du auf <a href=\"%s\">%s</a>. Einige Tipps zur Migration bestehender Installationen auf Linux und ein Migrationsskript findest Du in <a href=\"%s\">unserer Dokumentation</a>.",
     "Cannot write into \"config\" directory" : "Das Schreiben in das „config“-Verzeichnis ist nicht möglich",
     "Cannot write into \"apps\" directory" : "Das Schreiben in das „apps“-Verzeichnis ist nicht möglich",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise behoben werden, %sindem dem Webserver Schreibzugriff auf das App-Verzeichnis gegeben wird%s oder der App Store in der Konfigurationsdatei deaktiviert wird.",
diff --git a/lib/l10n/de.json b/lib/l10n/de.json
index 43591c4987e..a017a2edd37 100644
--- a/lib/l10n/de.json
+++ b/lib/l10n/de.json
@@ -82,6 +82,7 @@
     "Set an admin password." : "Ein Administrator-Passwort setzen.",
     "Can't create or write into the data directory %s" : "Das Datenverzeichnis %s kann nicht erstellt oder es kann darin nicht geschrieben werden.",
     "%s shared »%s« with you" : "%s hat „%s“ mit Dir geteilt",
+    "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %i nicht erlaubt.",
     "Sharing %s failed, because the file does not exist" : "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
     "You are not allowed to share %s" : "Die Freigabe von %s ist Dir nicht erlaubt",
@@ -114,6 +115,8 @@
     "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
     "The username is already being used" : "Dieser Benutzername existiert bereits",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MySQL oder PostgreSQL) installiert.",
+    "Microsoft Windows Platform is not supported" : "Microsoft Windows-Plattform wird nicht unterstützt",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Der Betrieb von ownCloud Server auf der Microsoft Windows-Plattform wird nicht unterstützt. Falls Du keine Möglichkeit zur Migration des Servers an sich hast, wird die Benutzung eines Linux-Servers innerhalb einer virtuellen Maschine empfohlen. Linux-Pakete wie auch leicht in Betrieb zu nehmende Abbilder virtueller Maschinen findest Du auf <a href=\"%s\">%s</a>. Einige Tipps zur Migration bestehender Installationen auf Linux und ein Migrationsskript findest Du in <a href=\"%s\">unserer Dokumentation</a>.",
     "Cannot write into \"config\" directory" : "Das Schreiben in das „config“-Verzeichnis ist nicht möglich",
     "Cannot write into \"apps\" directory" : "Das Schreiben in das „apps“-Verzeichnis ist nicht möglich",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise behoben werden, %sindem dem Webserver Schreibzugriff auf das App-Verzeichnis gegeben wird%s oder der App Store in der Konfigurationsdatei deaktiviert wird.",
diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js
index b5acd79cf70..3e507ade3e9 100644
--- a/lib/l10n/de_DE.js
+++ b/lib/l10n/de_DE.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Set an admin password." : "Setze Administrator Passwort",
     "Can't create or write into the data directory %s" : "Das Datenverzeichnis %s kann nicht erstellt oder es kann darin nicht geschrieben werden.",
     "%s shared »%s« with you" : "%s hat „%s“ mit Ihnen geteilt",
+    "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %i nicht erlaubt.",
     "Sharing %s failed, because the file does not exist" : "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
     "You are not allowed to share %s" : "Die Freigabe von %s ist Ihnen nicht erlaubt",
@@ -116,6 +117,8 @@ OC.L10N.register(
     "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
     "The username is already being used" : "Der Benutzername existiert bereits",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MYSQL oder PostgreSQL) installiert.",
+    "Microsoft Windows Platform is not supported" : "Microsoft Windows-Plattform wird nicht unterstützt",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Der Betrieb von ownCloud Server auf der Microsoft Windows-Plattform wird nicht unterstützt. Falls Sie keine Möglichkeit zur Migration des Servers an sich haben, wird die Benutzung eines Linux-Servers innerhalb einer virtuellen Maschine empfohlen. Linux-Pakete wie auch leicht in Betrieb zu nehmende Abbilder virtueller Maschinen finden Sie auf <a href=\"%s\">%s</a>. Einige Tipps zur Migration bestehender Installationen auf Linux und ein Migrationsskript finden Sie in <a href=\"%s\">unserer Dokumentation</a>.",
     "Cannot write into \"config\" directory" : "Das Schreiben in das „config“-Verzeichnis ist nicht möglich",
     "Cannot write into \"apps\" directory" : "Das Schreiben in das „apps“-Verzeichnis ist nicht möglich",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise behoben werden, %sindem dem Webserver Schreibzugriff auf das App-Verzeichnis gegeben wird%s oder der App Store in der Konfigurationsdatei deaktiviert wird.",
diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json
index 46ce25414cd..17a772ec9d1 100644
--- a/lib/l10n/de_DE.json
+++ b/lib/l10n/de_DE.json
@@ -82,6 +82,7 @@
     "Set an admin password." : "Setze Administrator Passwort",
     "Can't create or write into the data directory %s" : "Das Datenverzeichnis %s kann nicht erstellt oder es kann darin nicht geschrieben werden.",
     "%s shared »%s« with you" : "%s hat „%s“ mit Ihnen geteilt",
+    "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %i nicht erlaubt.",
     "Sharing %s failed, because the file does not exist" : "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
     "You are not allowed to share %s" : "Die Freigabe von %s ist Ihnen nicht erlaubt",
@@ -114,6 +115,8 @@
     "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
     "The username is already being used" : "Der Benutzername existiert bereits",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MYSQL oder PostgreSQL) installiert.",
+    "Microsoft Windows Platform is not supported" : "Microsoft Windows-Plattform wird nicht unterstützt",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Der Betrieb von ownCloud Server auf der Microsoft Windows-Plattform wird nicht unterstützt. Falls Sie keine Möglichkeit zur Migration des Servers an sich haben, wird die Benutzung eines Linux-Servers innerhalb einer virtuellen Maschine empfohlen. Linux-Pakete wie auch leicht in Betrieb zu nehmende Abbilder virtueller Maschinen finden Sie auf <a href=\"%s\">%s</a>. Einige Tipps zur Migration bestehender Installationen auf Linux und ein Migrationsskript finden Sie in <a href=\"%s\">unserer Dokumentation</a>.",
     "Cannot write into \"config\" directory" : "Das Schreiben in das „config“-Verzeichnis ist nicht möglich",
     "Cannot write into \"apps\" directory" : "Das Schreiben in das „apps“-Verzeichnis ist nicht möglich",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise behoben werden, %sindem dem Webserver Schreibzugriff auf das App-Verzeichnis gegeben wird%s oder der App Store in der Konfigurationsdatei deaktiviert wird.",
diff --git a/lib/l10n/el.js b/lib/l10n/el.js
index 572bed27dcb..37825622729 100644
--- a/lib/l10n/el.js
+++ b/lib/l10n/el.js
@@ -81,6 +81,7 @@ OC.L10N.register(
     "Set an admin password." : "Εισάγετε συνθηματικό διαχειριστή.",
     "Can't create or write into the data directory %s" : "Αδύνατη η δημιουργία ή συγγραφή στον κατάλογο δεδομένων %s",
     "%s shared »%s« with you" : "Ο %s διαμοιράστηκε μαζί σας το »%s«",
+    "%s via %s" : "%s μέσω %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Αποτυχία διαμοιρασμού %s, γιατί το σύστημα υποστήριξης δεν επιτρέπει κοινόχρηστα τύπου %i",
     "Sharing %s failed, because the file does not exist" : "Ο διαμοιρασμός του %s απέτυχε, γιατί το αρχείο δεν υπάρχει",
     "You are not allowed to share %s" : "Δεν επιτρέπεται να διαμοιράσετε τον πόρο %s",
@@ -113,6 +114,8 @@ OC.L10N.register(
     "A valid password must be provided" : "Πρέπει να δοθεί έγκυρο συνθηματικό",
     "The username is already being used" : "Το όνομα χρήστη είναι κατειλημμένο",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Δεν βρέθηκαν εγκατεστημένοι οδηγοί βάσεων δεδομένων (sqlite, mysql, or postgresql).",
+    "Microsoft Windows Platform is not supported" : "Η Πλατφόρμα Microsoft Windows δεν υποστηρίζεται",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "H εκτέλεση διακομιστή ownCloud σε πλατφόρμα Microsoft Windows δεν υποστηρίζεται. Αν  επιλογή αλλαγής του διακομιστή, σας προτείνουμε να χρησιμοποιήσετε ένα διακομιστή Linux σε μια εικονική μηχανή,. Βρείτε τα πακέτα Linux, καθώς και εικόνες εικονικής μηχανής στο <a href=\"%s\">%s</a>. Για τη μετεγκατάσταση υφιστάμενων εγκαταστάσεων στο Linux μπορείτε να βρείτε μερικές συμβουλές και ένα σενάριο μετάβασης στην <a href=\"%s\">τεκμηρίωσή μας</a>.",
     "Cannot write into \"config\" directory" : "Αδυναμία εγγραφής στον κατάλογο \"config\"",
     "Cannot write into \"apps\" directory" : "Αδυναμία εγγραφής στον κατάλογο \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Αυτό μπορεί συνήθως να διορθωθεί %sδίνοντας διακαιώματα εγγραφής για τον κατάλογο εφαρμογών στο διακομιστή δικτύου%s ή απενεργοποιώντας το κέντρο εφαρμογών στο αρχείο config.",
@@ -126,6 +129,7 @@ OC.L10N.register(
     "PHP setting \"%s\" is not set to \"%s\"." : "Η ρύθμιση \"%s\"της PHP δεν είναι ορισμένη σε \"%s\".",
     "Adjusting this setting in php.ini will make ownCloud run again" : "Η διόρθωση της ρύθμισης στο αρχείο php.ini θα επιτρέψει στο ownCloud να επαναλειτουργήσει",
     "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να ενημερώσει τον PHP στη νεώτερη έκδοση. Η έκδοση του PHP σας δεν υποστηρίζεται πλεον από το ownCloud και την κοινότητα PHP.",
+    "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "Η PHP έχει ρυθμιστεί για τη αρχικοποίηση των ακατέργαστων δεδομένων αποστολής. Από την PHP έκδοση 5.6 αυτό θα οδηγήσει την PHP στην παραγωγή ειδοποιήσεων σε απόλυτα έγκυρο κώδικα.",
     "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Για να διορθώσετε το πρόβλημα ορίστε το <code>always_populate_raw_post_data</code> ως <code>-1</code> στο αρχείο php.ini",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.",
diff --git a/lib/l10n/el.json b/lib/l10n/el.json
index 722fa824b1f..7396052caf5 100644
--- a/lib/l10n/el.json
+++ b/lib/l10n/el.json
@@ -79,6 +79,7 @@
     "Set an admin password." : "Εισάγετε συνθηματικό διαχειριστή.",
     "Can't create or write into the data directory %s" : "Αδύνατη η δημιουργία ή συγγραφή στον κατάλογο δεδομένων %s",
     "%s shared »%s« with you" : "Ο %s διαμοιράστηκε μαζί σας το »%s«",
+    "%s via %s" : "%s μέσω %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Αποτυχία διαμοιρασμού %s, γιατί το σύστημα υποστήριξης δεν επιτρέπει κοινόχρηστα τύπου %i",
     "Sharing %s failed, because the file does not exist" : "Ο διαμοιρασμός του %s απέτυχε, γιατί το αρχείο δεν υπάρχει",
     "You are not allowed to share %s" : "Δεν επιτρέπεται να διαμοιράσετε τον πόρο %s",
@@ -111,6 +112,8 @@
     "A valid password must be provided" : "Πρέπει να δοθεί έγκυρο συνθηματικό",
     "The username is already being used" : "Το όνομα χρήστη είναι κατειλημμένο",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Δεν βρέθηκαν εγκατεστημένοι οδηγοί βάσεων δεδομένων (sqlite, mysql, or postgresql).",
+    "Microsoft Windows Platform is not supported" : "Η Πλατφόρμα Microsoft Windows δεν υποστηρίζεται",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "H εκτέλεση διακομιστή ownCloud σε πλατφόρμα Microsoft Windows δεν υποστηρίζεται. Αν  επιλογή αλλαγής του διακομιστή, σας προτείνουμε να χρησιμοποιήσετε ένα διακομιστή Linux σε μια εικονική μηχανή,. Βρείτε τα πακέτα Linux, καθώς και εικόνες εικονικής μηχανής στο <a href=\"%s\">%s</a>. Για τη μετεγκατάσταση υφιστάμενων εγκαταστάσεων στο Linux μπορείτε να βρείτε μερικές συμβουλές και ένα σενάριο μετάβασης στην <a href=\"%s\">τεκμηρίωσή μας</a>.",
     "Cannot write into \"config\" directory" : "Αδυναμία εγγραφής στον κατάλογο \"config\"",
     "Cannot write into \"apps\" directory" : "Αδυναμία εγγραφής στον κατάλογο \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Αυτό μπορεί συνήθως να διορθωθεί %sδίνοντας διακαιώματα εγγραφής για τον κατάλογο εφαρμογών στο διακομιστή δικτύου%s ή απενεργοποιώντας το κέντρο εφαρμογών στο αρχείο config.",
@@ -124,6 +127,7 @@
     "PHP setting \"%s\" is not set to \"%s\"." : "Η ρύθμιση \"%s\"της PHP δεν είναι ορισμένη σε \"%s\".",
     "Adjusting this setting in php.ini will make ownCloud run again" : "Η διόρθωση της ρύθμισης στο αρχείο php.ini θα επιτρέψει στο ownCloud να επαναλειτουργήσει",
     "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να ενημερώσει τον PHP στη νεώτερη έκδοση. Η έκδοση του PHP σας δεν υποστηρίζεται πλεον από το ownCloud και την κοινότητα PHP.",
+    "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "Η PHP έχει ρυθμιστεί για τη αρχικοποίηση των ακατέργαστων δεδομένων αποστολής. Από την PHP έκδοση 5.6 αυτό θα οδηγήσει την PHP στην παραγωγή ειδοποιήσεων σε απόλυτα έγκυρο κώδικα.",
     "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Για να διορθώσετε το πρόβλημα ορίστε το <code>always_populate_raw_post_data</code> ως <code>-1</code> στο αρχείο php.ini",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.",
diff --git a/lib/l10n/fi_FI.js b/lib/l10n/fi_FI.js
index 3ab7d4fca9c..dfe90975b61 100644
--- a/lib/l10n/fi_FI.js
+++ b/lib/l10n/fi_FI.js
@@ -100,6 +100,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Anna kelvollinen salasana",
     "The username is already being used" : "Käyttäjätunnus on jo käytössä",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Tietokanta-ajureita (sqlite, mysql tai postgresql) ei ole asennettu.",
+    "Microsoft Windows Platform is not supported" : "Microsoft Windows -alusta ei ole tuettu",
     "Cannot write into \"config\" directory" : "Hakemistoon \"config\" kirjoittaminen ei onnistu",
     "Cannot write into \"apps\" directory" : "Hakemistoon \"apps\" kirjoittaminen ei onnistu",
     "Cannot create \"data\" directory (%s)" : "Kansion \"data\" luominen ei onnistu (%s)",
diff --git a/lib/l10n/fi_FI.json b/lib/l10n/fi_FI.json
index a82cf0ae595..59de6195405 100644
--- a/lib/l10n/fi_FI.json
+++ b/lib/l10n/fi_FI.json
@@ -98,6 +98,7 @@
     "A valid password must be provided" : "Anna kelvollinen salasana",
     "The username is already being used" : "Käyttäjätunnus on jo käytössä",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Tietokanta-ajureita (sqlite, mysql tai postgresql) ei ole asennettu.",
+    "Microsoft Windows Platform is not supported" : "Microsoft Windows -alusta ei ole tuettu",
     "Cannot write into \"config\" directory" : "Hakemistoon \"config\" kirjoittaminen ei onnistu",
     "Cannot write into \"apps\" directory" : "Hakemistoon \"apps\" kirjoittaminen ei onnistu",
     "Cannot create \"data\" directory (%s)" : "Kansion \"data\" luominen ei onnistu (%s)",
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index 5823559e4be..5a235f06ca5 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -81,6 +81,7 @@ OC.L10N.register(
     "Set an admin password." : "Spécifiez un mot de passe pour l'administrateur.",
     "Can't create or write into the data directory %s" : "Impossible de créer ou d'écrire dans le répertoire des données %s",
     "%s shared »%s« with you" : "%s partagé »%s« avec vous",
+    "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Le partage de %s a échoué car l’infrastructure n'autorise pas les partages de type %i",
     "Sharing %s failed, because the file does not exist" : "Le partage de %s a échoué car le fichier n'existe pas",
     "You are not allowed to share %s" : "Vous n'êtes pas autorisé à partager %s",
@@ -113,6 +114,8 @@ OC.L10N.register(
     "A valid password must be provided" : "Un mot de passe valide doit être saisi",
     "The username is already being used" : "Ce nom d'utilisateur est déjà utilisé",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Aucun pilote de base de données (sqlite, mysql, ou postgresql) n’est installé.",
+    "Microsoft Windows Platform is not supported" : "La plate-forme Microsoft Windows n'est pas prise en charge.",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Executer un serveur ownCloud sur une plate-forme Microsoft Windows n'est pas pris en charge. Nous vous suggérons d'utiliser un serveur Linux sur une machine virtuelle si vous n'avez pas la possibilité de migrer votre serveur. Les paquets Linux ainsi que des images virtuelles faciles à déployer se trouvent sur <a href=\"%s\">%s</a>. Pour migrer des installations existantes vers Linux, vous trouverez des conseils et des scripts de migration dans <a href=\"%s\">notre documentation</a>.",
     "Cannot write into \"config\" directory" : "Impossible d’écrire dans le répertoire \"config\"",
     "Cannot write into \"apps\" directory" : "Impossible d’écrire dans le répertoire \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ce problème est généralement résolu %sen donnant au serveur web un accès en écriture au répertoire apps%s ou en désactivant l'appstore dans le fichier de configuration.",
@@ -126,9 +129,9 @@ OC.L10N.register(
     "PHP setting \"%s\" is not set to \"%s\"." : "Le paramètre PHP \"%s\" n'est pas \"%s\".",
     "Adjusting this setting in php.ini will make ownCloud run again" : "Ajuster ce paramètre dans php.ini permettra à ownCloud de fonctionner à nouveau",
     "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Veuillez demander à votre administrateur de mettre à jour PHP vers sa dernière version disponible. La vôtre n’est plus prise en charge par ownCloud ni par la communauté PHP.",
-    "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP est configuré pour remplir des données brutes POST. A partir de PHP 5.6, cela va générer des avis pour du code parfaitement valide.",
+    "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP est configuré pour remplir des données brutes POST. A partir de PHP 5.6, cela va générer des Notices pour du code parfaitement valide.",
     "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Pour corriger ce problème, configurez <code>always_populate_raw_post_data</code> à <code>-1</code> dans votre php.ini",
-    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes du code. Cela rendra plusieurs applications de base inaccessibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
     "PHP modules have been installed, but they are still listed as missing?" : "Les modules PHP ont été installés mais sont toujours indiqués comme manquants ?",
     "Please ask your server administrator to restart the web server." : "Veuillez demander à votre administrateur serveur de redémarrer le serveur web.",
@@ -140,7 +143,7 @@ OC.L10N.register(
     "Data directory (%s) is readable by other users" : "Le répertoire de données (%s) est lisible par les autres utilisateurs",
     "Data directory (%s) must be an absolute path" : "Le chemin du dossier de données (%s) doit être absolu",
     "Check the value of \"datadirectory\" in your configuration" : "Verifiez la valeur de \"datadirectory\" dans votre configuration",
-    "Data directory (%s) is invalid" : "Le répertoire (%s) est invalide",
+    "Data directory (%s) is invalid" : "Le répertoire (%s) n'est pas valide",
     "Please check that the data directory contains a file \".ocdata\" in its root." : "Veuillez vérifier que le répertoire de données contient un fichier \".ocdata\" à sa racine.",
     "Could not obtain lock type %d on \"%s\"." : "Impossible d'obtenir le verrouillage de type %d sur \"%s\"."
 },
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index 3e4b40c2083..f348592850a 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -79,6 +79,7 @@
     "Set an admin password." : "Spécifiez un mot de passe pour l'administrateur.",
     "Can't create or write into the data directory %s" : "Impossible de créer ou d'écrire dans le répertoire des données %s",
     "%s shared »%s« with you" : "%s partagé »%s« avec vous",
+    "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Le partage de %s a échoué car l’infrastructure n'autorise pas les partages de type %i",
     "Sharing %s failed, because the file does not exist" : "Le partage de %s a échoué car le fichier n'existe pas",
     "You are not allowed to share %s" : "Vous n'êtes pas autorisé à partager %s",
@@ -111,6 +112,8 @@
     "A valid password must be provided" : "Un mot de passe valide doit être saisi",
     "The username is already being used" : "Ce nom d'utilisateur est déjà utilisé",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Aucun pilote de base de données (sqlite, mysql, ou postgresql) n’est installé.",
+    "Microsoft Windows Platform is not supported" : "La plate-forme Microsoft Windows n'est pas prise en charge.",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Executer un serveur ownCloud sur une plate-forme Microsoft Windows n'est pas pris en charge. Nous vous suggérons d'utiliser un serveur Linux sur une machine virtuelle si vous n'avez pas la possibilité de migrer votre serveur. Les paquets Linux ainsi que des images virtuelles faciles à déployer se trouvent sur <a href=\"%s\">%s</a>. Pour migrer des installations existantes vers Linux, vous trouverez des conseils et des scripts de migration dans <a href=\"%s\">notre documentation</a>.",
     "Cannot write into \"config\" directory" : "Impossible d’écrire dans le répertoire \"config\"",
     "Cannot write into \"apps\" directory" : "Impossible d’écrire dans le répertoire \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ce problème est généralement résolu %sen donnant au serveur web un accès en écriture au répertoire apps%s ou en désactivant l'appstore dans le fichier de configuration.",
@@ -124,9 +127,9 @@
     "PHP setting \"%s\" is not set to \"%s\"." : "Le paramètre PHP \"%s\" n'est pas \"%s\".",
     "Adjusting this setting in php.ini will make ownCloud run again" : "Ajuster ce paramètre dans php.ini permettra à ownCloud de fonctionner à nouveau",
     "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Veuillez demander à votre administrateur de mettre à jour PHP vers sa dernière version disponible. La vôtre n’est plus prise en charge par ownCloud ni par la communauté PHP.",
-    "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP est configuré pour remplir des données brutes POST. A partir de PHP 5.6, cela va générer des avis pour du code parfaitement valide.",
+    "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP est configuré pour remplir des données brutes POST. A partir de PHP 5.6, cela va générer des Notices pour du code parfaitement valide.",
     "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Pour corriger ce problème, configurez <code>always_populate_raw_post_data</code> à <code>-1</code> dans votre php.ini",
-    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes du code. Cela rendra plusieurs applications de base inaccessibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
     "PHP modules have been installed, but they are still listed as missing?" : "Les modules PHP ont été installés mais sont toujours indiqués comme manquants ?",
     "Please ask your server administrator to restart the web server." : "Veuillez demander à votre administrateur serveur de redémarrer le serveur web.",
@@ -138,7 +141,7 @@
     "Data directory (%s) is readable by other users" : "Le répertoire de données (%s) est lisible par les autres utilisateurs",
     "Data directory (%s) must be an absolute path" : "Le chemin du dossier de données (%s) doit être absolu",
     "Check the value of \"datadirectory\" in your configuration" : "Verifiez la valeur de \"datadirectory\" dans votre configuration",
-    "Data directory (%s) is invalid" : "Le répertoire (%s) est invalide",
+    "Data directory (%s) is invalid" : "Le répertoire (%s) n'est pas valide",
     "Please check that the data directory contains a file \".ocdata\" in its root." : "Veuillez vérifier que le répertoire de données contient un fichier \".ocdata\" à sa racine.",
     "Could not obtain lock type %d on \"%s\"." : "Impossible d'obtenir le verrouillage de type %d sur \"%s\"."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/lib/l10n/gl.js b/lib/l10n/gl.js
index 1fef04bd7f9..2142b296108 100644
--- a/lib/l10n/gl.js
+++ b/lib/l10n/gl.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Set an admin password." : "Estabeleza un contrasinal de administrador",
     "Can't create or write into the data directory %s" : "Non é posíbel crear ou escribir o directorio «data» %s",
     "%s shared »%s« with you" : "%s compartiu «%s» con vostede",
+    "%s via %s" : "%s vía %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Fallou a compartición de %s, xa que a infraestrutura non permite accións do tipo %i",
     "Sharing %s failed, because the file does not exist" : "Fallou a compartición de %s, o ficheiro non existe",
     "You are not allowed to share %s" : "Non ten permiso para compartir %s",
@@ -116,6 +117,8 @@ OC.L10N.register(
     "A valid password must be provided" : "Debe fornecer un contrasinal",
     "The username is already being used" : "Este nome de usuario xa está a ser usado",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Non hay controladores de base de datos (sqlite, mysql, ou postgresql) instalados.",
+    "Microsoft Windows Platform is not supported" : "A plataforma Windows de Microsoft non é compatíbel",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Non é posíbel a execución dun servidor ownCloud na plataforma Microsoft Windows. Se non ten a opción de migrar o propio servidor, suxerímoslle que empregue un servidor Linux nunha máquina virtual. Pode atopar paquetes de Linux, así como imaxes de máquinas virtuais doadas de instalar en <a href=\"%s\">%s</a>. Para a migración das instalacións existentes cara Linux pode atopar algúns consellos e un script de migración na <a href=\"%s\">nosa documentación</a>.",
     "Cannot write into \"config\" directory" : "Non é posíbel escribir no directorio «config»",
     "Cannot write into \"apps\" directory" : "Non é posíbel escribir no directorio «apps»",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «apps»%s ou a desactivación da «appstore» no ficheiro de configuración.",
@@ -130,7 +133,7 @@ OC.L10N.register(
     "Adjusting this setting in php.ini will make ownCloud run again" : "Facer este axuste en php.ini fará que ownCloud volva executarse",
     "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Pregúntelle ao administrador do servidor pola actualización de PHP á versión máis recente. A súa versión de PHP xa non é asistida polas comunidades de ownCloud e PHP.",
     "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP está configurado para encher datos de código en bruto. Desde PHP 5.6 isto levará a que PHP forneza avisos con código perfectamente correcto.",
-    "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para solucionar este problema estabeleza <code>always_populate_raw_post_data</code> a <code>-1</code> no seu php.ini",
+    "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para arranxar este incidencia estabeleza <code>always_populate_raw_post_data</code> a <code>-1</code> no seu php.ini",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
     "PHP modules have been installed, but they are still listed as missing?" : "Instaláronse os módulos de PHP, mais aínda aparecen listados como perdidos?",
diff --git a/lib/l10n/gl.json b/lib/l10n/gl.json
index 641aa81d644..5f32b2842dd 100644
--- a/lib/l10n/gl.json
+++ b/lib/l10n/gl.json
@@ -82,6 +82,7 @@
     "Set an admin password." : "Estabeleza un contrasinal de administrador",
     "Can't create or write into the data directory %s" : "Non é posíbel crear ou escribir o directorio «data» %s",
     "%s shared »%s« with you" : "%s compartiu «%s» con vostede",
+    "%s via %s" : "%s vía %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Fallou a compartición de %s, xa que a infraestrutura non permite accións do tipo %i",
     "Sharing %s failed, because the file does not exist" : "Fallou a compartición de %s, o ficheiro non existe",
     "You are not allowed to share %s" : "Non ten permiso para compartir %s",
@@ -114,6 +115,8 @@
     "A valid password must be provided" : "Debe fornecer un contrasinal",
     "The username is already being used" : "Este nome de usuario xa está a ser usado",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Non hay controladores de base de datos (sqlite, mysql, ou postgresql) instalados.",
+    "Microsoft Windows Platform is not supported" : "A plataforma Windows de Microsoft non é compatíbel",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Non é posíbel a execución dun servidor ownCloud na plataforma Microsoft Windows. Se non ten a opción de migrar o propio servidor, suxerímoslle que empregue un servidor Linux nunha máquina virtual. Pode atopar paquetes de Linux, así como imaxes de máquinas virtuais doadas de instalar en <a href=\"%s\">%s</a>. Para a migración das instalacións existentes cara Linux pode atopar algúns consellos e un script de migración na <a href=\"%s\">nosa documentación</a>.",
     "Cannot write into \"config\" directory" : "Non é posíbel escribir no directorio «config»",
     "Cannot write into \"apps\" directory" : "Non é posíbel escribir no directorio «apps»",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «apps»%s ou a desactivación da «appstore» no ficheiro de configuración.",
@@ -128,7 +131,7 @@
     "Adjusting this setting in php.ini will make ownCloud run again" : "Facer este axuste en php.ini fará que ownCloud volva executarse",
     "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Pregúntelle ao administrador do servidor pola actualización de PHP á versión máis recente. A súa versión de PHP xa non é asistida polas comunidades de ownCloud e PHP.",
     "PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code." : "PHP está configurado para encher datos de código en bruto. Desde PHP 5.6 isto levará a que PHP forneza avisos con código perfectamente correcto.",
-    "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para solucionar este problema estabeleza <code>always_populate_raw_post_data</code> a <code>-1</code> no seu php.ini",
+    "To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini" : "Para arranxar este incidencia estabeleza <code>always_populate_raw_post_data</code> a <code>-1</code> no seu php.ini",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
     "PHP modules have been installed, but they are still listed as missing?" : "Instaláronse os módulos de PHP, mais aínda aparecen listados como perdidos?",
diff --git a/lib/l10n/it.js b/lib/l10n/it.js
index e3a04f41a4b..7075997b18b 100644
--- a/lib/l10n/it.js
+++ b/lib/l10n/it.js
@@ -116,6 +116,8 @@ OC.L10N.register(
     "A valid password must be provided" : "Deve essere fornita una password valida",
     "The username is already being used" : "Il nome utente è già utilizzato",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Nessun driver di database (sqlite, mysql o postgresql) installato",
+    "Microsoft Windows Platform is not supported" : "La piattaforma Microsoft Windows non è supportata",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "L'esecuzione del server ownCloud sulla piattaforma Microsoft Windows non è supportata. Ti suggeriamo di utilizzare un server Linux in una macchina virtuale, se non hai la possibilità di migrare il server. Puoi trovare i pacchetti per Linux o immagini di macchine virtuali da istanziare su <a href=\"%s\">%s</a>. Per la migrazione di installazioni esistenti su Linux, puoi trovare alcuni suggerimenti e uno script di migrazione nella <a href=\"%s\">nostra documentazione</a>.",
     "Cannot write into \"config\" directory" : "Impossibile scrivere nella cartella \"config\"",
     "Cannot write into \"apps\" directory" : "Impossibile scrivere nella cartella \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ciò può essere normalmente corretto %sfornendo al server web accesso in scrittura alla cartella \"apps\"%s o disabilitando il negozio di applicazioni nel file di configurazione.",
diff --git a/lib/l10n/it.json b/lib/l10n/it.json
index fbe536a6f56..4124a5bf3c8 100644
--- a/lib/l10n/it.json
+++ b/lib/l10n/it.json
@@ -114,6 +114,8 @@
     "A valid password must be provided" : "Deve essere fornita una password valida",
     "The username is already being used" : "Il nome utente è già utilizzato",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Nessun driver di database (sqlite, mysql o postgresql) installato",
+    "Microsoft Windows Platform is not supported" : "La piattaforma Microsoft Windows non è supportata",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "L'esecuzione del server ownCloud sulla piattaforma Microsoft Windows non è supportata. Ti suggeriamo di utilizzare un server Linux in una macchina virtuale, se non hai la possibilità di migrare il server. Puoi trovare i pacchetti per Linux o immagini di macchine virtuali da istanziare su <a href=\"%s\">%s</a>. Per la migrazione di installazioni esistenti su Linux, puoi trovare alcuni suggerimenti e uno script di migrazione nella <a href=\"%s\">nostra documentazione</a>.",
     "Cannot write into \"config\" directory" : "Impossibile scrivere nella cartella \"config\"",
     "Cannot write into \"apps\" directory" : "Impossibile scrivere nella cartella \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ciò può essere normalmente corretto %sfornendo al server web accesso in scrittura alla cartella \"apps\"%s o disabilitando il negozio di applicazioni nel file di configurazione.",
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index 28b8ac7fe82..7955faa01a6 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Set an admin password." : "Stel een beheerderswachtwoord in.",
     "Can't create or write into the data directory %s" : "Kan niets creëren of wegschrijven in datadirectory %s",
     "%s shared »%s« with you" : "%s deelde »%s« met u",
+    "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Delen van %s is mislukt, omdat de share-backend niet toestaat om type %i te delen",
     "Sharing %s failed, because the file does not exist" : "Delen van %s is mislukt, omdat het bestand niet bestaat",
     "You are not allowed to share %s" : "U bent niet bevoegd om %s te delen",
@@ -116,6 +117,8 @@ OC.L10N.register(
     "A valid password must be provided" : "Er moet een geldig wachtwoord worden opgegeven",
     "The username is already being used" : "De gebruikersnaam bestaat al",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Geen database drivers (sqlite, mysql of postgres) geïnstalleerd.",
+    "Microsoft Windows Platform is not supported" : "Microsoft Windows Platform wordt niet ondersteund",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Het draaien van een ownCloud server op het Microsoft Windows platform wordt niet ondersteund. We adviseren om een Linux server binnen een virtuele machine te gebruiken als u niet de mogelijkheid hebt om te migreren. Linux packages en eenvoudig te installeren virtuele machine images zijn te vinden op <a href=\"%s\">%s</a>. Voor migratie van bestaande installaties naar Linux vind u tips en migratiescripts in <a href=\"%s\">onze documentatie</a>.",
     "Cannot write into \"config\" directory" : "Kan niet schrijven naar de \"config\" directory",
     "Cannot write into \"apps\" directory" : "Kan niet schrijven naar de \"apps\" directory",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de appsdirectory %s of door de appstore te deactiveren in het configbestand.",
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index 3c2ce441024..3a67fc3ad57 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -82,6 +82,7 @@
     "Set an admin password." : "Stel een beheerderswachtwoord in.",
     "Can't create or write into the data directory %s" : "Kan niets creëren of wegschrijven in datadirectory %s",
     "%s shared »%s« with you" : "%s deelde »%s« met u",
+    "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Delen van %s is mislukt, omdat de share-backend niet toestaat om type %i te delen",
     "Sharing %s failed, because the file does not exist" : "Delen van %s is mislukt, omdat het bestand niet bestaat",
     "You are not allowed to share %s" : "U bent niet bevoegd om %s te delen",
@@ -114,6 +115,8 @@
     "A valid password must be provided" : "Er moet een geldig wachtwoord worden opgegeven",
     "The username is already being used" : "De gebruikersnaam bestaat al",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Geen database drivers (sqlite, mysql of postgres) geïnstalleerd.",
+    "Microsoft Windows Platform is not supported" : "Microsoft Windows Platform wordt niet ondersteund",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Het draaien van een ownCloud server op het Microsoft Windows platform wordt niet ondersteund. We adviseren om een Linux server binnen een virtuele machine te gebruiken als u niet de mogelijkheid hebt om te migreren. Linux packages en eenvoudig te installeren virtuele machine images zijn te vinden op <a href=\"%s\">%s</a>. Voor migratie van bestaande installaties naar Linux vind u tips en migratiescripts in <a href=\"%s\">onze documentatie</a>.",
     "Cannot write into \"config\" directory" : "Kan niet schrijven naar de \"config\" directory",
     "Cannot write into \"apps\" directory" : "Kan niet schrijven naar de \"apps\" directory",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de appsdirectory %s of door de appstore te deactiveren in het configbestand.",
diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js
index 8eb83afc5ca..43b1008ece8 100644
--- a/lib/l10n/pt_BR.js
+++ b/lib/l10n/pt_BR.js
@@ -81,6 +81,7 @@ OC.L10N.register(
     "Set an admin password." : "Defina uma senha de administrador.",
     "Can't create or write into the data directory %s" : "Não é possível criar ou gravar no diretório de dados %s",
     "%s shared »%s« with you" : "%s compartilhou »%s« com você",
+    "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "O compartilhamento %s falhou, porque o processo interno não permite ações de tipo %i",
     "Sharing %s failed, because the file does not exist" : "Compartilhamento %s falhou, porque o arquivo não existe",
     "You are not allowed to share %s" : "Você não tem permissão para compartilhar %s",
@@ -113,6 +114,8 @@ OC.L10N.register(
     "A valid password must be provided" : "Forneça uma senha válida",
     "The username is already being used" : "Este nome de usuário já está sendo usado",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Nenhum driver  de banco de dados (sqlite, mysql, or postgresql) instalado.",
+    "Microsoft Windows Platform is not supported" : "Plataforma Microsoft Windows não é suportada",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Não é suportado execução do ownCloud Server na plataforma Microsoft Windows. Nós sugerimos que você use um servidor Linux em uma máquina virtual, se você não tem opção para migrar o próprio servidor. Encontre pacotes Linux, bem como imagens de máquinas virtuais fáceis de implantar  em <a href=\"%s\">%s</a>. Para migrar as instalações existentes para Linux pode encontrar algumas dicas e um script de migração em <a href=\"%s\">nossa documentação</a>.",
     "Cannot write into \"config\" directory" : "Não é possível gravar no diretório \"config\"",
     "Cannot write into \"apps\" directory" : "Não é possível gravar no diretório \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Isto pode ser corrigido dando ao webserver permissão de escrita %sgiving para o diretório apps directory%s ou desabilitando o appstore no arquivo de configuração.",
diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json
index 85223bcd31b..186c757d096 100644
--- a/lib/l10n/pt_BR.json
+++ b/lib/l10n/pt_BR.json
@@ -79,6 +79,7 @@
     "Set an admin password." : "Defina uma senha de administrador.",
     "Can't create or write into the data directory %s" : "Não é possível criar ou gravar no diretório de dados %s",
     "%s shared »%s« with you" : "%s compartilhou »%s« com você",
+    "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "O compartilhamento %s falhou, porque o processo interno não permite ações de tipo %i",
     "Sharing %s failed, because the file does not exist" : "Compartilhamento %s falhou, porque o arquivo não existe",
     "You are not allowed to share %s" : "Você não tem permissão para compartilhar %s",
@@ -111,6 +112,8 @@
     "A valid password must be provided" : "Forneça uma senha válida",
     "The username is already being used" : "Este nome de usuário já está sendo usado",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Nenhum driver  de banco de dados (sqlite, mysql, or postgresql) instalado.",
+    "Microsoft Windows Platform is not supported" : "Plataforma Microsoft Windows não é suportada",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Não é suportado execução do ownCloud Server na plataforma Microsoft Windows. Nós sugerimos que você use um servidor Linux em uma máquina virtual, se você não tem opção para migrar o próprio servidor. Encontre pacotes Linux, bem como imagens de máquinas virtuais fáceis de implantar  em <a href=\"%s\">%s</a>. Para migrar as instalações existentes para Linux pode encontrar algumas dicas e um script de migração em <a href=\"%s\">nossa documentação</a>.",
     "Cannot write into \"config\" directory" : "Não é possível gravar no diretório \"config\"",
     "Cannot write into \"apps\" directory" : "Não é possível gravar no diretório \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Isto pode ser corrigido dando ao webserver permissão de escrita %sgiving para o diretório apps directory%s ou desabilitando o appstore no arquivo de configuração.",
diff --git a/lib/l10n/pt_PT.js b/lib/l10n/pt_PT.js
index 94dd8d47e30..c003e47756f 100644
--- a/lib/l10n/pt_PT.js
+++ b/lib/l10n/pt_PT.js
@@ -81,6 +81,7 @@ OC.L10N.register(
     "Set an admin password." : "Definiar uma password de administrador",
     "Can't create or write into the data directory %s" : "Não é possível criar ou escrever a directoria data %s",
     "%s shared »%s« with you" : "%s partilhado »%s« consigo",
+    "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "A partilha de %s falhou porque a interface não permite as partilhas do tipo %i",
     "Sharing %s failed, because the file does not exist" : "A partilha de %s falhou, porque o ficheiro não existe",
     "You are not allowed to share %s" : "Não está autorizado a partilhar %s",
@@ -113,6 +114,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Uma password válida deve ser fornecida",
     "The username is already being used" : "O nome de utilizador já está a ser usado",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Nenhuma base de dados de drivers (sqlite, mysql, or postgresql) instaladas.",
+    "Microsoft Windows Platform is not supported" : "A plataforma Microsoft Windows não é suportada",
     "Cannot write into \"config\" directory" : "Não é possível escrever na directoria \"configurar\"",
     "Cannot write into \"apps\" directory" : "Não é possivel escrever na directoria \"aplicações\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Isto pode ser normalmente resolvido %sdando ao servidor web direito de escrita para o directório de aplicação%s ou desactivando a loja de aplicações no ficheiro de configuração.",
diff --git a/lib/l10n/pt_PT.json b/lib/l10n/pt_PT.json
index 5b16c0a7761..e05d2705eae 100644
--- a/lib/l10n/pt_PT.json
+++ b/lib/l10n/pt_PT.json
@@ -79,6 +79,7 @@
     "Set an admin password." : "Definiar uma password de administrador",
     "Can't create or write into the data directory %s" : "Não é possível criar ou escrever a directoria data %s",
     "%s shared »%s« with you" : "%s partilhado »%s« consigo",
+    "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "A partilha de %s falhou porque a interface não permite as partilhas do tipo %i",
     "Sharing %s failed, because the file does not exist" : "A partilha de %s falhou, porque o ficheiro não existe",
     "You are not allowed to share %s" : "Não está autorizado a partilhar %s",
@@ -111,6 +112,7 @@
     "A valid password must be provided" : "Uma password válida deve ser fornecida",
     "The username is already being used" : "O nome de utilizador já está a ser usado",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Nenhuma base de dados de drivers (sqlite, mysql, or postgresql) instaladas.",
+    "Microsoft Windows Platform is not supported" : "A plataforma Microsoft Windows não é suportada",
     "Cannot write into \"config\" directory" : "Não é possível escrever na directoria \"configurar\"",
     "Cannot write into \"apps\" directory" : "Não é possivel escrever na directoria \"aplicações\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Isto pode ser normalmente resolvido %sdando ao servidor web direito de escrita para o directório de aplicação%s ou desactivando a loja de aplicações no ficheiro de configuração.",
diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js
index c64ef233a19..fa026c27741 100644
--- a/lib/l10n/ru.js
+++ b/lib/l10n/ru.js
@@ -116,6 +116,8 @@ OC.L10N.register(
     "A valid password must be provided" : "Укажите правильный пароль",
     "The username is already being used" : "Имя пользователя уже используется",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Не установлены драйвера баз данных (sqlite, mysql или postgresql)",
+    "Microsoft Windows Platform is not supported" : "Платформа Microsoft Windows не поддерживается",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Установка ownCloud на платформе Microsoft Windows Server не поддерживается. Мы рекомендуем использовать сервер на базе ядра Linux, если-же замена ОС на сервере не возможна, рекомендуется установить Linux-сервер на виртуальную машину. Пакеты для Linux, а так-же легко развертываемый образ виртуальной машины можно найти <a href=\"%s\">%s</a>. Скрипты и советы для миграции существующих серверов на Linux вы можете найти в <a href=\"%s\">нашей документации</a>.",
     "Cannot write into \"config\" directory" : "Запись в каталог \"config\" невозможна",
     "Cannot write into \"apps\" directory" : "Запись в каталог \"app\" невозможна",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в каталог приложений%s или отключив хранилище программ в файле конфигурации.",
diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json
index 4912049d2e4..9b63890c826 100644
--- a/lib/l10n/ru.json
+++ b/lib/l10n/ru.json
@@ -114,6 +114,8 @@
     "A valid password must be provided" : "Укажите правильный пароль",
     "The username is already being used" : "Имя пользователя уже используется",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Не установлены драйвера баз данных (sqlite, mysql или postgresql)",
+    "Microsoft Windows Platform is not supported" : "Платформа Microsoft Windows не поддерживается",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Установка ownCloud на платформе Microsoft Windows Server не поддерживается. Мы рекомендуем использовать сервер на базе ядра Linux, если-же замена ОС на сервере не возможна, рекомендуется установить Linux-сервер на виртуальную машину. Пакеты для Linux, а так-же легко развертываемый образ виртуальной машины можно найти <a href=\"%s\">%s</a>. Скрипты и советы для миграции существующих серверов на Linux вы можете найти в <a href=\"%s\">нашей документации</a>.",
     "Cannot write into \"config\" directory" : "Запись в каталог \"config\" невозможна",
     "Cannot write into \"apps\" directory" : "Запись в каталог \"app\" невозможна",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в каталог приложений%s или отключив хранилище программ в файле конфигурации.",
diff --git a/lib/l10n/sr.js b/lib/l10n/sr.js
index c0cd84987c2..e88b2ef6840 100644
--- a/lib/l10n/sr.js
+++ b/lib/l10n/sr.js
@@ -116,6 +116,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Морате унети исправну лозинку",
     "The username is already being used" : "Корисничко име се већ користи",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Нема драјвера базе података (скулајт, мајскул или постгрескул).",
+    "Microsoft Windows Platform is not supported" : "Мајкрософт Виндоуз платформа није подржана",
     "Cannot write into \"config\" directory" : "Не могу уписивати у директоријуму \"config\"",
     "Cannot write into \"apps\" directory" : "Не могу уписивати у директоријуму \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ово се обично може поправити %sgдавањем права уписа веб серверу директоријум%s апликација или искуључивањем продавнице апликација у датотеци config file.",
diff --git a/lib/l10n/sr.json b/lib/l10n/sr.json
index 770a3982ceb..e1b13fdce85 100644
--- a/lib/l10n/sr.json
+++ b/lib/l10n/sr.json
@@ -114,6 +114,7 @@
     "A valid password must be provided" : "Морате унети исправну лозинку",
     "The username is already being used" : "Корисничко име се већ користи",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Нема драјвера базе података (скулајт, мајскул или постгрескул).",
+    "Microsoft Windows Platform is not supported" : "Мајкрософт Виндоуз платформа није подржана",
     "Cannot write into \"config\" directory" : "Не могу уписивати у директоријуму \"config\"",
     "Cannot write into \"apps\" directory" : "Не могу уписивати у директоријуму \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ово се обично може поправити %sgдавањем права уписа веб серверу директоријум%s апликација или искуључивањем продавнице апликација у датотеци config file.",
diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js
index d457ba217dc..6303ffe75f6 100644
--- a/lib/l10n/tr.js
+++ b/lib/l10n/tr.js
@@ -31,8 +31,11 @@ OC.L10N.register(
     "yesterday" : "dün",
     "_%n day ago_::_%n days ago_" : ["%n gün önce","%n gün önce"],
     "last month" : "geçen ay",
+    "_%n month ago_::_%n months ago_" : ["%n ay önce","%n ay önce"],
     "last year" : "geçen yıl",
     "_%n year ago_::_%n years ago_" : ["%n yıl önce","%n yıl önce"],
+    "_%n hour ago_::_%n hours ago_" : ["%n saat önce","%n saat önce"],
+    "_%n minute ago_::_%n minutes ago_" : ["%n dakika önce","%n dakika önce"],
     "seconds ago" : "saniyeler önce",
     "web services under your control" : "denetiminizdeki web hizmetleri",
     "Empty filename is not allowed" : "Boş dasya adına izin verilmiyor",
@@ -113,6 +116,8 @@ OC.L10N.register(
     "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı",
     "The username is already being used" : "Bu kullanıcı adı zaten kullanımda",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Yüklü veritabanı sürücüsü (sqlite, mysql veya postgresql) yok.",
+    "Microsoft Windows Platform is not supported" : "Microsoft Windows Platformu desteklenmiyor",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>.",
     "Cannot write into \"config\" directory" : "\"config\" dizinine yazılamıyor",
     "Cannot write into \"apps\" directory" : "\"apps\" dizinine yazılamıyor",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Bu genellikle, %sweb sunucusuna apps dizinine yazma erişimi verilerek%s veya yapılandırma dosyasında appstore (uygulama mağazası) devre dışı bırakılarak çözülebilir.",
diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json
index 7c710c48643..6978865120f 100644
--- a/lib/l10n/tr.json
+++ b/lib/l10n/tr.json
@@ -29,8 +29,11 @@
     "yesterday" : "dün",
     "_%n day ago_::_%n days ago_" : ["%n gün önce","%n gün önce"],
     "last month" : "geçen ay",
+    "_%n month ago_::_%n months ago_" : ["%n ay önce","%n ay önce"],
     "last year" : "geçen yıl",
     "_%n year ago_::_%n years ago_" : ["%n yıl önce","%n yıl önce"],
+    "_%n hour ago_::_%n hours ago_" : ["%n saat önce","%n saat önce"],
+    "_%n minute ago_::_%n minutes ago_" : ["%n dakika önce","%n dakika önce"],
     "seconds ago" : "saniyeler önce",
     "web services under your control" : "denetiminizdeki web hizmetleri",
     "Empty filename is not allowed" : "Boş dasya adına izin verilmiyor",
@@ -111,6 +114,8 @@
     "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı",
     "The username is already being used" : "Bu kullanıcı adı zaten kullanımda",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Yüklü veritabanı sürücüsü (sqlite, mysql veya postgresql) yok.",
+    "Microsoft Windows Platform is not supported" : "Microsoft Windows Platformu desteklenmiyor",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>.",
     "Cannot write into \"config\" directory" : "\"config\" dizinine yazılamıyor",
     "Cannot write into \"apps\" directory" : "\"apps\" dizinine yazılamıyor",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Bu genellikle, %sweb sunucusuna apps dizinine yazma erişimi verilerek%s veya yapılandırma dosyasında appstore (uygulama mağazası) devre dışı bırakılarak çözülebilir.",
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" : "管理者復原密碼",