[tx-robot] updated from transifex

author: Jenkins for ownCloud <owncloud-bot@tmit.eu> 2015-04-18 08:55:19 +0300
committer: Jenkins for ownCloud <owncloud-bot@tmit.eu> 2015-04-18 08:55:19 +0300
commit: 37a871127b750d0f633cdfb7713b0582dfdf2d6a (patch)
tree: 534a7c6e6fd5d443f086415607899ebc92738e30
parent: 4dd2ad7f4abc66f40c93f8f974737138ba187f46 (diff)
242 files changed, 692 insertions, 198 deletions
diff --git a/apps/encryption/l10n/ar.js b/apps/encryption/l10n/ar.js
index e4f0499f9f1..aa07ac83c77 100644
--- a/apps/encryption/l10n/ar.js
+++ b/apps/encryption/l10n/ar.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "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." : "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "المفتاح الخاص بتشفير التطبيقات غير صالح. يرجى تحديث كلمة السر الخاصة بالمفتاح الخاص من الإعدادت الشخصية حتى تتمكن من الوصول للملفات المشفرة.",
     "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" : "استعادة كلمة مرور المفتاح",
diff --git a/apps/encryption/l10n/ar.json b/apps/encryption/l10n/ar.json
index dfb2066e42c..abee54f539d 100644
--- a/apps/encryption/l10n/ar.json
+++ b/apps/encryption/l10n/ar.json
@@ -5,6 +5,7 @@
     "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." : "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "المفتاح الخاص بتشفير التطبيقات غير صالح. يرجى تحديث كلمة السر الخاصة بالمفتاح الخاص من الإعدادت الشخصية حتى تتمكن من الوصول للملفات المشفرة.",
     "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" : "استعادة كلمة مرور المفتاح",
diff --git a/apps/encryption/l10n/ast.js b/apps/encryption/l10n/ast.js
index d8d07eeef0e..1f8adec4604 100644
--- a/apps/encryption/l10n/ast.js
+++ b/apps/encryption/l10n/ast.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/ast.json b/apps/encryption/l10n/ast.json
index 094184150bb..d1bf0b6b7d5 100644
--- a/apps/encryption/l10n/ast.json
+++ b/apps/encryption/l10n/ast.json
@@ -5,6 +5,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/az.js b/apps/encryption/l10n/az.js
index 8b81de3e86d..7ef7b6b2027 100644
--- a/apps/encryption/l10n/az.js
+++ b/apps/encryption/l10n/az.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/az.json b/apps/encryption/l10n/az.json
index 204ada9af50..ad675bdab96 100644
--- a/apps/encryption/l10n/az.json
+++ b/apps/encryption/l10n/az.json
@@ -11,6 +11,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/bg_BG.js b/apps/encryption/l10n/bg_BG.js
index c450f36ae4d..dbfd97421b7 100644
--- a/apps/encryption/l10n/bg_BG.js
+++ b/apps/encryption/l10n/bg_BG.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Моля, въведи повторна новата парола за възстановяване",
     "Password successfully changed." : "Паролата е успешно променена.",
     "Could not change the password. Maybe the old password was not correct." : "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
     "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" : "Парола за възстановяане на ключа",
diff --git a/apps/encryption/l10n/bg_BG.json b/apps/encryption/l10n/bg_BG.json
index 1f81c3b5dfe..9938f672b9b 100644
--- a/apps/encryption/l10n/bg_BG.json
+++ b/apps/encryption/l10n/bg_BG.json
@@ -11,6 +11,7 @@
     "Please repeat the new recovery password" : "Моля, въведи повторна новата парола за възстановяване",
     "Password successfully changed." : "Паролата е успешно променена.",
     "Could not change the password. Maybe the old password was not correct." : "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
     "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" : "Парола за възстановяане на ключа",
diff --git a/apps/encryption/l10n/bs.js b/apps/encryption/l10n/bs.js
index ce2ac3f7d3a..bd38f94486e 100644
--- a/apps/encryption/l10n/bs.js
+++ b/apps/encryption/l10n/bs.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "encryption",
     {
+    "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 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"
diff --git a/apps/encryption/l10n/bs.json b/apps/encryption/l10n/bs.json
index fea356ccfe1..4d858dbb966 100644
--- a/apps/encryption/l10n/bs.json
+++ b/apps/encryption/l10n/bs.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "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 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"
diff --git a/apps/encryption/l10n/ca.js b/apps/encryption/l10n/ca.js
index 13c838f40a4..2986dd96242 100644
--- a/apps/encryption/l10n/ca.js
+++ b/apps/encryption/l10n/ca.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/ca.json b/apps/encryption/l10n/ca.json
index 0452f1b4d27..b6458161877 100644
--- a/apps/encryption/l10n/ca.json
+++ b/apps/encryption/l10n/ca.json
@@ -5,6 +5,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/cs_CZ.js b/apps/encryption/l10n/cs_CZ.js
index b1f765a0e10..70b3fa4fcdd 100644
--- a/apps/encryption/l10n/cs_CZ.js
+++ b/apps/encryption/l10n/cs_CZ.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "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ě.",
+    "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 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",
diff --git a/apps/encryption/l10n/cs_CZ.json b/apps/encryption/l10n/cs_CZ.json
index 8dc366486e8..6ace47f473a 100644
--- a/apps/encryption/l10n/cs_CZ.json
+++ b/apps/encryption/l10n/cs_CZ.json
@@ -11,6 +11,7 @@
     "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ě.",
+    "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 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",
diff --git a/apps/encryption/l10n/da.js b/apps/encryption/l10n/da.js
index 2db9f682551..5aad28311d8 100644
--- a/apps/encryption/l10n/da.js
+++ b/apps/encryption/l10n/da.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "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",
+    "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 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.",
     "ownCloud basic encryption module" : "ownCloud basis krypteringsmodul",
     "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):",
diff --git a/apps/encryption/l10n/da.json b/apps/encryption/l10n/da.json
index 9aa80f72d74..8916a6bb4d6 100644
--- a/apps/encryption/l10n/da.json
+++ b/apps/encryption/l10n/da.json
@@ -13,6 +13,7 @@
     "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",
+    "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 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.",
     "ownCloud basic encryption module" : "ownCloud basis krypteringsmodul",
     "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):",
diff --git a/apps/encryption/l10n/de.js b/apps/encryption/l10n/de.js
index 00d13fa660e..d91c7f16307 100644
--- a/apps/encryption/l10n/de.js
+++ b/apps/encryption/l10n/de.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "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.",
     "Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
     "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuche es noch einmal oder kontaktiere Deinen Administrator",
+    "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 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.",
     "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
     "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):",
diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json
index 47ee8e24cca..04f97f298a7 100644
--- a/apps/encryption/l10n/de.json
+++ b/apps/encryption/l10n/de.json
@@ -13,6 +13,7 @@
     "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.",
     "Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
     "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuche es noch einmal oder kontaktiere Deinen Administrator",
+    "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 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.",
     "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
     "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):",
diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js
index cde424c218f..71cf2ea6202 100644
--- a/apps/encryption/l10n/de_DE.js
+++ b/apps/encryption/l10n/de_DE.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "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.",
     "Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
     "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator",
+    "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 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.",
     "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
     "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):",
diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json
index 05ebedbf79c..c55229f1238 100644
--- a/apps/encryption/l10n/de_DE.json
+++ b/apps/encryption/l10n/de_DE.json
@@ -13,6 +13,7 @@
     "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.",
     "Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
     "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator",
+    "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 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.",
     "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
     "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):",
diff --git a/apps/encryption/l10n/el.js b/apps/encryption/l10n/el.js
index 40ec43e1f85..f60089f3d10 100644
--- a/apps/encryption/l10n/el.js
+++ b/apps/encryption/l10n/el.js
@@ -13,7 +13,11 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Παρακαλώ επαναλάβετε το νέο κωδικό επαναφοράς",
     "Password successfully changed." : "Ο κωδικός αλλάχτηκε επιτυχώς.",
     "Could not change the password. Maybe the old password was not correct." : "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
+    "Recovery Key enabled" : "Κλειδί ανάκτησης ενεργοποιημένο",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Αδυναμία ενεργοποίησης κλειδιού ανάκτησης, παρακαλούμε προσπαθήστε αργότερα ή επικοινωνήστε με το διαχειριστή σας",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
+    "ownCloud basic encryption module" : "Βασική μονάδα κρυπτογράφησης του ",
     "Enable recovery key (allow to recover users files in case of password loss):" : "Ενεργοποίηση κλειδιού ανάκτησης (επιτρέψτε την ανάκτηση αρχείων χρηστών σε περίπτωση απώλειας κωδικού):",
     "Recovery key password" : "Επαναφορά κωδικού κλειδιού",
     "Repeat Recovery key password" : "Επαναλάβετε το κλειδί επαναφοράς κωδικού",
diff --git a/apps/encryption/l10n/el.json b/apps/encryption/l10n/el.json
index d8d985c7773..e3dcd4ab78a 100644
--- a/apps/encryption/l10n/el.json
+++ b/apps/encryption/l10n/el.json
@@ -11,7 +11,11 @@
     "Please repeat the new recovery password" : "Παρακαλώ επαναλάβετε το νέο κωδικό επαναφοράς",
     "Password successfully changed." : "Ο κωδικός αλλάχτηκε επιτυχώς.",
     "Could not change the password. Maybe the old password was not correct." : "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
+    "Recovery Key enabled" : "Κλειδί ανάκτησης ενεργοποιημένο",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Αδυναμία ενεργοποίησης κλειδιού ανάκτησης, παρακαλούμε προσπαθήστε αργότερα ή επικοινωνήστε με το διαχειριστή σας",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
+    "ownCloud basic encryption module" : "Βασική μονάδα κρυπτογράφησης του ",
     "Enable recovery key (allow to recover users files in case of password loss):" : "Ενεργοποίηση κλειδιού ανάκτησης (επιτρέψτε την ανάκτηση αρχείων χρηστών σε περίπτωση απώλειας κωδικού):",
     "Recovery key password" : "Επαναφορά κωδικού κλειδιού",
     "Repeat Recovery key password" : "Επαναλάβετε το κλειδί επαναφοράς κωδικού",
diff --git a/apps/encryption/l10n/en_GB.js b/apps/encryption/l10n/en_GB.js
index 5478182c2de..9bd1bf36f70 100644
--- a/apps/encryption/l10n/en_GB.js
+++ b/apps/encryption/l10n/en_GB.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/en_GB.json b/apps/encryption/l10n/en_GB.json
index f2b2cad62dd..a2b33b68a14 100644
--- a/apps/encryption/l10n/en_GB.json
+++ b/apps/encryption/l10n/en_GB.json
@@ -11,6 +11,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
index db3b2a213c5..d30432ecea3 100644
--- a/apps/encryption/l10n/es.js
+++ b/apps/encryption/l10n/es.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "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.",
     "Recovery Key enabled" : "Recuperación de clave habilitada",
     "Could not enable the recovery key, please try again or contact your administrator" : "No se pudo habilitar la clave de recuperación, por favor vuelva a intentarlo o póngase en contacto con el administrador",
+    "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 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.",
     "ownCloud basic encryption module" : "Módulo base de encriptación ownCloud",
     "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);",
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
index 57606eeea57..282181c52e7 100644
--- a/apps/encryption/l10n/es.json
+++ b/apps/encryption/l10n/es.json
@@ -13,6 +13,7 @@
     "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.",
     "Recovery Key enabled" : "Recuperación de clave habilitada",
     "Could not enable the recovery key, please try again or contact your administrator" : "No se pudo habilitar la clave de recuperación, por favor vuelva a intentarlo o póngase en contacto con el administrador",
+    "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 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.",
     "ownCloud basic encryption module" : "Módulo base de encriptación ownCloud",
     "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);",
diff --git a/apps/encryption/l10n/es_AR.js b/apps/encryption/l10n/es_AR.js
index 917ba2547d5..4bdc684cf11 100644
--- a/apps/encryption/l10n/es_AR.js
+++ b/apps/encryption/l10n/es_AR.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/es_AR.json b/apps/encryption/l10n/es_AR.json
index ad5d1af33ac..a9874da1c3c 100644
--- a/apps/encryption/l10n/es_AR.json
+++ b/apps/encryption/l10n/es_AR.json
@@ -5,6 +5,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/es_MX.js b/apps/encryption/l10n/es_MX.js
index f3e4c44e385..cce2e0d213e 100644
--- a/apps/encryption/l10n/es_MX.js
+++ b/apps/encryption/l10n/es_MX.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/es_MX.json b/apps/encryption/l10n/es_MX.json
index 0bc5526d172..beb1b76cf2f 100644
--- a/apps/encryption/l10n/es_MX.json
+++ b/apps/encryption/l10n/es_MX.json
@@ -5,6 +5,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/et_EE.js b/apps/encryption/l10n/et_EE.js
index 8e60b9028ec..667aabfc6bd 100644
--- a/apps/encryption/l10n/et_EE.js
+++ b/apps/encryption/l10n/et_EE.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/et_EE.json b/apps/encryption/l10n/et_EE.json
index a977ba75e88..56c7d478628 100644
--- a/apps/encryption/l10n/et_EE.json
+++ b/apps/encryption/l10n/et_EE.json
@@ -11,6 +11,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/eu.js b/apps/encryption/l10n/eu.js
index 937dbe089e0..6567bdd2272 100644
--- a/apps/encryption/l10n/eu.js
+++ b/apps/encryption/l10n/eu.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/eu.json b/apps/encryption/l10n/eu.json
index b1d8f49a34f..9a586a8b088 100644
--- a/apps/encryption/l10n/eu.json
+++ b/apps/encryption/l10n/eu.json
@@ -11,6 +11,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/fi_FI.js b/apps/encryption/l10n/fi_FI.js
index f69ab49786f..8258b2e28ff 100644
--- a/apps/encryption/l10n/fi_FI.js
+++ b/apps/encryption/l10n/fi_FI.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "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",
+    "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 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.",
     "ownCloud basic encryption module" : "ownCloudin perussalausmoduuli",
     "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):",
diff --git a/apps/encryption/l10n/fi_FI.json b/apps/encryption/l10n/fi_FI.json
index 5a08c06b972..9e1205a77f3 100644
--- a/apps/encryption/l10n/fi_FI.json
+++ b/apps/encryption/l10n/fi_FI.json
@@ -13,6 +13,7 @@
     "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",
+    "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 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.",
     "ownCloud basic encryption module" : "ownCloudin perussalausmoduuli",
     "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):",
diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js
index d2c988dda0d..2d3d9be26e7 100644
--- a/apps/encryption/l10n/fr.js
+++ b/apps/encryption/l10n/fr.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "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",
+    "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 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.",
     "ownCloud basic encryption module" : "Module de chiffrement de base d'ownCloud",
     "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).",
diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json
index ba7692e0e34..5367350ffeb 100644
--- a/apps/encryption/l10n/fr.json
+++ b/apps/encryption/l10n/fr.json
@@ -13,6 +13,7 @@
     "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",
+    "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 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.",
     "ownCloud basic encryption module" : "Module de chiffrement de base d'ownCloud",
     "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).",
diff --git a/apps/encryption/l10n/gl.js b/apps/encryption/l10n/gl.js
index d0321b2d7c8..79d17247a23 100644
--- a/apps/encryption/l10n/gl.js
+++ b/apps/encryption/l10n/gl.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "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.",
     "Recovery Key enabled" : "Activada a chave de recuperación",
     "Could not enable the recovery key, please try again or contact your administrator" : "Non foi posíbel activar a chave de recuperación, tenteo de novo ou póñase en contacto co administrador.",
+    "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 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",
     "ownCloud basic encryption module" : "Módulo básico de cifrado de ownCloud",
     "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):",
diff --git a/apps/encryption/l10n/gl.json b/apps/encryption/l10n/gl.json
index 6c803f3cf7f..7557d2b8bae 100644
--- a/apps/encryption/l10n/gl.json
+++ b/apps/encryption/l10n/gl.json
@@ -13,6 +13,7 @@
     "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.",
     "Recovery Key enabled" : "Activada a chave de recuperación",
     "Could not enable the recovery key, please try again or contact your administrator" : "Non foi posíbel activar a chave de recuperación, tenteo de novo ou póñase en contacto co administrador.",
+    "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 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",
     "ownCloud basic encryption module" : "Módulo básico de cifrado de ownCloud",
     "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):",
diff --git a/apps/encryption/l10n/hr.js b/apps/encryption/l10n/hr.js
index 9d910763c2a..ebdc362c7cb 100644
--- a/apps/encryption/l10n/hr.js
+++ b/apps/encryption/l10n/hr.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/hr.json b/apps/encryption/l10n/hr.json
index 3e5eda279cb..5b8e335f501 100644
--- a/apps/encryption/l10n/hr.json
+++ b/apps/encryption/l10n/hr.json
@@ -5,6 +5,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/hu_HU.js b/apps/encryption/l10n/hu_HU.js
index 9b1ec36849c..259d82d68a9 100644
--- a/apps/encryption/l10n/hu_HU.js
+++ b/apps/encryption/l10n/hu_HU.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "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ó.",
+    "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 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",
diff --git a/apps/encryption/l10n/hu_HU.json b/apps/encryption/l10n/hu_HU.json
index 9ef22a34bfa..a44cb2df4b1 100644
--- a/apps/encryption/l10n/hu_HU.json
+++ b/apps/encryption/l10n/hu_HU.json
@@ -5,6 +5,7 @@
     "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ó.",
+    "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 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",
diff --git a/apps/encryption/l10n/id.js b/apps/encryption/l10n/id.js
index b0f93d02dd3..2067ed10f2c 100644
--- a/apps/encryption/l10n/id.js
+++ b/apps/encryption/l10n/id.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/id.json b/apps/encryption/l10n/id.json
index 69a01d9c5ad..1cfb9e55d01 100644
--- a/apps/encryption/l10n/id.json
+++ b/apps/encryption/l10n/id.json
@@ -11,6 +11,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/it.js b/apps/encryption/l10n/it.js
index ea0d4576314..fe1a8c4a831 100644
--- a/apps/encryption/l10n/it.js
+++ b/apps/encryption/l10n/it.js
@@ -13,7 +13,10 @@ OC.L10N.register(
     "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.",
+    "Recovery Key enabled" : "Chiave di ripristino abilitata",
+    "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 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",
+    "ownCloud basic encryption module" : "Modulo di cifratura di base di ownCloud",
     "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",
diff --git a/apps/encryption/l10n/it.json b/apps/encryption/l10n/it.json
index 0f66ddfb26d..fe13bd1587b 100644
--- a/apps/encryption/l10n/it.json
+++ b/apps/encryption/l10n/it.json
@@ -11,7 +11,10 @@
     "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.",
+    "Recovery Key enabled" : "Chiave di ripristino abilitata",
+    "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 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",
+    "ownCloud basic encryption module" : "Modulo di cifratura di base di ownCloud",
     "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",
diff --git a/apps/encryption/l10n/ja.js b/apps/encryption/l10n/ja.js
index 2cc31aa5291..42f08010a20 100644
--- a/apps/encryption/l10n/ja.js
+++ b/apps/encryption/l10n/ja.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "新しい復旧キーのパスワードをもう一度入力",
     "Password successfully changed." : "パスワードを変更できました。",
     "Could not change the password. Maybe the old password was not correct." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
     "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" : "リカバリキーのパスワード",
diff --git a/apps/encryption/l10n/ja.json b/apps/encryption/l10n/ja.json
index c7e16f92233..a1fb308f456 100644
--- a/apps/encryption/l10n/ja.json
+++ b/apps/encryption/l10n/ja.json
@@ -11,6 +11,7 @@
     "Please repeat the new recovery password" : "新しい復旧キーのパスワードをもう一度入力",
     "Password successfully changed." : "パスワードを変更できました。",
     "Could not change the password. Maybe the old password was not correct." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
     "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" : "リカバリキーのパスワード",
diff --git a/apps/encryption/l10n/ko.js b/apps/encryption/l10n/ko.js
index 94551d42a86..bf325795523 100644
--- a/apps/encryption/l10n/ko.js
+++ b/apps/encryption/l10n/ko.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "새 복구 암호를 다시 입력하십시오",
     "Password successfully changed." : "암호가 성공적으로 변경되었습니다",
     "Could not change the password. Maybe the old password was not correct." : "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.",
     "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" : "복구 키 암호",
diff --git a/apps/encryption/l10n/ko.json b/apps/encryption/l10n/ko.json
index 76824c4efc5..b64632bf76b 100644
--- a/apps/encryption/l10n/ko.json
+++ b/apps/encryption/l10n/ko.json
@@ -11,6 +11,7 @@
     "Please repeat the new recovery password" : "새 복구 암호를 다시 입력하십시오",
     "Password successfully changed." : "암호가 성공적으로 변경되었습니다",
     "Could not change the password. Maybe the old password was not correct." : "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.",
     "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" : "복구 키 암호",
diff --git a/apps/encryption/l10n/lt_LT.js b/apps/encryption/l10n/lt_LT.js
index cd1f0637aaf..85eed21f1a2 100644
--- a/apps/encryption/l10n/lt_LT.js
+++ b/apps/encryption/l10n/lt_LT.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/lt_LT.json b/apps/encryption/l10n/lt_LT.json
index 562afb8b8ca..55bf06fd6e4 100644
--- a/apps/encryption/l10n/lt_LT.json
+++ b/apps/encryption/l10n/lt_LT.json
@@ -5,6 +5,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/lv.js b/apps/encryption/l10n/lv.js
index d3bccd6630b..965029639c0 100644
--- a/apps/encryption/l10n/lv.js
+++ b/apps/encryption/l10n/lv.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "encryption",
     {
+    "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 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"
 },
diff --git a/apps/encryption/l10n/lv.json b/apps/encryption/l10n/lv.json
index c89c656100e..3fa2f139253 100644
--- a/apps/encryption/l10n/lv.json
+++ b/apps/encryption/l10n/lv.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "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 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);"
diff --git a/apps/encryption/l10n/nb_NO.js b/apps/encryption/l10n/nb_NO.js
index cdced9e124a..077903e43c1 100644
--- a/apps/encryption/l10n/nb_NO.js
+++ b/apps/encryption/l10n/nb_NO.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/nb_NO.json b/apps/encryption/l10n/nb_NO.json
index 1526f1d3c1e..278b73cbf51 100644
--- a/apps/encryption/l10n/nb_NO.json
+++ b/apps/encryption/l10n/nb_NO.json
@@ -11,6 +11,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/nl.js b/apps/encryption/l10n/nl.js
index 28a60c68172..ffbbafefd9f 100644
--- a/apps/encryption/l10n/nl.js
+++ b/apps/encryption/l10n/nl.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/nl.json b/apps/encryption/l10n/nl.json
index d1086717a35..741ad6ee844 100644
--- a/apps/encryption/l10n/nl.json
+++ b/apps/encryption/l10n/nl.json
@@ -11,6 +11,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/pl.js b/apps/encryption/l10n/pl.js
index 5bca5e7fe33..e77e3be4199 100644
--- a/apps/encryption/l10n/pl.js
+++ b/apps/encryption/l10n/pl.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/pl.json b/apps/encryption/l10n/pl.json
index c883b8ab718..4faa11eb398 100644
--- a/apps/encryption/l10n/pl.json
+++ b/apps/encryption/l10n/pl.json
@@ -11,6 +11,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/pt_BR.js b/apps/encryption/l10n/pt_BR.js
index 43a872d3bc4..e12da46f3b2 100644
--- a/apps/encryption/l10n/pt_BR.js
+++ b/apps/encryption/l10n/pt_BR.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "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.",
     "Recovery Key enabled" : "Recuperar Chave habilitada",
     "Could not enable the recovery key, please try again or contact your administrator" : "Não foi possível habilitar a chave recuperada, por favor tente novamente ou entre em contato com seu administrador",
+    "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 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",
     "ownCloud basic encryption module" : "Modo de criptografia básico ownCloud",
     "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):",
diff --git a/apps/encryption/l10n/pt_BR.json b/apps/encryption/l10n/pt_BR.json
index 4e566f95878..05186d8636a 100644
--- a/apps/encryption/l10n/pt_BR.json
+++ b/apps/encryption/l10n/pt_BR.json
@@ -13,6 +13,7 @@
     "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.",
     "Recovery Key enabled" : "Recuperar Chave habilitada",
     "Could not enable the recovery key, please try again or contact your administrator" : "Não foi possível habilitar a chave recuperada, por favor tente novamente ou entre em contato com seu administrador",
+    "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 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",
     "ownCloud basic encryption module" : "Modo de criptografia básico ownCloud",
     "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):",
diff --git a/apps/encryption/l10n/pt_PT.js b/apps/encryption/l10n/pt_PT.js
index f91dabc6998..afe0e8d03d3 100644
--- a/apps/encryption/l10n/pt_PT.js
+++ b/apps/encryption/l10n/pt_PT.js
@@ -13,7 +13,11 @@ OC.L10N.register(
     "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.",
+    "Recovery Key enabled" : "Chave de Recuperação ativada",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Não foi possível ativar a chave de recuperação, por favor, tente de novo ou contacte o seu administrador",
+    "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 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",
+    "ownCloud basic encryption module" : "módulo de encriptação básico da ownCloud",
     "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",
diff --git a/apps/encryption/l10n/pt_PT.json b/apps/encryption/l10n/pt_PT.json
index b13e94f2078..bede8c72bf0 100644
--- a/apps/encryption/l10n/pt_PT.json
+++ b/apps/encryption/l10n/pt_PT.json
@@ -11,7 +11,11 @@
     "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.",
+    "Recovery Key enabled" : "Chave de Recuperação ativada",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Não foi possível ativar a chave de recuperação, por favor, tente de novo ou contacte o seu administrador",
+    "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 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",
+    "ownCloud basic encryption module" : "módulo de encriptação básico da ownCloud",
     "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",
diff --git a/apps/encryption/l10n/ro.js b/apps/encryption/l10n/ro.js
index fdeb33df8c3..d69ecfcd78c 100644
--- a/apps/encryption/l10n/ro.js
+++ b/apps/encryption/l10n/ro.js
@@ -1,13 +1,22 @@
 OC.L10N.register(
     "encryption",
     {
+    "Missing recovery key password" : "Lipsește parola cheii de recuperare",
+    "Please repeat the recovery key password" : "Te rog repetă parola cheii de recuperare",
     "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!",
+    "Please provide the old recovery password" : "Te rog oferă parola de recuperare veche",
+    "Please provide a new recovery password" : "Te rog oferă o nouă parolă de recuperare",
+    "Please repeat the new recovery password" : "Te rog repetă noua parolă 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.",
+    "Recovery Key enabled" : "Cheie de recuperare activată",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Nu poate fi activată cheia de recuperare, te rog încearcă din nou sau contactează administratorul",
+    "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 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",
+    "ownCloud basic encryption module" : "modul de ecnriptie bazic ownCloud",
     "Enabled" : "Activat",
     "Disabled" : "Dezactivat",
     "Change Password" : "Schimbă parola"
diff --git a/apps/encryption/l10n/ro.json b/apps/encryption/l10n/ro.json
index 94b67b91db9..80235b587ab 100644
--- a/apps/encryption/l10n/ro.json
+++ b/apps/encryption/l10n/ro.json
@@ -1,11 +1,20 @@
 { "translations": {
+    "Missing recovery key password" : "Lipsește parola cheii de recuperare",
+    "Please repeat the recovery key password" : "Te rog repetă parola cheii de recuperare",
     "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!",
+    "Please provide the old recovery password" : "Te rog oferă parola de recuperare veche",
+    "Please provide a new recovery password" : "Te rog oferă o nouă parolă de recuperare",
+    "Please repeat the new recovery password" : "Te rog repetă noua parolă 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.",
+    "Recovery Key enabled" : "Cheie de recuperare activată",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Nu poate fi activată cheia de recuperare, te rog încearcă din nou sau contactează administratorul",
+    "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 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",
+    "ownCloud basic encryption module" : "modul de ecnriptie bazic ownCloud",
     "Enabled" : "Activat",
     "Disabled" : "Dezactivat",
     "Change Password" : "Schimbă parola"
diff --git a/apps/encryption/l10n/ru.js b/apps/encryption/l10n/ru.js
index e473ab7df1d..f500c33c59c 100644
--- a/apps/encryption/l10n/ru.js
+++ b/apps/encryption/l10n/ru.js
@@ -13,7 +13,11 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Повторите новый пароль восстановления",
     "Password successfully changed." : "Пароль успешно изменен.",
     "Could not change the password. Maybe the old password was not correct." : "Невозможно изменить пароль. Возможно, указанный старый пароль не верен.",
+    "Recovery Key enabled" : "Ключ Восстановления включен",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Не возможно задействовать ключ восстановления, попробуйте снова или обратитесь к вашему системному администатору",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Закрытый ключ приложения шифрования недействителен. Обновите закрытый ключ в личных настройках, чтобы восстановить доступ к зашифрованным файлам.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново",
+    "ownCloud basic encryption module" : "Базовый модуль шифрования ownCloud",
     "Enable recovery key (allow to recover users files in case of password loss):" : "Включить ключ восстановления (позволяет пользователям восстановить файлы при потере пароля):",
     "Recovery key password" : "Пароль ключа восстановления",
     "Repeat Recovery key password" : "Повторите пароль ключа восстановления",
diff --git a/apps/encryption/l10n/ru.json b/apps/encryption/l10n/ru.json
index 67d0d70fccf..fc88ccfc34e 100644
--- a/apps/encryption/l10n/ru.json
+++ b/apps/encryption/l10n/ru.json
@@ -11,7 +11,11 @@
     "Please repeat the new recovery password" : "Повторите новый пароль восстановления",
     "Password successfully changed." : "Пароль успешно изменен.",
     "Could not change the password. Maybe the old password was not correct." : "Невозможно изменить пароль. Возможно, указанный старый пароль не верен.",
+    "Recovery Key enabled" : "Ключ Восстановления включен",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Не возможно задействовать ключ восстановления, попробуйте снова или обратитесь к вашему системному администатору",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Закрытый ключ приложения шифрования недействителен. Обновите закрытый ключ в личных настройках, чтобы восстановить доступ к зашифрованным файлам.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново",
+    "ownCloud basic encryption module" : "Базовый модуль шифрования ownCloud",
     "Enable recovery key (allow to recover users files in case of password loss):" : "Включить ключ восстановления (позволяет пользователям восстановить файлы при потере пароля):",
     "Recovery key password" : "Пароль ключа восстановления",
     "Repeat Recovery key password" : "Повторите пароль ключа восстановления",
diff --git a/apps/encryption/l10n/sk_SK.js b/apps/encryption/l10n/sk_SK.js
index bf05b8a8c8b..e8719571710 100644
--- a/apps/encryption/l10n/sk_SK.js
+++ b/apps/encryption/l10n/sk_SK.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/sk_SK.json b/apps/encryption/l10n/sk_SK.json
index 66f629af91f..14fc49e0d72 100644
--- a/apps/encryption/l10n/sk_SK.json
+++ b/apps/encryption/l10n/sk_SK.json
@@ -11,6 +11,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/sl.js b/apps/encryption/l10n/sl.js
index 3e9dd2d76b6..082e2ef5b61 100644
--- a/apps/encryption/l10n/sl.js
+++ b/apps/encryption/l10n/sl.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/sl.json b/apps/encryption/l10n/sl.json
index 3b3f55794df..b26a21763a2 100644
--- a/apps/encryption/l10n/sl.json
+++ b/apps/encryption/l10n/sl.json
@@ -11,6 +11,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/sq.js b/apps/encryption/l10n/sq.js
index 672859cc166..be24512a35c 100644
--- a/apps/encryption/l10n/sq.js
+++ b/apps/encryption/l10n/sq.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "encryption",
     {
+    "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.",
     "Enabled" : "Aktivizuar"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/sq.json b/apps/encryption/l10n/sq.json
index b0e2b66e012..48f32535ac0 100644
--- a/apps/encryption/l10n/sq.json
+++ b/apps/encryption/l10n/sq.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "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.",
     "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
index 4383f25f638..d6643b871b6 100644
--- a/apps/encryption/l10n/sr.js
+++ b/apps/encryption/l10n/sr.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Could not change the password. Maybe the old password was not correct." : "Не могу да променим лозинку. Можда стара лозинка није исправна.",
     "Recovery Key enabled" : "Кључ опоравка укључен",
     "Could not enable the recovery key, please try again or contact your administrator" : "Не могу да укључим кључ опоравка. Покушајте поново или контактирајте администратора",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Неисправан лични кључ за апликацију шифровања. Ажурирајте лозинку личног кључа у личним поставкама да бисте опоравили приступ вашим шифрованим фајловима.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Апликација шифровања је укључена али ваши кључеви нису иницијализовани. Одјавите се и поново се пријавите.",
     "ownCloud basic encryption module" : "оунКлауд основни шифрарски модул",
     "Enable recovery key (allow to recover users files in case of password loss):" : "Омогући кључ за опоравак (омогућава опоравак корисничких фајлова у случају губитка лозинке):",
diff --git a/apps/encryption/l10n/sr.json b/apps/encryption/l10n/sr.json
index b69e4fa2b3e..15f5980090d 100644
--- a/apps/encryption/l10n/sr.json
+++ b/apps/encryption/l10n/sr.json
@@ -13,6 +13,7 @@
     "Could not change the password. Maybe the old password was not correct." : "Не могу да променим лозинку. Можда стара лозинка није исправна.",
     "Recovery Key enabled" : "Кључ опоравка укључен",
     "Could not enable the recovery key, please try again or contact your administrator" : "Не могу да укључим кључ опоравка. Покушајте поново или контактирајте администратора",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Неисправан лични кључ за апликацију шифровања. Ажурирајте лозинку личног кључа у личним поставкама да бисте опоравили приступ вашим шифрованим фајловима.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Апликација шифровања је укључена али ваши кључеви нису иницијализовани. Одјавите се и поново се пријавите.",
     "ownCloud basic encryption module" : "оунКлауд основни шифрарски модул",
     "Enable recovery key (allow to recover users files in case of password loss):" : "Омогући кључ за опоравак (омогућава опоравак корисничких фајлова у случају губитка лозинке):",
diff --git a/apps/encryption/l10n/sr@latin.js b/apps/encryption/l10n/sr@latin.js
index 4dbc57ff3ec..b078b50fce7 100644
--- a/apps/encryption/l10n/sr@latin.js
+++ b/apps/encryption/l10n/sr@latin.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "encryption",
     {
+    "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 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"
 },
diff --git a/apps/encryption/l10n/sr@latin.json b/apps/encryption/l10n/sr@latin.json
index 6cac6d1a0f1..08f90ad5912 100644
--- a/apps/encryption/l10n/sr@latin.json
+++ b/apps/encryption/l10n/sr@latin.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "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 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);"
diff --git a/apps/encryption/l10n/sv.js b/apps/encryption/l10n/sv.js
index cb82ade98c8..75da65c8928 100644
--- a/apps/encryption/l10n/sv.js
+++ b/apps/encryption/l10n/sv.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/sv.json b/apps/encryption/l10n/sv.json
index ed038a0fa33..4f650616067 100644
--- a/apps/encryption/l10n/sv.json
+++ b/apps/encryption/l10n/sv.json
@@ -11,6 +11,7 @@
     "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.",
+    "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 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",
diff --git a/apps/encryption/l10n/tr.js b/apps/encryption/l10n/tr.js
index 4fc6dc3fbd0..d5829734831 100644
--- a/apps/encryption/l10n/tr.js
+++ b/apps/encryption/l10n/tr.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "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.",
+    "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 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ı",
diff --git a/apps/encryption/l10n/tr.json b/apps/encryption/l10n/tr.json
index 3f9084528fc..75aee1e2d7a 100644
--- a/apps/encryption/l10n/tr.json
+++ b/apps/encryption/l10n/tr.json
@@ -11,6 +11,7 @@
     "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.",
+    "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 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ı",
diff --git a/apps/encryption/l10n/uk.js b/apps/encryption/l10n/uk.js
index 0dc7bacc16c..9440ef84b01 100644
--- a/apps/encryption/l10n/uk.js
+++ b/apps/encryption/l10n/uk.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Будь ласка, введіть новий пароль відновлення ще раз",
     "Password successfully changed." : "Пароль змінено.",
     "Could not change the password. Maybe the old password was not correct." : "Не вдалося змінити пароль. Можливо ви неправильно ввели старий пароль.",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.",
     "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" : "Пароль ключа відновлення",
diff --git a/apps/encryption/l10n/uk.json b/apps/encryption/l10n/uk.json
index 173c7159910..8a03b8de631 100644
--- a/apps/encryption/l10n/uk.json
+++ b/apps/encryption/l10n/uk.json
@@ -10,6 +10,7 @@
     "Please repeat the new recovery password" : "Будь ласка, введіть новий пароль відновлення ще раз",
     "Password successfully changed." : "Пароль змінено.",
     "Could not change the password. Maybe the old password was not correct." : "Не вдалося змінити пароль. Можливо ви неправильно ввели старий пароль.",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.",
     "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" : "Пароль ключа відновлення",
diff --git a/apps/encryption/l10n/zh_CN.js b/apps/encryption/l10n/zh_CN.js
index 7bf5bb3ad37..f65d6efb423 100644
--- a/apps/encryption/l10n/zh_CN.js
+++ b/apps/encryption/l10n/zh_CN.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "请替换新的恢复密码",
     "Password successfully changed." : "密码修改成功。",
     "Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。",
     "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" : "恢复密钥密码",
diff --git a/apps/encryption/l10n/zh_CN.json b/apps/encryption/l10n/zh_CN.json
index 2cb368ad169..aafd85baa08 100644
--- a/apps/encryption/l10n/zh_CN.json
+++ b/apps/encryption/l10n/zh_CN.json
@@ -10,6 +10,7 @@
     "Please repeat the new recovery password" : "请替换新的恢复密码",
     "Password successfully changed." : "密码修改成功。",
     "Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。",
     "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" : "恢复密钥密码",
diff --git a/apps/encryption/l10n/zh_TW.js b/apps/encryption/l10n/zh_TW.js
index b7860cbb30b..7701a67e2c9 100644
--- a/apps/encryption/l10n/zh_TW.js
+++ b/apps/encryption/l10n/zh_TW.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "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." : "無法變更密碼，或許是輸入的舊密碼不正確。",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的檔案加密私鑰，請在個人設定中更新您的私鑰密語以存取加密的檔案。",
     "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" : "還原金鑰密碼",
diff --git a/apps/encryption/l10n/zh_TW.json b/apps/encryption/l10n/zh_TW.json
index 7001d5b9b5f..607f7a70e17 100644
--- a/apps/encryption/l10n/zh_TW.json
+++ b/apps/encryption/l10n/zh_TW.json
@@ -5,6 +5,7 @@
     "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." : "無法變更密碼，或許是輸入的舊密碼不正確。",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的檔案加密私鑰，請在個人設定中更新您的私鑰密語以存取加密的檔案。",
     "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" : "還原金鑰密碼",
diff --git a/apps/files/l10n/ro.js b/apps/files/l10n/ro.js
index 0a293c2523e..16699e084f6 100644
--- a/apps/files/l10n/ro.js
+++ b/apps/files/l10n/ro.js
@@ -93,6 +93,7 @@ OC.L10N.register(
     "Folder" : "Dosar",
     "Upload" : "Încărcă",
     "Cancel upload" : "Anulează încărcarea",
+    "Select all" : "Selectează tot",
     "Upload too large" : "Fișierul încărcat este prea mare",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server.",
     "Files are being scanned, please wait." : "Fișierele sunt scanate, te rog așteaptă.",
diff --git a/apps/files/l10n/ro.json b/apps/files/l10n/ro.json
index b3e59f9cfac..d09af6ba759 100644
--- a/apps/files/l10n/ro.json
+++ b/apps/files/l10n/ro.json
@@ -91,6 +91,7 @@
     "Folder" : "Dosar",
     "Upload" : "Încărcă",
     "Cancel upload" : "Anulează încărcarea",
+    "Select all" : "Selectează tot",
     "Upload too large" : "Fișierul încărcat este prea mare",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server.",
     "Files are being scanned, please wait." : "Fișierele sunt scanate, te rog așteaptă.",
diff --git a/apps/files/l10n/uk.js b/apps/files/l10n/uk.js
index ee509490a6c..2577d6569c2 100644
--- a/apps/files/l10n/uk.js
+++ b/apps/files/l10n/uk.js
@@ -70,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>\n<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",
@@ -99,6 +100,7 @@ OC.L10N.register(
     "Folder" : "Тека",
     "Upload" : "Вивантажити",
     "Cancel upload" : "Перервати завантаження",
+    "No files in here" : "Тут немає файлів",
     "Upload some content or sync with your devices!" : "Завантажте вміст або синхронізуйте з пристроями!",
     "No entries found in this folder" : "Записів не знайдено в цій папці",
     "Select all" : "Вибрати всі",
diff --git a/apps/files/l10n/uk.json b/apps/files/l10n/uk.json
index fde1b788506..9522cf829bd 100644
--- a/apps/files/l10n/uk.json
+++ b/apps/files/l10n/uk.json
@@ -68,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>\n<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",
@@ -97,6 +98,7 @@
     "Folder" : "Тека",
     "Upload" : "Вивантажити",
     "Cancel upload" : "Перервати завантаження",
+    "No files in here" : "Тут немає файлів",
     "Upload some content or sync with your devices!" : "Завантажте вміст або синхронізуйте з пристроями!",
     "No entries found in this folder" : "Записів не знайдено в цій папці",
     "Select all" : "Вибрати всі",
diff --git a/apps/files_external/l10n/ro.js b/apps/files_external/l10n/ro.js
index bef9b29c81a..e7e6a5662f5 100644
--- a/apps/files_external/l10n/ro.js
+++ b/apps/files_external/l10n/ro.js
@@ -3,8 +3,14 @@ OC.L10N.register(
     {
     "Please provide a valid Dropbox app key and secret." : "Prezintă te rog o cheie de Dropbox validă și parola",
     "External storage" : "Stocare externă",
+    "Local" : "Local",
     "Location" : "Locație",
     "Amazon S3" : "Amazon S3",
+    "Key" : "Cheie",
+    "Secret" : "Secret",
+    "Access Key" : "Cheie de acces",
+    "Secret Key" : "Cheie secretă",
+    "Hostname" : "Hostname",
     "Port" : "Portul",
     "Region" : "Regiune",
     "Host" : "Gazdă",
@@ -12,6 +18,7 @@ OC.L10N.register(
     "Password" : "Parolă",
     "Share" : "Partajează",
     "URL" : "URL",
+    "Public key" : "Cheie publică",
     "Access granted" : "Acces permis",
     "Error configuring Dropbox storage" : "Eroare la configurarea mediului de stocare Dropbox",
     "Grant access" : "Permite accesul",
diff --git a/apps/files_external/l10n/ro.json b/apps/files_external/l10n/ro.json
index ee904b6712e..bc7612b5cde 100644
--- a/apps/files_external/l10n/ro.json
+++ b/apps/files_external/l10n/ro.json
@@ -1,8 +1,14 @@
 { "translations": {
     "Please provide a valid Dropbox app key and secret." : "Prezintă te rog o cheie de Dropbox validă și parola",
     "External storage" : "Stocare externă",
+    "Local" : "Local",
     "Location" : "Locație",
     "Amazon S3" : "Amazon S3",
+    "Key" : "Cheie",
+    "Secret" : "Secret",
+    "Access Key" : "Cheie de acces",
+    "Secret Key" : "Cheie secretă",
+    "Hostname" : "Hostname",
     "Port" : "Portul",
     "Region" : "Regiune",
     "Host" : "Gazdă",
@@ -10,6 +16,7 @@
     "Password" : "Parolă",
     "Share" : "Partajează",
     "URL" : "URL",
+    "Public key" : "Cheie publică",
     "Access granted" : "Acces permis",
     "Error configuring Dropbox storage" : "Eroare la configurarea mediului de stocare Dropbox",
     "Grant access" : "Permite accesul",
diff --git a/apps/files_external/l10n/uk.js b/apps/files_external/l10n/uk.js
index 2f6e84c62b8..6580719f89f 100644
--- a/apps/files_external/l10n/uk.js
+++ b/apps/files_external/l10n/uk.js
@@ -64,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>Примітка:</b> Підтримку FTP в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> \"%s\" не встановлено. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
     "No external storage configured" : "Немає налаштованих зовнішніх сховищ",
+    "You can add external storages in the personal settings" : "Ви можете додати зовнішні сховища в особистих налаштуваннях",
     "Name" : "Ім'я",
     "Storage type" : "Тип сховища",
     "Scope" : "Область",
@@ -72,6 +73,7 @@ OC.L10N.register(
     "Configuration" : "Налаштування",
     "Available for" : "Доступний для",
     "Add storage" : "Додати сховище",
+    "Advanced settings" : "Розширені налаштування",
     "Delete" : "Видалити",
     "Enable User External Storage" : "Активувати користувацькі зовнішні сховища",
     "Allow users to mount the following external storage" : "Дозволити користувачам монтувати наступні зовнішні сховища"
diff --git a/apps/files_external/l10n/uk.json b/apps/files_external/l10n/uk.json
index 744021ce707..3b3bab572f7 100644
--- a/apps/files_external/l10n/uk.json
+++ b/apps/files_external/l10n/uk.json
@@ -62,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>Примітка:</b> Підтримку FTP в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> \"%s\" не встановлено. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
     "No external storage configured" : "Немає налаштованих зовнішніх сховищ",
+    "You can add external storages in the personal settings" : "Ви можете додати зовнішні сховища в особистих налаштуваннях",
     "Name" : "Ім'я",
     "Storage type" : "Тип сховища",
     "Scope" : "Область",
@@ -70,6 +71,7 @@
     "Configuration" : "Налаштування",
     "Available for" : "Доступний для",
     "Add storage" : "Додати сховище",
+    "Advanced settings" : "Розширені налаштування",
     "Delete" : "Видалити",
     "Enable User External Storage" : "Активувати користувацькі зовнішні сховища",
     "Allow users to mount the following external storage" : "Дозволити користувачам монтувати наступні зовнішні сховища"
diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js
index c742b0d90be..6015d359684 100644
--- a/apps/files_sharing/l10n/pt_PT.js
+++ b/apps/files_sharing/l10n/pt_PT.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Download %s" : "Transferir %s",
     "Direct link" : "Hiperligação direta",
     "Federated Cloud Sharing" : "Partilha de Cloud Federada",
+    "Open documentation" : "Abrir documentação",
     "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores",
     "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores"
 },
diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json
index 37dd2267e5b..e3f95d18117 100644
--- a/apps/files_sharing/l10n/pt_PT.json
+++ b/apps/files_sharing/l10n/pt_PT.json
@@ -54,6 +54,7 @@
     "Download %s" : "Transferir %s",
     "Direct link" : "Hiperligação direta",
     "Federated Cloud Sharing" : "Partilha de Cloud Federada",
+    "Open documentation" : "Abrir documentação",
     "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores",
     "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/ro.js b/apps/files_sharing/l10n/ro.js
index 71e62028e49..deca9cc68e0 100644
--- a/apps/files_sharing/l10n/ro.js
+++ b/apps/files_sharing/l10n/ro.js
@@ -4,6 +4,8 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Partajarea server-server nu este activată pe acest server",
     "Shared with you" : "Partajat cu tine",
     "Shared with others" : "Partajat cu alții",
+    "Nothing shared with you yet" : "Nimic nu e partajat cu tine încă",
+    "Nothing shared yet" : "Nimic partajat încă",
     "Cancel" : "Anulare",
     "Share" : "Partajează",
     "Shared by" : "impartite in ",
@@ -19,6 +21,7 @@ OC.L10N.register(
     "Name" : "Nume",
     "Reasons might be:" : "Motive posibile ar fi:",
     "the item was removed" : "acest articol a fost șters",
+    "the link expired" : "linkul a expirat",
     "sharing is disabled" : "Partajare este oprită",
     "Add to your ownCloud" : "Adaugă propriul tău ownCloud",
     "Download" : "Descarcă",
diff --git a/apps/files_sharing/l10n/ro.json b/apps/files_sharing/l10n/ro.json
index d580052a402..62f44c6f9d1 100644
--- a/apps/files_sharing/l10n/ro.json
+++ b/apps/files_sharing/l10n/ro.json
@@ -2,6 +2,8 @@
     "Server to server sharing is not enabled on this server" : "Partajarea server-server nu este activată pe acest server",
     "Shared with you" : "Partajat cu tine",
     "Shared with others" : "Partajat cu alții",
+    "Nothing shared with you yet" : "Nimic nu e partajat cu tine încă",
+    "Nothing shared yet" : "Nimic partajat încă",
     "Cancel" : "Anulare",
     "Share" : "Partajează",
     "Shared by" : "impartite in ",
@@ -17,6 +19,7 @@
     "Name" : "Nume",
     "Reasons might be:" : "Motive posibile ar fi:",
     "the item was removed" : "acest articol a fost șters",
+    "the link expired" : "linkul a expirat",
     "sharing is disabled" : "Partajare este oprită",
     "Add to your ownCloud" : "Adaugă propriul tău ownCloud",
     "Download" : "Descarcă",
diff --git a/apps/files_trashbin/l10n/ro.js b/apps/files_trashbin/l10n/ro.js
index 0feb1e8e721..89fb577014e 100644
--- a/apps/files_trashbin/l10n/ro.js
+++ b/apps/files_trashbin/l10n/ro.js
@@ -1,11 +1,17 @@
 OC.L10N.register(
     "files_trashbin",
     {
+    "Couldn't delete %s permanently" : "Nu pot șterge %s permanent.",
+    "Couldn't restore %s" : "Nu se poate recupera %s",
     "Deleted files" : "Sterge fisierele",
     "Restore" : "Restabilire",
     "Delete permanently" : "Șterge permanent",
     "Error" : "Eroare",
+    "restored" : "restaurat",
+    "No deleted files" : "Nu sunt fișiere șterse",
+    "Select all" : "Selectează tot",
     "Name" : "Nume",
+    "Deleted" : "A fost șters.",
     "Delete" : "Șterge"
 },
 "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/apps/files_trashbin/l10n/ro.json b/apps/files_trashbin/l10n/ro.json
index 758dc748460..6a68abae7fa 100644
--- a/apps/files_trashbin/l10n/ro.json
+++ b/apps/files_trashbin/l10n/ro.json
@@ -1,9 +1,15 @@
 { "translations": {
+    "Couldn't delete %s permanently" : "Nu pot șterge %s permanent.",
+    "Couldn't restore %s" : "Nu se poate recupera %s",
     "Deleted files" : "Sterge fisierele",
     "Restore" : "Restabilire",
     "Delete permanently" : "Șterge permanent",
     "Error" : "Eroare",
+    "restored" : "restaurat",
+    "No deleted files" : "Nu sunt fișiere șterse",
+    "Select all" : "Selectează tot",
     "Name" : "Nume",
+    "Deleted" : "A fost șters.",
     "Delete" : "Șterge"
 },"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/user_ldap/l10n/bg_BG.js b/apps/user_ldap/l10n/bg_BG.js
index 42f1a3759f2..e363f1c897b 100644
--- a/apps/user_ldap/l10n/bg_BG.js
+++ b/apps/user_ldap/l10n/bg_BG.js
@@ -33,11 +33,14 @@ OC.L10N.register(
     "Test Filter" : "Тестов Филтър",
     "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\".",
+    "Test Loginname" : "Проверка на Потребителско име",
+    "Verify settings" : "Потвърди настройките",
     "1. Server" : "1. Сървър",
     "%s. Server:" : "%s. Сървър:",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Протоколът не задължителен освен ако не изискваш SLL. В такъв случай започни с ldaps://",
     "Port" : "Порт",
+    "Detect Port" : "Открит Port",
     "User DN" : "User DN",
     "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN на потребителят, с който ще стане свързването, пр. uid=agent,dc=example,dc=com. За анонимен достъп, остави DN и Парола празни.",
     "Password" : "Парола",
diff --git a/apps/user_ldap/l10n/bg_BG.json b/apps/user_ldap/l10n/bg_BG.json
index f10290c783c..250be5f00a3 100644
--- a/apps/user_ldap/l10n/bg_BG.json
+++ b/apps/user_ldap/l10n/bg_BG.json
@@ -31,11 +31,14 @@
     "Test Filter" : "Тестов Филтър",
     "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\".",
+    "Test Loginname" : "Проверка на Потребителско име",
+    "Verify settings" : "Потвърди настройките",
     "1. Server" : "1. Сървър",
     "%s. Server:" : "%s. Сървър:",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Протоколът не задължителен освен ако не изискваш SLL. В такъв случай започни с ldaps://",
     "Port" : "Порт",
+    "Detect Port" : "Открит Port",
     "User DN" : "User DN",
     "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN на потребителят, с който ще стане свързването, пр. uid=agent,dc=example,dc=com. За анонимен достъп, остави DN и Парола празни.",
     "Password" : "Парола",
diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js
index e77e664d904..419e4cff59c 100644
--- a/apps/user_ldap/l10n/de.js
+++ b/apps/user_ldap/l10n/de.js
@@ -10,15 +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",
+    "Action does not exist" : "Aktion existiert nicht",
     "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",
+    "Please check the credentials, they seem to be wrong." : "Bitte prüfe die Anmeldeinformationen, sie scheinen nicht richtig zu sein.",
+    "Please specify the port, it could not be auto-detected." : "Bitte den Port manuell eingeben, er konnte nicht automatisch erkannt werden.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Die Base DN konnte nicht automatisch erkannt werden, bitte überprüfe die Anmeldeinformationen, den Host und den Port.",
+    "Could not detect Base DN, please enter it manually." : "Die Base DN konnte nicht erkannt werden, bitte manuell eingeben.",
     "{nthServer}. Server" : "{nthServer}. - Server",
+    "No object found in the given Base DN. Please revise." : "Keine Objekte in der Base DN gefunden, bitte überprüfen.",
+    "More then 1.000 directory entries available." : "Es sind mehr als 1.000 Verzeichnis Einträge verfügbar.",
+    " entries available within the provided Base DN" : "Einträge in der Vorgesehenen Base DN verfügbar",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Ein Fehler ist aufgetreten. Bitte prüfe die Base DN und auch die Verbindungs- und Anmeldeeinstellungen.",
     "Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Mappings cleared successfully!" : "Zuordnungen erfolgreich gelöscht!",
+    "Error while clearing the mappings." : "Fehler während dem löschen der Zuordnungen!",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Speichern fehlgeschlagen. Bitte sicherstellen dass die Datenbank arbeitet. Neuladen vor dem Fortfahren.",
+    "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?" : "Das Umschalten des Modus ermöglicht automatische LDAP-Abfragen. Abhängig von Ihrer LDAP-Größe kann dies eine Weile dauern. Wollen Sie immer noch den Modus wechseln?",
+    "Mode switch" : "Modus umschalten",
     "Select attributes" : "Attribute auswählen",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "User nicht gefunden. Prüfe Deine Login Attribute und den Usernamen. Effektiver Filter (copy-and-paste für die Kommando Zeilen Überprüfung): <br/>",
+    "User found and settings verified." : "User gefunden und Einstellungen überprüft.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Es trat ein Verbindungsfehler zu LDAP / AD auf, bitte prüfen sie den Server, den Port und dieAnmeldeinformationen.",
     "_%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.",
@@ -26,29 +43,46 @@ OC.L10N.register(
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
     "Users" : "Benutzer",
+    "Login Attributes" : "Anmelde Attribute",
     "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 these object classes:" : "Nur diese Objekt Klassen:",
+    "Only from these groups:" : "Nur von diesen Gruppen:",
+    "Search groups" : "Suche Gruppen",
+    "Available groups" : "Verfügbare Gruppen",
+    "Selected groups" : "Ausgewählte Gruppen",
+    "Edit LDAP Query" : "Editiere die LDAP Abfrage",
+    "LDAP Filter:" : "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",
+    "Verify settings and count groups" : "Überprüfe die Einstellungen und zähle Gruppen",
+    "LDAP / AD Username:" : "LDAP / AD Benutzername:",
+    "LDAP / AD Email Address:" : "LDAP / AD Email 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\"",
+    "Test Loginname" : "Teste den Benutzernamen",
+    "Verify settings" : "Überprüfe Einstellungen",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
     "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",
+    "Detect Port" : "Ermittle den Port",
     "User DN" : "Benutzer-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." : "Der DN des Benutzers, mit dem der LDAP-Bind durchgeführt werden soll, z.B. uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer.",
     "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 die Basis-DN für Benutzer und Gruppen im Reiter „Fortgeschritten“ angeben",
+    "Detect Base DN" : "Ermittle die Base DN",
+    "Test Base DN" : "Teste die Base DN",
     "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.",
+    "Verify settings and count users" : "Überprüfe Einstellungen und zähle Benutzer",
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json
index 407e5bb73d4..47fc89ddb59 100644
--- a/apps/user_ldap/l10n/de.json
+++ b/apps/user_ldap/l10n/de.json
@@ -8,15 +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",
+    "Action does not exist" : "Aktion existiert nicht",
     "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",
+    "Please check the credentials, they seem to be wrong." : "Bitte prüfe die Anmeldeinformationen, sie scheinen nicht richtig zu sein.",
+    "Please specify the port, it could not be auto-detected." : "Bitte den Port manuell eingeben, er konnte nicht automatisch erkannt werden.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Die Base DN konnte nicht automatisch erkannt werden, bitte überprüfe die Anmeldeinformationen, den Host und den Port.",
+    "Could not detect Base DN, please enter it manually." : "Die Base DN konnte nicht erkannt werden, bitte manuell eingeben.",
     "{nthServer}. Server" : "{nthServer}. - Server",
+    "No object found in the given Base DN. Please revise." : "Keine Objekte in der Base DN gefunden, bitte überprüfen.",
+    "More then 1.000 directory entries available." : "Es sind mehr als 1.000 Verzeichnis Einträge verfügbar.",
+    " entries available within the provided Base DN" : "Einträge in der Vorgesehenen Base DN verfügbar",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Ein Fehler ist aufgetreten. Bitte prüfe die Base DN und auch die Verbindungs- und Anmeldeeinstellungen.",
     "Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Mappings cleared successfully!" : "Zuordnungen erfolgreich gelöscht!",
+    "Error while clearing the mappings." : "Fehler während dem löschen der Zuordnungen!",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Speichern fehlgeschlagen. Bitte sicherstellen dass die Datenbank arbeitet. Neuladen vor dem Fortfahren.",
+    "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?" : "Das Umschalten des Modus ermöglicht automatische LDAP-Abfragen. Abhängig von Ihrer LDAP-Größe kann dies eine Weile dauern. Wollen Sie immer noch den Modus wechseln?",
+    "Mode switch" : "Modus umschalten",
     "Select attributes" : "Attribute auswählen",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "User nicht gefunden. Prüfe Deine Login Attribute und den Usernamen. Effektiver Filter (copy-and-paste für die Kommando Zeilen Überprüfung): <br/>",
+    "User found and settings verified." : "User gefunden und Einstellungen überprüft.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Es trat ein Verbindungsfehler zu LDAP / AD auf, bitte prüfen sie den Server, den Port und dieAnmeldeinformationen.",
     "_%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.",
@@ -24,29 +41,46 @@
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
     "Users" : "Benutzer",
+    "Login Attributes" : "Anmelde Attribute",
     "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 these object classes:" : "Nur diese Objekt Klassen:",
+    "Only from these groups:" : "Nur von diesen Gruppen:",
+    "Search groups" : "Suche Gruppen",
+    "Available groups" : "Verfügbare Gruppen",
+    "Selected groups" : "Ausgewählte Gruppen",
+    "Edit LDAP Query" : "Editiere die LDAP Abfrage",
+    "LDAP Filter:" : "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",
+    "Verify settings and count groups" : "Überprüfe die Einstellungen und zähle Gruppen",
+    "LDAP / AD Username:" : "LDAP / AD Benutzername:",
+    "LDAP / AD Email Address:" : "LDAP / AD Email 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\"",
+    "Test Loginname" : "Teste den Benutzernamen",
+    "Verify settings" : "Überprüfe Einstellungen",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
     "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",
+    "Detect Port" : "Ermittle den Port",
     "User DN" : "Benutzer-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." : "Der DN des Benutzers, mit dem der LDAP-Bind durchgeführt werden soll, z.B. uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer.",
     "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 die Basis-DN für Benutzer und Gruppen im Reiter „Fortgeschritten“ angeben",
+    "Detect Base DN" : "Ermittle die Base DN",
+    "Test Base DN" : "Teste die Base DN",
     "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.",
+    "Verify settings and count users" : "Überprüfe Einstellungen und zähle Benutzer",
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js
index 3290e715673..132780c74bf 100644
--- a/apps/user_ldap/l10n/de_DE.js
+++ b/apps/user_ldap/l10n/de_DE.js
@@ -10,15 +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",
+    "Action does not exist" : "Aktion existiert nicht",
     "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",
+    "Please check the credentials, they seem to be wrong." : "Bitte prüfe die Anmeldeinformationen, sie scheinen nicht richtig zu sein.",
+    "Please specify the port, it could not be auto-detected." : "Bitte den Port manuell eingeben, er konnte nicht automatisch erkannt werden.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Die Base DN konnte nicht automatisch erkannt werden, bitte überprüfe die Anmeldeinformationen, den Host und den Port.",
+    "Could not detect Base DN, please enter it manually." : "Die Base DN konnte nicht erkannt werden, bitte manuell eingeben.",
     "{nthServer}. Server" : "{nthServer}. - Server",
+    "No object found in the given Base DN. Please revise." : "Keine Objekte in der Base DN gefunden, bitte überprüfen.",
+    "More then 1.000 directory entries available." : "Es sind mehr als 1.000 Verzeichnis Einträge verfügbar.",
+    " entries available within the provided Base DN" : "Einträge in der Vorgesehenen Base DN verfügbar",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Ein Fehler ist aufgetreten. Bitte prüfe die Base DN und auch die Verbindungs- und Anmeldeeinstellungen.",
     "Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Mappings cleared successfully!" : "Zuordnungen erfolgreich gelöscht!",
+    "Error while clearing the mappings." : "Fehler während dem löschen der Zuordnungen!",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Speichern fehlgeschlagen. Bitte sicherstellen dass die Datenbank arbeitet. Neuladen vor dem Fortfahren.",
+    "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?" : "Das Umschalten des Modus ermöglicht automatische LDAP-Abfragen. Abhängig von Ihrer LDAP-Größe kann dies eine Weile dauern. Wollen Sie immer noch den Modus wechseln",
+    "Mode switch" : "Modus umschalten",
     "Select attributes" : "Attribute auswählen",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "User nicht gefunden. Prüfe Deine Login Attribute und den Usernamen. Effektiver Filter (copy-and-paste für die Kommando Zeilen Überprüfung): <br/>",
+    "User found and settings verified." : "User gefunden und Einstellungen überprüft.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Es trat ein Verbindungsfehler zu LDAP / AD auf, bitte prüfen sie den Server, den Port und dieAnmeldeinformationen.",
     "_%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.",
@@ -26,29 +43,46 @@ OC.L10N.register(
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
     "Users" : "Benutzer",
+    "Login Attributes" : "Anmelde Attribute",
     "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 these object classes:" : "Nur diese Objekt Klassen:",
+    "Only from these groups:" : "Nur von diesen Gruppen:",
+    "Search groups" : "Suche Gruppen",
+    "Available groups" : "Verfügbare Gruppen",
+    "Selected groups" : "Ausgewählte Gruppen",
+    "Edit LDAP Query" : "Editiere die LDAP Abfrage",
+    "LDAP Filter:" : "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",
+    "Verify settings and count groups" : "Überprüfe die Einstellungen und zähle Gruppen",
+    "LDAP / AD Username:" : "LDAP / AD Benutzername:",
+    "LDAP / AD Email Address:" : "LDAP / AD Email 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\"",
+    "Test Loginname" : "Teste den Benutzernamen",
+    "Verify settings" : "Überprüfe Einstellungen",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
     "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",
+    "Detect Port" : "Ermittle den Port",
     "User DN" : "Benutzer-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." : "Der DN des Benutzers, mit dem der LDAP-Bind durchgeführt werden soll, z.B. uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer.",
     "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 die Basis-DN für Benutzer und Gruppen im Reiter „Fortgeschritten“ angeben",
+    "Detect Base DN" : "Ermittle die Base DN",
+    "Test Base DN" : "Teste die Base DN",
     "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.",
+    "Verify settings and count users" : "Überprüfe Einstellungen und zähle Benutzer",
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json
index 3467cbc6082..a4661c72581 100644
--- a/apps/user_ldap/l10n/de_DE.json
+++ b/apps/user_ldap/l10n/de_DE.json
@@ -8,15 +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",
+    "Action does not exist" : "Aktion existiert nicht",
     "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",
+    "Please check the credentials, they seem to be wrong." : "Bitte prüfe die Anmeldeinformationen, sie scheinen nicht richtig zu sein.",
+    "Please specify the port, it could not be auto-detected." : "Bitte den Port manuell eingeben, er konnte nicht automatisch erkannt werden.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Die Base DN konnte nicht automatisch erkannt werden, bitte überprüfe die Anmeldeinformationen, den Host und den Port.",
+    "Could not detect Base DN, please enter it manually." : "Die Base DN konnte nicht erkannt werden, bitte manuell eingeben.",
     "{nthServer}. Server" : "{nthServer}. - Server",
+    "No object found in the given Base DN. Please revise." : "Keine Objekte in der Base DN gefunden, bitte überprüfen.",
+    "More then 1.000 directory entries available." : "Es sind mehr als 1.000 Verzeichnis Einträge verfügbar.",
+    " entries available within the provided Base DN" : "Einträge in der Vorgesehenen Base DN verfügbar",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Ein Fehler ist aufgetreten. Bitte prüfe die Base DN und auch die Verbindungs- und Anmeldeeinstellungen.",
     "Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Mappings cleared successfully!" : "Zuordnungen erfolgreich gelöscht!",
+    "Error while clearing the mappings." : "Fehler während dem löschen der Zuordnungen!",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Speichern fehlgeschlagen. Bitte sicherstellen dass die Datenbank arbeitet. Neuladen vor dem Fortfahren.",
+    "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?" : "Das Umschalten des Modus ermöglicht automatische LDAP-Abfragen. Abhängig von Ihrer LDAP-Größe kann dies eine Weile dauern. Wollen Sie immer noch den Modus wechseln",
+    "Mode switch" : "Modus umschalten",
     "Select attributes" : "Attribute auswählen",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "User nicht gefunden. Prüfe Deine Login Attribute und den Usernamen. Effektiver Filter (copy-and-paste für die Kommando Zeilen Überprüfung): <br/>",
+    "User found and settings verified." : "User gefunden und Einstellungen überprüft.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Es trat ein Verbindungsfehler zu LDAP / AD auf, bitte prüfen sie den Server, den Port und dieAnmeldeinformationen.",
     "_%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.",
@@ -24,29 +41,46 @@
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
     "Users" : "Benutzer",
+    "Login Attributes" : "Anmelde Attribute",
     "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 these object classes:" : "Nur diese Objekt Klassen:",
+    "Only from these groups:" : "Nur von diesen Gruppen:",
+    "Search groups" : "Suche Gruppen",
+    "Available groups" : "Verfügbare Gruppen",
+    "Selected groups" : "Ausgewählte Gruppen",
+    "Edit LDAP Query" : "Editiere die LDAP Abfrage",
+    "LDAP Filter:" : "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",
+    "Verify settings and count groups" : "Überprüfe die Einstellungen und zähle Gruppen",
+    "LDAP / AD Username:" : "LDAP / AD Benutzername:",
+    "LDAP / AD Email Address:" : "LDAP / AD Email 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\"",
+    "Test Loginname" : "Teste den Benutzernamen",
+    "Verify settings" : "Überprüfe Einstellungen",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
     "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",
+    "Detect Port" : "Ermittle den Port",
     "User DN" : "Benutzer-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." : "Der DN des Benutzers, mit dem der LDAP-Bind durchgeführt werden soll, z.B. uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer.",
     "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 die Basis-DN für Benutzer und Gruppen im Reiter „Fortgeschritten“ angeben",
+    "Detect Base DN" : "Ermittle die Base DN",
+    "Test Base DN" : "Teste die Base DN",
     "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.",
+    "Verify settings and count users" : "Überprüfe Einstellungen und zähle Benutzer",
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
diff --git a/apps/user_ldap/l10n/el.js b/apps/user_ldap/l10n/el.js
index 018338ff51c..53e2e418a7f 100644
--- a/apps/user_ldap/l10n/el.js
+++ b/apps/user_ldap/l10n/el.js
@@ -10,6 +10,7 @@ OC.L10N.register(
     "No configuration specified" : "Καμμία διαμόρφωση δεν προσδιορίστηκε",
     "No data specified" : "Δεν προσδιορίστηκαν δεδομένα",
     " Could not set configuration %s" : "Αδυναμία ρύθμισης %s",
+    "Action does not exist" : "Η ενέργεια δεν υπάρχει",
     "Configuration incorrect" : "Η διαμόρφωση είναι λανθασμένη",
     "Configuration incomplete" : "Η διαμόρφωση είναι ελλιπής",
     "Configuration OK" : "Η διαμόρφωση είναι εντάξει",
@@ -17,14 +18,30 @@ OC.L10N.register(
     "Select object classes" : "Επιλογή κλάσης αντικειμένων",
     "Please check the credentials, they seem to be wrong." : "Παρακαλώ ελέγξτε τα στοιχεία, φαίνεται να είναι λάθος.",
     "Please specify the port, it could not be auto-detected." : "Παρακαλώ ορίστε την θύρα, δεν ήταν εφικτό να εντοπιστεί αυτόματα.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Αδυναμία ανίχνευσης Base DN, παρακαλώ αναθεωρήστε τα διαπιστευτήρια, το διακομιστή και τη θύρα.",
+    "Could not detect Base DN, please enter it manually." : "Αδυναμία ανίχνευσης Base DN, παρακαλώ να το εισάγετε χειροκίνητα.",
     "{nthServer}. Server" : "{nthServer}. Διακομιστής",
+    "No object found in the given Base DN. Please revise." : "Δεν βρέθηκε αντικείμενο στο δηλωθέν Base DN. Παρακαλώ αναθεωρήστε.",
     "More then 1.000 directory entries available." : "Είναι διαθέσιμες περισσότερες από 1.000 εγγραφές καταλόγου.",
+    " entries available within the provided Base DN" : "διαθέσιμες καταχωρήσεις εντός του δηλωθέντος ",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Παρουσιάστηκε σφάλμα. Παρακαλούμε ελέγξτε το Base DN καθώς και τις ρυθμίσεις και τα διαπιστευτήρια σύνδεσης.",
     "Do you really want to delete the current Server Configuration?" : "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
     "Confirm Deletion" : "Επιβεβαίωση Διαγραφής",
     "Mappings cleared successfully!" : "Η εκκαθάριση αντιστοιχιών ήταν επιτυχής!",
     "Error while clearing the mappings." : "Σφάλμα κατά την εκκαθάριση των αντιστοιχιών.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Αποτυχία αποθήκευσης. Παρακαλούμε βεβαιωθείτε ότι η βάση δεδομένων λειτουργεί. Επαναφορτώστε πριν συνεχίσετε.",
+    "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?" : "Η αλλαγή της κατάστασης θα ενεργοποιήσει αυτόματα ερωτήματα LDAP. Ανάλογα με το μέγεθος του LDAP αυτό μπορεί να διαρκέσει αρκετά. Θέλετε ακόμη να αλλάξετε κατάσταση λειτουργίας;",
+    "Mode switch" : "Αλλαγή κατάστασης",
     "Select attributes" : "Επιλογή χαρακτηριστικών",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Δεν βρέθηκε ο χρήστης. Παρακαλούμε ελέγξτε ότι τις ιδιότητες σύνδεσης και το όνομα χρήστη. Ενεργό φίλτρο (για αντιγραφή και επικόλληση για επικύρωση σε γραμμή εντολών): ",
     "User found and settings verified." : "Ο χρήστης βρέθηκε και οι ρυθμίσεις επιβεβαιώθηκαν.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Οι ρυθμίσεις επαληθεύτηκαν αλλά βρέθηκε ένας χρήστης. Μόνο ο πρώτος θα μπορέσει να συνδεθεί. Εξετάστε τη χρήση πιο επιλεκτικού φίλτρου.",
+    "An unspecified error occurred. Please check the settings and the log." : "Προέκυψε ένα απροσδιόριστο σφάλμα. Παρακαλούμε ελέγξτε τις ρυθμίσεςι και το αρχείο ακταγραφής.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Το φίλτρο αναζήτησης δεν είναι έγκυρο, πιθανώς λόγω συντακτικών προβλημάτων όπως μη ταίριασμα ανοίγματος και κλεισίματος αγκυλών. Παρακαλούμε διορθώστε.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Προέκυψε σφάλμα σύνδεσης στο LDAP / AD, παρακαλούμε ελέγξτε διακομιστή θύρα και διαπιστευτήρια.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "Η κράτηση θέσης %uid απουσιάζει. Θα αντικατασταθεί με το όνομα σύνδεσης κατά το ερώτημα ",
+    "Please provide a login name to test against" : "Παρακαλούμε δώστε ένα όνομα σύνδεσης για να γίνει δοκιμή",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Το πεδίο ομάδας απενεργοποιήθηκε επειδή ο διακομιστής LDAP / AD δεν υποστηρίζει το memberOf.",
     "_%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",
@@ -32,36 +49,50 @@ OC.L10N.register(
     "Invalid Host" : "Άκυρος εξυπηρετητής",
     "Server" : "Διακομιστής",
     "Users" : "Χρήστες",
+    "Login Attributes" : "Ιδιότητες Σύνδεσης",
     "Groups" : "Ομάδες",
     "Test Configuration" : "Δοκιμαστικες ρυθμισεις",
     "Help" : "Βοήθεια",
     "Groups meeting these criteria are available in %s:" : "Οι ομάδες που πληρούν τα κριτήρια είναι διαθέσιμες σε %s:",
     "Only these object classes:" : "Μόνο οι κλάσεις αντικειμένων:",
     "Only from these groups:" : "Μόνο από τις ομάδες:",
+    "Search groups" : "Αναζήτηση ομάδων",
     "Available groups" : "Διαθέσιμες ομάδες",
     "Selected groups" : "Επιλεγμένες ομάδες",
+    "Edit LDAP Query" : "Επεξεργασία ερωτήματος ",
+    "LDAP Filter:" : "Φίλτρο LDAP:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιες ομάδες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
     "Test Filter" : "Φίλτρο Ελέγχου",
     "Verify settings and count groups" : "Επιβεβαίωση ρυθμίσεων και καταμέτρηση ομάδων",
+    "When logging in, %s will find the user based on the following attributes:" : "Κατά τη σύνδεση, το %s θα βρει το χρήστη βασιζόμενος στις ακόλουθες ιδιότητες:",
+    "LDAP / AD Username:" : "Όνομα χρήστη LDAP / AD:",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Επιτρέπει σύνδεση με το όνομα χρήστη στο LDAP / AD, το οποίο είναι είτε uid ή samaccountname και θα ανιχνευθεί.",
+    "LDAP / AD Email Address:" : "Διεύθυνση ηλ. ταχυδρομείου LDAP / AD:",
+    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Επιτρέπει με χρήση μια ιδιότητας email. Τα mail και mailPrimaryAddress θα επιτραπούν.",
     "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\"",
+    "Test Loginname" : "Δοκιμή ",
     "Verify settings" : "Επιβεβαίωση ρυθμίσεων",
     "1. Server" : "1. Διακομιστής",
     "%s. Server:" : "%s. Διακομιστής:",
     "Host" : "Διακομιστής",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://",
     "Port" : "Θύρα",
+    "Detect Port" : "Ανίχνευση Θύρας",
     "User DN" : "User DN",
     "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "Το DN του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά.",
     "Password" : "Συνθηματικό",
     "For anonymous access, leave DN and Password empty." : "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword.",
     "One Base DN per line" : "Ένα DN Βάσης ανά γραμμή ",
     "You can specify Base DN for users and groups in the Advanced tab" : "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις",
+    "Detect Base DN" : "Ανίχνευση Base DN",
+    "Test Base DN" : "Δοκιμή ",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Αποφυγή αυτόματων αιτημάτων LDAP. Προτιμότερο για μεγαλύτερες εγκαταστάσεις, αλλά απαιτεί κάποιες γνώσεις  LDAP.",
     "Manually enter LDAP filters (recommended for large directories)" : "Εισάγετε με μη αυτόματο τρόπο φίλτρα LDAP (προτείνεται για μεγάλους καταλόγους)",
     "Limit %s access to users meeting these criteria:" : "Περιορισμός της πρόσβασης %s σε χρήστες που πληρούν τα κριτήρια:",
     "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Οι πιο συνηθισμένες κλάσεις αντικειμένων για τους χρήστες είναι οι organizationalPerson, person, user, και inetOrgPerson. Εάν δεν είσαστε σίγουροι πιο κλάση να επιλέξετε, παρακαλώ συμβουλευτείτε τον διαχειριστή του καταλόγου σας.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιοι χρήστες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
+    "Verify settings and count users" : "Επαλήθευση ρυθμίσεων και καταμέτρηση χρηστών",
     "Saving" : "Αποθήκευση",
     "Back" : "Επιστροφή",
     "Continue" : "Συνέχεια",
diff --git a/apps/user_ldap/l10n/el.json b/apps/user_ldap/l10n/el.json
index e55aa18d5a1..99a969e677f 100644
--- a/apps/user_ldap/l10n/el.json
+++ b/apps/user_ldap/l10n/el.json
@@ -8,6 +8,7 @@
     "No configuration specified" : "Καμμία διαμόρφωση δεν προσδιορίστηκε",
     "No data specified" : "Δεν προσδιορίστηκαν δεδομένα",
     " Could not set configuration %s" : "Αδυναμία ρύθμισης %s",
+    "Action does not exist" : "Η ενέργεια δεν υπάρχει",
     "Configuration incorrect" : "Η διαμόρφωση είναι λανθασμένη",
     "Configuration incomplete" : "Η διαμόρφωση είναι ελλιπής",
     "Configuration OK" : "Η διαμόρφωση είναι εντάξει",
@@ -15,14 +16,30 @@
     "Select object classes" : "Επιλογή κλάσης αντικειμένων",
     "Please check the credentials, they seem to be wrong." : "Παρακαλώ ελέγξτε τα στοιχεία, φαίνεται να είναι λάθος.",
     "Please specify the port, it could not be auto-detected." : "Παρακαλώ ορίστε την θύρα, δεν ήταν εφικτό να εντοπιστεί αυτόματα.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Αδυναμία ανίχνευσης Base DN, παρακαλώ αναθεωρήστε τα διαπιστευτήρια, το διακομιστή και τη θύρα.",
+    "Could not detect Base DN, please enter it manually." : "Αδυναμία ανίχνευσης Base DN, παρακαλώ να το εισάγετε χειροκίνητα.",
     "{nthServer}. Server" : "{nthServer}. Διακομιστής",
+    "No object found in the given Base DN. Please revise." : "Δεν βρέθηκε αντικείμενο στο δηλωθέν Base DN. Παρακαλώ αναθεωρήστε.",
     "More then 1.000 directory entries available." : "Είναι διαθέσιμες περισσότερες από 1.000 εγγραφές καταλόγου.",
+    " entries available within the provided Base DN" : "διαθέσιμες καταχωρήσεις εντός του δηλωθέντος ",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Παρουσιάστηκε σφάλμα. Παρακαλούμε ελέγξτε το Base DN καθώς και τις ρυθμίσεις και τα διαπιστευτήρια σύνδεσης.",
     "Do you really want to delete the current Server Configuration?" : "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
     "Confirm Deletion" : "Επιβεβαίωση Διαγραφής",
     "Mappings cleared successfully!" : "Η εκκαθάριση αντιστοιχιών ήταν επιτυχής!",
     "Error while clearing the mappings." : "Σφάλμα κατά την εκκαθάριση των αντιστοιχιών.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Αποτυχία αποθήκευσης. Παρακαλούμε βεβαιωθείτε ότι η βάση δεδομένων λειτουργεί. Επαναφορτώστε πριν συνεχίσετε.",
+    "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?" : "Η αλλαγή της κατάστασης θα ενεργοποιήσει αυτόματα ερωτήματα LDAP. Ανάλογα με το μέγεθος του LDAP αυτό μπορεί να διαρκέσει αρκετά. Θέλετε ακόμη να αλλάξετε κατάσταση λειτουργίας;",
+    "Mode switch" : "Αλλαγή κατάστασης",
     "Select attributes" : "Επιλογή χαρακτηριστικών",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Δεν βρέθηκε ο χρήστης. Παρακαλούμε ελέγξτε ότι τις ιδιότητες σύνδεσης και το όνομα χρήστη. Ενεργό φίλτρο (για αντιγραφή και επικόλληση για επικύρωση σε γραμμή εντολών): ",
     "User found and settings verified." : "Ο χρήστης βρέθηκε και οι ρυθμίσεις επιβεβαιώθηκαν.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Οι ρυθμίσεις επαληθεύτηκαν αλλά βρέθηκε ένας χρήστης. Μόνο ο πρώτος θα μπορέσει να συνδεθεί. Εξετάστε τη χρήση πιο επιλεκτικού φίλτρου.",
+    "An unspecified error occurred. Please check the settings and the log." : "Προέκυψε ένα απροσδιόριστο σφάλμα. Παρακαλούμε ελέγξτε τις ρυθμίσεςι και το αρχείο ακταγραφής.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Το φίλτρο αναζήτησης δεν είναι έγκυρο, πιθανώς λόγω συντακτικών προβλημάτων όπως μη ταίριασμα ανοίγματος και κλεισίματος αγκυλών. Παρακαλούμε διορθώστε.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Προέκυψε σφάλμα σύνδεσης στο LDAP / AD, παρακαλούμε ελέγξτε διακομιστή θύρα και διαπιστευτήρια.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "Η κράτηση θέσης %uid απουσιάζει. Θα αντικατασταθεί με το όνομα σύνδεσης κατά το ερώτημα ",
+    "Please provide a login name to test against" : "Παρακαλούμε δώστε ένα όνομα σύνδεσης για να γίνει δοκιμή",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Το πεδίο ομάδας απενεργοποιήθηκε επειδή ο διακομιστής LDAP / AD δεν υποστηρίζει το memberOf.",
     "_%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",
@@ -30,36 +47,50 @@
     "Invalid Host" : "Άκυρος εξυπηρετητής",
     "Server" : "Διακομιστής",
     "Users" : "Χρήστες",
+    "Login Attributes" : "Ιδιότητες Σύνδεσης",
     "Groups" : "Ομάδες",
     "Test Configuration" : "Δοκιμαστικες ρυθμισεις",
     "Help" : "Βοήθεια",
     "Groups meeting these criteria are available in %s:" : "Οι ομάδες που πληρούν τα κριτήρια είναι διαθέσιμες σε %s:",
     "Only these object classes:" : "Μόνο οι κλάσεις αντικειμένων:",
     "Only from these groups:" : "Μόνο από τις ομάδες:",
+    "Search groups" : "Αναζήτηση ομάδων",
     "Available groups" : "Διαθέσιμες ομάδες",
     "Selected groups" : "Επιλεγμένες ομάδες",
+    "Edit LDAP Query" : "Επεξεργασία ερωτήματος ",
+    "LDAP Filter:" : "Φίλτρο LDAP:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιες ομάδες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
     "Test Filter" : "Φίλτρο Ελέγχου",
     "Verify settings and count groups" : "Επιβεβαίωση ρυθμίσεων και καταμέτρηση ομάδων",
+    "When logging in, %s will find the user based on the following attributes:" : "Κατά τη σύνδεση, το %s θα βρει το χρήστη βασιζόμενος στις ακόλουθες ιδιότητες:",
+    "LDAP / AD Username:" : "Όνομα χρήστη LDAP / AD:",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Επιτρέπει σύνδεση με το όνομα χρήστη στο LDAP / AD, το οποίο είναι είτε uid ή samaccountname και θα ανιχνευθεί.",
+    "LDAP / AD Email Address:" : "Διεύθυνση ηλ. ταχυδρομείου LDAP / AD:",
+    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Επιτρέπει με χρήση μια ιδιότητας email. Τα mail και mailPrimaryAddress θα επιτραπούν.",
     "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\"",
+    "Test Loginname" : "Δοκιμή ",
     "Verify settings" : "Επιβεβαίωση ρυθμίσεων",
     "1. Server" : "1. Διακομιστής",
     "%s. Server:" : "%s. Διακομιστής:",
     "Host" : "Διακομιστής",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://",
     "Port" : "Θύρα",
+    "Detect Port" : "Ανίχνευση Θύρας",
     "User DN" : "User DN",
     "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "Το DN του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά.",
     "Password" : "Συνθηματικό",
     "For anonymous access, leave DN and Password empty." : "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword.",
     "One Base DN per line" : "Ένα DN Βάσης ανά γραμμή ",
     "You can specify Base DN for users and groups in the Advanced tab" : "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις",
+    "Detect Base DN" : "Ανίχνευση Base DN",
+    "Test Base DN" : "Δοκιμή ",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Αποφυγή αυτόματων αιτημάτων LDAP. Προτιμότερο για μεγαλύτερες εγκαταστάσεις, αλλά απαιτεί κάποιες γνώσεις  LDAP.",
     "Manually enter LDAP filters (recommended for large directories)" : "Εισάγετε με μη αυτόματο τρόπο φίλτρα LDAP (προτείνεται για μεγάλους καταλόγους)",
     "Limit %s access to users meeting these criteria:" : "Περιορισμός της πρόσβασης %s σε χρήστες που πληρούν τα κριτήρια:",
     "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Οι πιο συνηθισμένες κλάσεις αντικειμένων για τους χρήστες είναι οι organizationalPerson, person, user, και inetOrgPerson. Εάν δεν είσαστε σίγουροι πιο κλάση να επιλέξετε, παρακαλώ συμβουλευτείτε τον διαχειριστή του καταλόγου σας.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιοι χρήστες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
+    "Verify settings and count users" : "Επαλήθευση ρυθμίσεων και καταμέτρηση χρηστών",
     "Saving" : "Αποθήκευση",
     "Back" : "Επιστροφή",
     "Continue" : "Συνέχεια",
diff --git a/apps/user_ldap/l10n/it.js b/apps/user_ldap/l10n/it.js
index f0b06342af2..1b05a903b32 100644
--- a/apps/user_ldap/l10n/it.js
+++ b/apps/user_ldap/l10n/it.js
@@ -10,15 +10,21 @@ 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",
+    "Action does not exist" : "L'azione non esiste",
     "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",
+    "Please check the credentials, they seem to be wrong." : "Controlla le credenziali, sembrano essere errate.",
+    "Please specify the port, it could not be auto-detected." : "Specifica la porta, potrebbe non essere rilevata automaticamente.",
+    "Could not detect Base DN, please enter it manually." : "Impossibile rilevare il DN base, digitalo manualmente.",
     "{nthServer}. Server" : "{nthServer}. server",
+    "More then 1.000 directory entries available." : "Più di 1.000 cartelle disponibili.",
     "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",
+    "User found and settings verified." : "Utente trovato e impostazioni verificate.",
     "_%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.",
@@ -26,29 +32,44 @@ OC.L10N.register(
     "Invalid Host" : "Host non valido",
     "Server" : "Server",
     "Users" : "Utenti",
+    "Login Attributes" : "Attributi di accesso",
     "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 these object classes:" : "Solo queste classi di oggetti:",
+    "Only from these groups:" : "Solo da questi gruppi:",
+    "Search groups" : "Cerca gruppi",
+    "Available groups" : "Gruppi disponibili",
+    "Selected groups" : "Gruppi selezionati",
+    "Edit LDAP Query" : "Modifica query LDAP",
+    "LDAP Filter:" : "Filtro LDAP:",
     "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",
+    "Verify settings and count groups" : "Verifica le impostazioni e conta i gruppi",
+    "LDAP / AD Username:" : "Nome utente LDAP / AD:",
+    "LDAP / AD Email Address:" : "Indirizzo email LDAP / AD:",
     "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\"",
+    "Verify settings" : "Verifica impostazioni",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
     "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",
+    "Detect Port" : "Rileva porta",
     "User DN" : "DN utente",
     "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." : "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agente,dc=esempio,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
     "Password" : "Password",
     "For anonymous access, leave DN and Password empty." : "Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
     "One Base DN per line" : "Un DN base per riga",
     "You can specify Base DN for users and groups in the Advanced tab" : "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate",
+    "Test Base DN" : "Rileva DN base",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Impedisce le richieste LDAP automatiche. Meglio per installazioni più grandi, ma richiede una certa conoscenza di LDAP.",
     "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.",
+    "Verify settings and count users" : "Verifica le impostazioni e conta gli utenti",
     "Saving" : "Salvataggio",
     "Back" : "Indietro",
     "Continue" : "Continua",
diff --git a/apps/user_ldap/l10n/it.json b/apps/user_ldap/l10n/it.json
index 115bdb3b0cd..495275a438d 100644
--- a/apps/user_ldap/l10n/it.json
+++ b/apps/user_ldap/l10n/it.json
@@ -8,15 +8,21 @@
     "No configuration specified" : "Nessuna configurazione specificata",
     "No data specified" : "Nessun dato specificato",
     " Could not set configuration %s" : "Impossibile impostare la configurazione %s",
+    "Action does not exist" : "L'azione non esiste",
     "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",
+    "Please check the credentials, they seem to be wrong." : "Controlla le credenziali, sembrano essere errate.",
+    "Please specify the port, it could not be auto-detected." : "Specifica la porta, potrebbe non essere rilevata automaticamente.",
+    "Could not detect Base DN, please enter it manually." : "Impossibile rilevare il DN base, digitalo manualmente.",
     "{nthServer}. Server" : "{nthServer}. server",
+    "More then 1.000 directory entries available." : "Più di 1.000 cartelle disponibili.",
     "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",
+    "User found and settings verified." : "Utente trovato e impostazioni verificate.",
     "_%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.",
@@ -24,29 +30,44 @@
     "Invalid Host" : "Host non valido",
     "Server" : "Server",
     "Users" : "Utenti",
+    "Login Attributes" : "Attributi di accesso",
     "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 these object classes:" : "Solo queste classi di oggetti:",
+    "Only from these groups:" : "Solo da questi gruppi:",
+    "Search groups" : "Cerca gruppi",
+    "Available groups" : "Gruppi disponibili",
+    "Selected groups" : "Gruppi selezionati",
+    "Edit LDAP Query" : "Modifica query LDAP",
+    "LDAP Filter:" : "Filtro LDAP:",
     "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",
+    "Verify settings and count groups" : "Verifica le impostazioni e conta i gruppi",
+    "LDAP / AD Username:" : "Nome utente LDAP / AD:",
+    "LDAP / AD Email Address:" : "Indirizzo email LDAP / AD:",
     "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\"",
+    "Verify settings" : "Verifica impostazioni",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
     "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",
+    "Detect Port" : "Rileva porta",
     "User DN" : "DN utente",
     "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." : "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agente,dc=esempio,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
     "Password" : "Password",
     "For anonymous access, leave DN and Password empty." : "Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
     "One Base DN per line" : "Un DN base per riga",
     "You can specify Base DN for users and groups in the Advanced tab" : "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate",
+    "Test Base DN" : "Rileva DN base",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Impedisce le richieste LDAP automatiche. Meglio per installazioni più grandi, ma richiede una certa conoscenza di LDAP.",
     "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.",
+    "Verify settings and count users" : "Verifica le impostazioni e conta gli utenti",
     "Saving" : "Salvataggio",
     "Back" : "Indietro",
     "Continue" : "Continua",
diff --git a/apps/user_ldap/l10n/ro.js b/apps/user_ldap/l10n/ro.js
index c36b232f185..cb3a126fe6f 100644
--- a/apps/user_ldap/l10n/ro.js
+++ b/apps/user_ldap/l10n/ro.js
@@ -1,9 +1,13 @@
 OC.L10N.register(
     "user_ldap",
     {
+    "Failed to clear the mappings." : "Ștergerea mapărilor a eșuat.",
+    "Failed to delete the server configuration" : "Ștergerea configurației serverului a eșuat.",
     "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 ",
+    "No data specified" : "Nici o dată specificată",
+    "Action does not exist" : "Acțiunea nu există",
     "Configuration incorrect" : "Configuraţie incorecta ",
     "Configuration incomplete" : "Configuraţie incompleta ",
     "Configuration OK" : "Configuraţie valida",
@@ -11,6 +15,10 @@ OC.L10N.register(
     "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 ",
     "Select attributes" : "Selectaţi caracteristici",
+    "_%s group found_::_%s groups found_" : ["%s grup găsit.","%s grupuri găsite.","%s grupuri găsite."],
+    "_%s user found_::_%s users found_" : ["%s utilizator găsit.","%s utilizatori găsiți.","%s utilizatori găsiți."],
+    "Invalid Host" : "Host invalid",
+    "Server" : "Server",
     "Users" : "Utilizatori",
     "Groups" : "Grupuri",
     "Test Configuration" : "Configurare test",
diff --git a/apps/user_ldap/l10n/ro.json b/apps/user_ldap/l10n/ro.json
index 44cc6680e64..c84722f88ba 100644
--- a/apps/user_ldap/l10n/ro.json
+++ b/apps/user_ldap/l10n/ro.json
@@ -1,7 +1,11 @@
 { "translations": {
+    "Failed to clear the mappings." : "Ștergerea mapărilor a eșuat.",
+    "Failed to delete the server configuration" : "Ștergerea configurației serverului a eșuat.",
     "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 ",
+    "No data specified" : "Nici o dată specificată",
+    "Action does not exist" : "Acțiunea nu există",
     "Configuration incorrect" : "Configuraţie incorecta ",
     "Configuration incomplete" : "Configuraţie incompleta ",
     "Configuration OK" : "Configuraţie valida",
@@ -9,6 +13,10 @@
     "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 ",
     "Select attributes" : "Selectaţi caracteristici",
+    "_%s group found_::_%s groups found_" : ["%s grup găsit.","%s grupuri găsite.","%s grupuri găsite."],
+    "_%s user found_::_%s users found_" : ["%s utilizator găsit.","%s utilizatori găsiți.","%s utilizatori găsiți."],
+    "Invalid Host" : "Host invalid",
+    "Server" : "Server",
     "Users" : "Utilizatori",
     "Groups" : "Grupuri",
     "Test Configuration" : "Configurare test",
diff --git a/apps/user_ldap/l10n/ru.js b/apps/user_ldap/l10n/ru.js
index 04e788b5777..10fdef8150a 100644
--- a/apps/user_ldap/l10n/ru.js
+++ b/apps/user_ldap/l10n/ru.js
@@ -10,11 +10,15 @@ OC.L10N.register(
     "No configuration specified" : "Конфигурация не создана",
     "No data specified" : "Нет данных",
     " Could not set configuration %s" : "Невозможно создать конфигурацию %s",
+    "Action does not exist" : "Действия не существует",
     "Configuration incorrect" : "Конфигурация некорректна",
     "Configuration incomplete" : "Конфигурация не завершена",
     "Configuration OK" : "Конфигурация в порядке",
     "Select groups" : "Выберите группы",
     "Select object classes" : "Выберите объектные классы",
+    "Please check the credentials, they seem to be wrong." : "Пожалуйста проверьте учетный данные, возможно они не верны.",
+    "Please specify the port, it could not be auto-detected." : "Пожалуйста укажите порт, он не может быть определен автоматически.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "База поиска не может быть определена автоматически, пожалуйста перепроверьте учетные данные, адрес и порт.",
     "{nthServer}. Server" : "Сервер {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "Вы действительно хотите удалить существующую конфигурацию сервера?",
     "Confirm Deletion" : "Подтверждение удаления",
diff --git a/apps/user_ldap/l10n/ru.json b/apps/user_ldap/l10n/ru.json
index 999c2e01bc3..8ddc9ff25fd 100644
--- a/apps/user_ldap/l10n/ru.json
+++ b/apps/user_ldap/l10n/ru.json
@@ -8,11 +8,15 @@
     "No configuration specified" : "Конфигурация не создана",
     "No data specified" : "Нет данных",
     " Could not set configuration %s" : "Невозможно создать конфигурацию %s",
+    "Action does not exist" : "Действия не существует",
     "Configuration incorrect" : "Конфигурация некорректна",
     "Configuration incomplete" : "Конфигурация не завершена",
     "Configuration OK" : "Конфигурация в порядке",
     "Select groups" : "Выберите группы",
     "Select object classes" : "Выберите объектные классы",
+    "Please check the credentials, they seem to be wrong." : "Пожалуйста проверьте учетный данные, возможно они не верны.",
+    "Please specify the port, it could not be auto-detected." : "Пожалуйста укажите порт, он не может быть определен автоматически.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "База поиска не может быть определена автоматически, пожалуйста перепроверьте учетные данные, адрес и порт.",
     "{nthServer}. Server" : "Сервер {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "Вы действительно хотите удалить существующую конфигурацию сервера?",
     "Confirm Deletion" : "Подтверждение удаления",
diff --git a/apps/user_ldap/l10n/sr.js b/apps/user_ldap/l10n/sr.js
index 0312baf6b75..889623841ba 100644
--- a/apps/user_ldap/l10n/sr.js
+++ b/apps/user_ldap/l10n/sr.js
@@ -30,9 +30,18 @@ OC.L10N.register(
     "Mappings cleared successfully!" : "Мапирања успешно очишћена!",
     "Error while clearing the mappings." : "Грешка при чишћењу мапирања.",
     "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Упис није успео. Проверите да је база у функцији. Поново учитајте пре настављања.",
+    "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?" : "Пребацивање режима укључиће аутоматске ЛДАП упите. Зависно од ЛДАП величине то може потрајати. Заиста желите да промените режим?",
     "Mode switch" : "Промена режима",
     "Select attributes" : "Изаберите атрибуте",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Корисник није нађен. Проверите пријавне атрибуте и корисничко име. Важећи филтер (за копирај-налепи за оверу командне линије): <br/>",
     "User found and settings verified." : "Корисник нађен и поставке проверене.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Поставке проверене али један корисник је нађен. Само први ће успети да се пријави. Размотрите проширење филтрирања.",
+    "An unspecified error occurred. Please check the settings and the log." : "Десила се неодређана грешка. Проверите поставке и записник.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Филтер претраге је неисправан, вероватно због синтаксе попут неједнаког броја отворених и затворених заграда. Проверите.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Дошло је до грешке ЛДАП / АД везе. Проверите домаћина, порт и акредитиве.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "Недостаје %uid местодржач. Биће замењен са пријавним именом при ЛДАП / АД упиту.",
+    "Please provide a login name to test against" : "Наведите пријавно име за тест са",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Поље групе је искључено јер ЛДАП / АД сервер не подржава припадност групи.",
     "_%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",
@@ -45,11 +54,21 @@ OC.L10N.register(
     "Test Configuration" : "Тестирај конфигурацију",
     "Help" : "Помоћ",
     "Groups meeting these criteria are available in %s:" : "Групе које испуњавају ове критеријуме су доступне у %s:",
+    "Only these object classes:" : "Само ове класе објеката:",
+    "Only from these groups:" : "Само из ових група:",
     "Search groups" : "Претражи групе",
     "Available groups" : "Доступне групе",
     "Selected groups" : "Изабране групе",
+    "Edit LDAP Query" : "Уреди ЛДАП упит",
+    "LDAP Filter:" : "ЛДАП филтер:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтер прецизира које ће LDAP групе требају имати приступ %s случају.",
     "Test Filter" : "Тестни филтер",
+    "Verify settings and count groups" : "Провери поставке и преброј групе",
+    "When logging in, %s will find the user based on the following attributes:" : "При пријављивању, %s ће пронаћи корисника на основу следећих атрибута:",
+    "LDAP / AD Username:" : "ЛДАП / АД корисничко име:",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Дозволи пријаву уз ЛДАП / АД корисичко име које је или uid или samaccountname и биће откривено.",
+    "LDAP / AD Email Address:" : "ЛДАП / АД е-адреса:",
+    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Дозволи пријаву уз атрибут е-поште. Mail и mailPrimaryAddress биће дозвољени.",
     "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\"",
     "Test Loginname" : "Испробај име за пријаву",
@@ -66,10 +85,14 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "За анониман приступ, оставите поља DN и лозинка празним.",
     "One Base DN per line" : "Једна Base DN по линији",
     "You can specify Base DN for users and groups in the Advanced tab" : "Можете навести Base DN за кориснике и групе у картици Напредно",
+    "Detect Base DN" : "Откриј базни ДН",
+    "Test Base DN" : "Тестирај базни ДН",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избегава аутоматске LDAP захтеве. Боље за веће поставке, али тражи мало више познавања LDAP-а.",
     "Manually enter LDAP filters (recommended for large directories)" : "Унесите ручно LDAP филтере (препоручено за велике директоријуме)",
     "Limit %s access to users meeting these criteria:" : "Ограничи %s приступа за кориснике који испуњавају ове критеријуме:",
+    "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Најчешће класе објеката за кориснике су organizationalPerson, person, user и inetOrgPerson. Ако нисте сигурни шта да изаберете, питајте администратора именика.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Филтер одређује који ЛДАП корисници ће имати приступ на %s.",
+    "Verify settings and count users" : "Провери поставке и преброј кориснике",
     "Saving" : "Чувам",
     "Back" : "Назад",
     "Continue" : "Настави",
diff --git a/apps/user_ldap/l10n/sr.json b/apps/user_ldap/l10n/sr.json
index 97aa229839e..8ef9e6d05ca 100644
--- a/apps/user_ldap/l10n/sr.json
+++ b/apps/user_ldap/l10n/sr.json
@@ -28,9 +28,18 @@
     "Mappings cleared successfully!" : "Мапирања успешно очишћена!",
     "Error while clearing the mappings." : "Грешка при чишћењу мапирања.",
     "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Упис није успео. Проверите да је база у функцији. Поново учитајте пре настављања.",
+    "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?" : "Пребацивање режима укључиће аутоматске ЛДАП упите. Зависно од ЛДАП величине то може потрајати. Заиста желите да промените режим?",
     "Mode switch" : "Промена режима",
     "Select attributes" : "Изаберите атрибуте",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Корисник није нађен. Проверите пријавне атрибуте и корисничко име. Важећи филтер (за копирај-налепи за оверу командне линије): <br/>",
     "User found and settings verified." : "Корисник нађен и поставке проверене.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Поставке проверене али један корисник је нађен. Само први ће успети да се пријави. Размотрите проширење филтрирања.",
+    "An unspecified error occurred. Please check the settings and the log." : "Десила се неодређана грешка. Проверите поставке и записник.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Филтер претраге је неисправан, вероватно због синтаксе попут неједнаког броја отворених и затворених заграда. Проверите.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Дошло је до грешке ЛДАП / АД везе. Проверите домаћина, порт и акредитиве.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "Недостаје %uid местодржач. Биће замењен са пријавним именом при ЛДАП / АД упиту.",
+    "Please provide a login name to test against" : "Наведите пријавно име за тест са",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Поље групе је искључено јер ЛДАП / АД сервер не подржава припадност групи.",
     "_%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",
@@ -43,11 +52,21 @@
     "Test Configuration" : "Тестирај конфигурацију",
     "Help" : "Помоћ",
     "Groups meeting these criteria are available in %s:" : "Групе које испуњавају ове критеријуме су доступне у %s:",
+    "Only these object classes:" : "Само ове класе објеката:",
+    "Only from these groups:" : "Само из ових група:",
     "Search groups" : "Претражи групе",
     "Available groups" : "Доступне групе",
     "Selected groups" : "Изабране групе",
+    "Edit LDAP Query" : "Уреди ЛДАП упит",
+    "LDAP Filter:" : "ЛДАП филтер:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтер прецизира које ће LDAP групе требају имати приступ %s случају.",
     "Test Filter" : "Тестни филтер",
+    "Verify settings and count groups" : "Провери поставке и преброј групе",
+    "When logging in, %s will find the user based on the following attributes:" : "При пријављивању, %s ће пронаћи корисника на основу следећих атрибута:",
+    "LDAP / AD Username:" : "ЛДАП / АД корисничко име:",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Дозволи пријаву уз ЛДАП / АД корисичко име које је или uid или samaccountname и биће откривено.",
+    "LDAP / AD Email Address:" : "ЛДАП / АД е-адреса:",
+    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Дозволи пријаву уз атрибут е-поште. Mail и mailPrimaryAddress биће дозвољени.",
     "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\"",
     "Test Loginname" : "Испробај име за пријаву",
@@ -64,10 +83,14 @@
     "For anonymous access, leave DN and Password empty." : "За анониман приступ, оставите поља DN и лозинка празним.",
     "One Base DN per line" : "Једна Base DN по линији",
     "You can specify Base DN for users and groups in the Advanced tab" : "Можете навести Base DN за кориснике и групе у картици Напредно",
+    "Detect Base DN" : "Откриј базни ДН",
+    "Test Base DN" : "Тестирај базни ДН",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избегава аутоматске LDAP захтеве. Боље за веће поставке, али тражи мало више познавања LDAP-а.",
     "Manually enter LDAP filters (recommended for large directories)" : "Унесите ручно LDAP филтере (препоручено за велике директоријуме)",
     "Limit %s access to users meeting these criteria:" : "Ограничи %s приступа за кориснике који испуњавају ове критеријуме:",
+    "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Најчешће класе објеката за кориснике су organizationalPerson, person, user и inetOrgPerson. Ако нисте сигурни шта да изаберете, питајте администратора именика.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Филтер одређује који ЛДАП корисници ће имати приступ на %s.",
+    "Verify settings and count users" : "Провери поставке и преброј кориснике",
     "Saving" : "Чувам",
     "Back" : "Назад",
     "Continue" : "Настави",
diff --git a/apps/user_webdavauth/l10n/ro.js b/apps/user_webdavauth/l10n/ro.js
index 4bc803850dc..46637452e5f 100644
--- a/apps/user_webdavauth/l10n/ro.js
+++ b/apps/user_webdavauth/l10n/ro.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "user_webdavauth",
     {
     "WebDAV Authentication" : "Autentificare WebDAV",
+    "Address:" : "Adresa:",
     "Save" : "Salvează"
 },
 "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/apps/user_webdavauth/l10n/ro.json b/apps/user_webdavauth/l10n/ro.json
index 74666c22a5e..c3b2bcdc970 100644
--- a/apps/user_webdavauth/l10n/ro.json
+++ b/apps/user_webdavauth/l10n/ro.json
@@ -1,5 +1,6 @@
 { "translations": {
     "WebDAV Authentication" : "Autentificare WebDAV",
+    "Address:" : "Adresa:",
     "Save" : "Salvează"
 },"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/core/l10n/de.js b/core/l10n/de.js
index c059adec55b..e3813f094a5 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=\"{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>.",
+    "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 PHP Memory Cache konfiguriert. Konfiguriere zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. 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.",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 8606afe94ef..469d72b1df3 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=\"{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>.",
+    "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 PHP Memory Cache konfiguriert. Konfiguriere zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. 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.",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index dd978e0291f..af00fd203c8 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=\"{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>.",
+    "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 PHP Memory Cache konfiguriert. Konfiguriere zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. 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.",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 94a2892fbea..79b71510c6f 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=\"{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>.",
+    "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 PHP Memory Cache konfiguriert. Konfiguriere zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. 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.",
diff --git a/core/l10n/ro.js b/core/l10n/ro.js
index dbf3fd9e20c..a9e34f6b43c 100644
--- a/core/l10n/ro.js
+++ b/core/l10n/ro.js
@@ -6,6 +6,10 @@ OC.L10N.register(
     "Turned off maintenance mode" : "Modul mentenanță a fost dezactivat",
     "Updated database" : "Bază de date actualizată",
     "Updated \"%s\" to %s" : "\"%s\" a fost actualizat până la %s",
+    "Repair warning: " : "Alerte reparare:",
+    "Repair error: " : "Eroare de reparare:",
+    "Following incompatible apps have been disabled: %s" : "Următoarele aplicații incompatibile au fost dezactivate: %s",
+    "Following 3rd party apps have been disabled: %s" : "Următoarele aplicații externe au fost dezactivate: %s",
     "No image or file provided" : "Nu a fost furnizat vreo imagine sau fișier",
     "Unknown filetype" : "Tip fișier necunoscut",
     "Invalid image" : "Imagine invalidă",
diff --git a/core/l10n/ro.json b/core/l10n/ro.json
index 58c3168fe2b..0cdef73f4e5 100644
--- a/core/l10n/ro.json
+++ b/core/l10n/ro.json
@@ -4,6 +4,10 @@
     "Turned off maintenance mode" : "Modul mentenanță a fost dezactivat",
     "Updated database" : "Bază de date actualizată",
     "Updated \"%s\" to %s" : "\"%s\" a fost actualizat până la %s",
+    "Repair warning: " : "Alerte reparare:",
+    "Repair error: " : "Eroare de reparare:",
+    "Following incompatible apps have been disabled: %s" : "Următoarele aplicații incompatibile au fost dezactivate: %s",
+    "Following 3rd party apps have been disabled: %s" : "Următoarele aplicații externe au fost dezactivate: %s",
     "No image or file provided" : "Nu a fost furnizat vreo imagine sau fișier",
     "Unknown filetype" : "Tip fișier necunoscut",
     "Invalid image" : "Imagine invalidă",
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index 0b3a55b9eaf..71916e38afe 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -101,6 +101,7 @@ OC.L10N.register(
     "Set expiration date" : "Установить срок действия",
     "Expiration" : "Срок действия",
     "Expiration date" : "Дата окончания",
+    "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз",
     "Adding user..." : "Добавляем пользователя...",
     "group" : "группа",
     "remote" : "удаленный",
@@ -208,6 +209,8 @@ OC.L10N.register(
     "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/ru.json b/core/l10n/ru.json
index 817cd16da34..ab800f8489e 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -99,6 +99,7 @@
     "Set expiration date" : "Установить срок действия",
     "Expiration" : "Срок действия",
     "Expiration date" : "Дата окончания",
+    "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз",
     "Adding user..." : "Добавляем пользователя...",
     "group" : "группа",
     "remote" : "удаленный",
@@ -206,6 +207,8 @@
     "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/uk.js b/core/l10n/uk.js
index 88624bdbd35..3b4da47bfff 100644
--- a/core/l10n/uk.js
+++ b/core/l10n/uk.js
@@ -96,6 +96,7 @@ OC.L10N.register(
     "Set expiration date" : "Встановити термін дії",
     "Expiration" : "Закінчення",
     "Expiration date" : "Термін дії",
+    "An error occured. Please try again" : "Виникла помилка. Будь ласка, спробуйте ще раз",
     "Adding user..." : "Додавання користувача...",
     "group" : "група",
     "remote" : "Віддалений",
@@ -193,12 +194,16 @@ OC.L10N.register(
     "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} Увімкніть JavaScript {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/uk.json b/core/l10n/uk.json
index 35e85f441de..77841d7c4db 100644
--- a/core/l10n/uk.json
+++ b/core/l10n/uk.json
@@ -94,6 +94,7 @@
     "Set expiration date" : "Встановити термін дії",
     "Expiration" : "Закінчення",
     "Expiration date" : "Термін дії",
+    "An error occured. Please try again" : "Виникла помилка. Будь ласка, спробуйте ще раз",
     "Adding user..." : "Додавання користувача...",
     "group" : "група",
     "remote" : "Віддалений",
@@ -191,12 +192,16 @@
     "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} Увімкніть JavaScript {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/lib/l10n/it.js b/lib/l10n/it.js
index 7075997b18b..d60b0a4622c 100644
--- a/lib/l10n/it.js
+++ b/lib/l10n/it.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Set an admin password." : "Imposta una password di amministrazione.",
     "Can't create or write into the data directory %s" : "Impossibile creare o scrivere nella cartella dei dati %s",
     "%s shared »%s« with you" : "%s ha condiviso «%s» con te",
+    "%s via %s" : "%s tramite %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Condivisione di %s non riuscita, poiché il motore non consente condivisioni del tipo %i",
     "Sharing %s failed, because the file does not exist" : "Condivisione di %s non riuscita, poiché il file non esiste",
     "You are not allowed to share %s" : "Non ti è consentito condividere %s",
diff --git a/lib/l10n/it.json b/lib/l10n/it.json
index 4124a5bf3c8..83065091c8b 100644
--- a/lib/l10n/it.json
+++ b/lib/l10n/it.json
@@ -82,6 +82,7 @@
     "Set an admin password." : "Imposta una password di amministrazione.",
     "Can't create or write into the data directory %s" : "Impossibile creare o scrivere nella cartella dei dati %s",
     "%s shared »%s« with you" : "%s ha condiviso «%s» con te",
+    "%s via %s" : "%s tramite %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Condivisione di %s non riuscita, poiché il motore non consente condivisioni del tipo %i",
     "Sharing %s failed, because the file does not exist" : "Condivisione di %s non riuscita, poiché il file non esiste",
     "You are not allowed to share %s" : "Non ti è consentito condividere %s",
diff --git a/lib/l10n/ro.js b/lib/l10n/ro.js
index db35a95e88d..7b417ab5628 100644
--- a/lib/l10n/ro.js
+++ b/lib/l10n/ro.js
@@ -2,8 +2,13 @@ OC.L10N.register(
     "lib",
     {
     "Cannot write into \"config\" directory!" : "Nu se poate scrie în folderul \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Aceasta se poate repara de obicei prin permiterea accesului de scriere la dosarul de configurarea a webserverului",
     "See %s" : "Vezi %s",
     "PHP %s or higher is required." : "Versiunea PHP %s sau mai mare este necesară.",
+    "PHP with a version lower than %s is required." : "Este necesară o versiune PHP mai mică decât %s",
+    "Following platforms are supported: %s" : "Sunt suportate următoarele platforme: %s",
+    "ownCloud %s or higher is required." : "ownCloud %s sau mai mare este necesar.",
+    "ownCloud with a version lower than %s is required." : "ownCloud cu o versiune mai mică decât %s este necesară.",
     "Help" : "Ajutor",
     "Personal" : "Personal",
     "Users" : "Utilizatori",
@@ -17,8 +22,11 @@ OC.L10N.register(
     "last month" : "ultima lună",
     "_%n month ago_::_%n months ago_" : ["%n lună în urmă","%n luni în urmă","%n luni în urmă"],
     "last year" : "ultimul an",
+    "_%n year ago_::_%n years ago_" : ["%n an în urmă","%n ani în urmâ","%n ani în urmâ"],
     "seconds ago" : "secunde în urmă",
     "web services under your control" : "servicii web controlate de tine",
+    "Empty filename is not allowed" : "Nu este permis fișier fără nume",
+    "File name is too long" : "Numele fișierului este prea lung",
     "Application is not enabled" : "Aplicația nu este activată",
     "Authentication error" : "Eroare la autentificare",
     "Token expired. Please reload page." : "Token expirat. Te rugăm să reîncarci pagina.",
diff --git a/lib/l10n/ro.json b/lib/l10n/ro.json
index b610fd6ed68..47ea0d5fbbd 100644
--- a/lib/l10n/ro.json
+++ b/lib/l10n/ro.json
@@ -1,7 +1,12 @@
 { "translations": {
     "Cannot write into \"config\" directory!" : "Nu se poate scrie în folderul \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Aceasta se poate repara de obicei prin permiterea accesului de scriere la dosarul de configurarea a webserverului",
     "See %s" : "Vezi %s",
     "PHP %s or higher is required." : "Versiunea PHP %s sau mai mare este necesară.",
+    "PHP with a version lower than %s is required." : "Este necesară o versiune PHP mai mică decât %s",
+    "Following platforms are supported: %s" : "Sunt suportate următoarele platforme: %s",
+    "ownCloud %s or higher is required." : "ownCloud %s sau mai mare este necesar.",
+    "ownCloud with a version lower than %s is required." : "ownCloud cu o versiune mai mică decât %s este necesară.",
     "Help" : "Ajutor",
     "Personal" : "Personal",
     "Users" : "Utilizatori",
@@ -15,8 +20,11 @@
     "last month" : "ultima lună",
     "_%n month ago_::_%n months ago_" : ["%n lună în urmă","%n luni în urmă","%n luni în urmă"],
     "last year" : "ultimul an",
+    "_%n year ago_::_%n years ago_" : ["%n an în urmă","%n ani în urmâ","%n ani în urmâ"],
     "seconds ago" : "secunde în urmă",
     "web services under your control" : "servicii web controlate de tine",
+    "Empty filename is not allowed" : "Nu este permis fișier fără nume",
+    "File name is too long" : "Numele fișierului este prea lung",
     "Application is not enabled" : "Aplicația nu este activată",
     "Authentication error" : "Eroare la autentificare",
     "Token expired. Please reload page." : "Token expirat. Te rugăm să reîncarci pagina.",
diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js
index fa026c27741..9d6ed3b301c 100644
--- a/lib/l10n/ru.js
+++ b/lib/l10n/ru.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Set an admin password." : "Задать пароль для admin.",
     "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",
diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json
index 9b63890c826..c3e1dbae4de 100644
--- a/lib/l10n/ru.json
+++ b/lib/l10n/ru.json
@@ -82,6 +82,7 @@
     "Set an admin password." : "Задать пароль для admin.",
     "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",
diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js
index ce47b7538a5..c2a237f894d 100644
--- a/lib/l10n/uk.js
+++ b/lib/l10n/uk.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,7 @@ 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 не підтримується",
     "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 або відключивши сховище програм у файлі конфігурації.",
diff --git a/lib/l10n/uk.json b/lib/l10n/uk.json
index d4c371e0ea6..9e7161c838a 100644
--- a/lib/l10n/uk.json
+++ b/lib/l10n/uk.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,7 @@
     "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 не підтримується",
     "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 або відключивши сховище програм у файлі конфігурації.",
diff --git a/settings/l10n/ar.js b/settings/l10n/ar.js
index edf299d7d44..ca7f9e32a7f 100644
--- a/settings/l10n/ar.js
+++ b/settings/l10n/ar.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Sharing" : "مشاركة",
     "Cron" : "مجدول",
-    "Email Server" : "خادم البريد الالكتروني",
     "Log" : "سجل",
     "Authentication error" : "لم يتم التأكد من الشخصية بنجاح",
     "Your full name has been changed." : "اسمك الكامل تم تغييره.",
diff --git a/settings/l10n/ar.json b/settings/l10n/ar.json
index 32b279576d7..0376c432aa1 100644
--- a/settings/l10n/ar.json
+++ b/settings/l10n/ar.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Sharing" : "مشاركة",
     "Cron" : "مجدول",
-    "Email Server" : "خادم البريد الالكتروني",
     "Log" : "سجل",
     "Authentication error" : "لم يتم التأكد من الشخصية بنجاح",
     "Your full name has been changed." : "اسمك الكامل تم تغييره.",
diff --git a/settings/l10n/ast.js b/settings/l10n/ast.js
index 03a3fc57aa4..228e0fd2ffd 100644
--- a/settings/l10n/ast.js
+++ b/settings/l10n/ast.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Compartiendo",
     "External Storage" : "Almacenamientu esternu",
     "Cron" : "Cron",
-    "Email Server" : "Sirvidor de corréu-e",
     "Log" : "Rexistru",
     "Updates" : "Anovamientos",
     "Authentication error" : "Fallu d'autenticación",
diff --git a/settings/l10n/ast.json b/settings/l10n/ast.json
index a3bb4a9ea20..1636a558d82 100644
--- a/settings/l10n/ast.json
+++ b/settings/l10n/ast.json
@@ -2,7 +2,6 @@
     "Sharing" : "Compartiendo",
     "External Storage" : "Almacenamientu esternu",
     "Cron" : "Cron",
-    "Email Server" : "Sirvidor de corréu-e",
     "Log" : "Rexistru",
     "Updates" : "Anovamientos",
     "Authentication error" : "Fallu d'autenticación",
diff --git a/settings/l10n/az.js b/settings/l10n/az.js
index db1b897a848..a088666f52c 100644
--- a/settings/l10n/az.js
+++ b/settings/l10n/az.js
@@ -4,9 +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",
     "Updates" : "Yenilənmələr",
     "Authentication error" : "Təyinat metodikası",
diff --git a/settings/l10n/az.json b/settings/l10n/az.json
index bf741ed9f9b..0a3eb295f44 100644
--- a/settings/l10n/az.json
+++ b/settings/l10n/az.json
@@ -2,9 +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",
     "Updates" : "Yenilənmələr",
     "Authentication error" : "Təyinat metodikası",
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
index 93cb0f7bf0e..d1bdea2b333 100644
--- a/settings/l10n/bg_BG.js
+++ b/settings/l10n/bg_BG.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Предупреждения за сигурност и настройки",
     "Sharing" : "Споделяне",
     "External Storage" : "Външно Дисково Пространство",
-    "Server Side Encryption" : "Криптиране от страна на сървъра",
     "Cron" : "Крон",
-    "Email Server" : "Имейл Сървър",
     "Log" : "Лог",
     "Updates" : "Обновления",
     "Authentication error" : "Възникна проблем с идентификацията",
@@ -127,7 +125,6 @@ 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 минути.",
-    "Enable Server-Side-Encryption" : "Включи криптиране от страна на сървъра",
     "This is used for sending out notifications." : "Това се използва за изпращане на уведомления.",
     "Send mode" : "Режим на изпращане",
     "Encryption" : "Криптиране",
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
index ddea8771468..0fcbc78187b 100644
--- a/settings/l10n/bg_BG.json
+++ b/settings/l10n/bg_BG.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Предупреждения за сигурност и настройки",
     "Sharing" : "Споделяне",
     "External Storage" : "Външно Дисково Пространство",
-    "Server Side Encryption" : "Криптиране от страна на сървъра",
     "Cron" : "Крон",
-    "Email Server" : "Имейл Сървър",
     "Log" : "Лог",
     "Updates" : "Обновления",
     "Authentication error" : "Възникна проблем с идентификацията",
@@ -125,7 +123,6 @@
     "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 минути.",
-    "Enable Server-Side-Encryption" : "Включи криптиране от страна на сървъра",
     "This is used for sending out notifications." : "Това се използва за изпращане на уведомления.",
     "Send mode" : "Режим на изпращане",
     "Encryption" : "Криптиране",
diff --git a/settings/l10n/bn_BD.js b/settings/l10n/bn_BD.js
index a99381bf4f5..1de8c38432d 100644
--- a/settings/l10n/bn_BD.js
+++ b/settings/l10n/bn_BD.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Sharing" : "ভাগাভাগিরত",
     "External Storage" : "বাহ্যিক সংরক্ষণাগার",
-    "Email Server" : "ইমেইল সার্ভার",
     "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
     "Your full name has been changed." : "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
     "Couldn't remove app." : "অ্যাপ অপসারণ করা গেলনা",
diff --git a/settings/l10n/bn_BD.json b/settings/l10n/bn_BD.json
index 036a7cc4826..d71b26b853f 100644
--- a/settings/l10n/bn_BD.json
+++ b/settings/l10n/bn_BD.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Sharing" : "ভাগাভাগিরত",
     "External Storage" : "বাহ্যিক সংরক্ষণাগার",
-    "Email Server" : "ইমেইল সার্ভার",
     "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
     "Your full name has been changed." : "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
     "Couldn't remove app." : "অ্যাপ অপসারণ করা গেলনা",
diff --git a/settings/l10n/bs.js b/settings/l10n/bs.js
index 56715ba1902..293aff2cf3a 100644
--- a/settings/l10n/bs.js
+++ b/settings/l10n/bs.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Sharing" : "Dijeljenje",
     "Cron" : "Cron",
-    "Email Server" : "Server e-pošte",
     "Log" : "Zapisnik",
     "Updates" : "Ažuriranja",
     "Authentication error" : "Grešna autentifikacije",
diff --git a/settings/l10n/bs.json b/settings/l10n/bs.json
index 9af8f64c061..272158b9e46 100644
--- a/settings/l10n/bs.json
+++ b/settings/l10n/bs.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Sharing" : "Dijeljenje",
     "Cron" : "Cron",
-    "Email Server" : "Server e-pošte",
     "Log" : "Zapisnik",
     "Updates" : "Ažuriranja",
     "Authentication error" : "Grešna autentifikacije",
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
index 81f5a26297e..175b2572c2f 100644
--- a/settings/l10n/ca.js
+++ b/settings/l10n/ca.js
@@ -4,9 +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",
     "Tips & tricks" : "Consells i trucs",
     "Updates" : "Actualitzacions",
@@ -131,7 +129,6 @@ 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.",
-    "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",
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
index 3be9e2fc010..32c0b588b1a 100644
--- a/settings/l10n/ca.json
+++ b/settings/l10n/ca.json
@@ -2,9 +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",
     "Tips & tricks" : "Consells i trucs",
     "Updates" : "Actualitzacions",
@@ -129,7 +127,6 @@
     "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.",
-    "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",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 400f7df6248..e18898a072a 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -4,9 +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",
     "Tips & tricks" : "Tipy a triky",
     "Updates" : "Aktualizace",
@@ -133,7 +131,6 @@ OC.L10N.register(
     "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.",
-    "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í",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index e253f080157..fd24779b135 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -2,9 +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",
     "Tips & tricks" : "Tipy a triky",
     "Updates" : "Aktualizace",
@@ -131,7 +129,6 @@
     "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.",
-    "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í",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index e83069de909..5ddd3f728cb 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -4,9 +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",
     "Tips & tricks" : "Tips & tricks",
     "Updates" : "Opdateringer",
@@ -135,7 +133,6 @@ OC.L10N.register(
     "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",
-    "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",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 62642160765..65aed57dea0 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -2,9 +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",
     "Tips & tricks" : "Tips & tricks",
     "Updates" : "Opdateringer",
@@ -133,7 +131,6 @@
     "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",
-    "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",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 5d2c4b83787..08cea0056da 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -4,9 +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",
     "Tips & tricks" : "Tipps & Tricks",
     "Updates" : "Updates",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Passwort konnte nicht geändert werden",
     "Enabled" : "Aktiviert",
     "Not enabled" : "Nicht aktiviert",
+    "A problem occurred, please check your log files (Error: %s)" : "Ein Problem ist aufgetreten, bitte prüfen sie ihre Log Dateien (Fehler: %s)",
+    "Migration Completed" : "Migration komplett",
     "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.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "E-Mail-Adresse gespeichert",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Bist Du wirklich sicher, dass Du „{domain}“ als vertrauenswürdige Domain hinzufügen möchtest?",
     "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Migration in progress. Please wait until the migration is finished" : "Migration in Arbeit. Bitte warten Sie bis die Migration beendet ist",
+    "Migration started …" : "Migration gestartet ...",
     "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.",
@@ -135,7 +137,7 @@ OC.L10N.register(
     "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.",
-    "Enable Server-Side-Encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "Start migration" : "Starte die Migration",
     "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
     "Encryption" : "Verschlüsselung",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 2f338f5ab48..7b4008d3415 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -2,9 +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",
     "Tips & tricks" : "Tipps & Tricks",
     "Updates" : "Updates",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Passwort konnte nicht geändert werden",
     "Enabled" : "Aktiviert",
     "Not enabled" : "Nicht aktiviert",
+    "A problem occurred, please check your log files (Error: %s)" : "Ein Problem ist aufgetreten, bitte prüfen sie ihre Log Dateien (Fehler: %s)",
+    "Migration Completed" : "Migration komplett",
     "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.",
@@ -46,6 +46,8 @@
     "Email saved" : "E-Mail-Adresse gespeichert",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Bist Du wirklich sicher, dass Du „{domain}“ als vertrauenswürdige Domain hinzufügen möchtest?",
     "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Migration in progress. Please wait until the migration is finished" : "Migration in Arbeit. Bitte warten Sie bis die Migration beendet ist",
+    "Migration started …" : "Migration gestartet ...",
     "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.",
@@ -133,7 +135,7 @@
     "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.",
-    "Enable Server-Side-Encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "Start migration" : "Starte die Migration",
     "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
     "Encryption" : "Verschlüsselung",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index afe28c9dae5..f5bea44f4fb 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -4,9 +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",
     "Tips & tricks" : "Tipps & Tricks",
     "Updates" : "Updates",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Passwort konnte nicht geändert werden",
     "Enabled" : "Aktiviert",
     "Not enabled" : "Nicht aktiviert",
+    "A problem occurred, please check your log files (Error: %s)" : "Ein Problem ist aufgetreten, bitte prüfen sie ihre Log Dateien (Fehler: %s)",
+    "Migration Completed" : "Migration komplett",
     "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.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "E-Mail-Adresse gespeichert",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sind Sie sich wirklich sicher, dass Sie »{domain}« als vertrauenswürdige Domain hinzufügen möchten?",
     "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Migration in progress. Please wait until the migration is finished" : "Migration in Arbeit. Bitte warten Sie bis die Migration beendet ist",
+    "Migration started …" : "Migration gestartet ...",
     "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.",
@@ -135,7 +137,7 @@ OC.L10N.register(
     "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.",
-    "Enable Server-Side-Encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "Start migration" : "Starte die Migration",
     "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
     "Encryption" : "Verschlüsselung",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index cd411726fb4..c8521b6817b 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -2,9 +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",
     "Tips & tricks" : "Tipps & Tricks",
     "Updates" : "Updates",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Passwort konnte nicht geändert werden",
     "Enabled" : "Aktiviert",
     "Not enabled" : "Nicht aktiviert",
+    "A problem occurred, please check your log files (Error: %s)" : "Ein Problem ist aufgetreten, bitte prüfen sie ihre Log Dateien (Fehler: %s)",
+    "Migration Completed" : "Migration komplett",
     "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.",
@@ -46,6 +46,8 @@
     "Email saved" : "E-Mail-Adresse gespeichert",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sind Sie sich wirklich sicher, dass Sie »{domain}« als vertrauenswürdige Domain hinzufügen möchten?",
     "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Migration in progress. Please wait until the migration is finished" : "Migration in Arbeit. Bitte warten Sie bis die Migration beendet ist",
+    "Migration started …" : "Migration gestartet ...",
     "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.",
@@ -133,7 +135,7 @@
     "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.",
-    "Enable Server-Side-Encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "Start migration" : "Starte die Migration",
     "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
     "Encryption" : "Verschlüsselung",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 3e17e634e3b..75871aecf3f 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Προειδοποιήσεις ασφάλειας & ρυθμίσεων",
     "Sharing" : "Διαμοιρασμός",
     "External Storage" : "Εξωτερικό Αποθηκευτικό Μέσο",
-    "Server Side Encryption" : "Κρυπτογράφηση από τον Διακομιστή",
     "Cron" : "Cron",
-    "Email Server" : "Διακομιστής Email",
     "Log" : "Καταγραφές",
     "Tips & tricks" : "Συμβουλές & τεχνάσματα",
     "Updates" : "Ενημερώσεις",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Αδυναμία αλλαγής συνθηματικού",
     "Enabled" : "Ενεργοποιημένο",
     "Not enabled" : "Μη ενεργοποιημένο",
+    "A problem occurred, please check your log files (Error: %s)" : "Παρουσιάστηκε πρόβλημα, παρακαλώ ελέγξτε τα αρχεία καταγραφής σας (Σφάλμα: %s)",
+    "Migration Completed" : "Η μετάβαση ολοκληρώθηκε",
     "Group already exists." : "Η ομάδα υπάρχει ήδη.",
     "Unable to add group." : "Αδυναμία προσθήκης ομάδας.",
     "Unable to delete group." : "Αδυναμία διαγραφής ομάδας.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "Το email αποθηκεύτηκε ",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Είστε πραγματικά σίγουροι ότι θέλετε να προσθέσετε το \"{domain}\" σαν αξιόπιστη περιοχή;",
     "Add trusted domain" : "Προσθέστε αξιόπιστη περιοχή",
+    "Migration in progress. Please wait until the migration is finished" : "Μετάβαση σε εξέλιξη. Παρακαλούμε περιμένετε μέχρι να ολοκληρωθεί η μετάβαση",
+    "Migration started …" : "Η μετάβαση ξεκίνησε ...",
     "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 και είναι έτοιμες για χρήση.",
@@ -135,7 +137,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 λεπτά μέσω http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
-    "Enable Server-Side-Encryption" : "Ενεργοποίηση Κρυπτογράφησης από το Διακομηστή",
+    "Start migration" : "Έναρξη μετάβασης",
     "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
     "Send mode" : "Κατάσταση αποστολής",
     "Encryption" : "Κρυπτογράφηση",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 988d9277e75..368a7d292b6 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Προειδοποιήσεις ασφάλειας & ρυθμίσεων",
     "Sharing" : "Διαμοιρασμός",
     "External Storage" : "Εξωτερικό Αποθηκευτικό Μέσο",
-    "Server Side Encryption" : "Κρυπτογράφηση από τον Διακομιστή",
     "Cron" : "Cron",
-    "Email Server" : "Διακομιστής Email",
     "Log" : "Καταγραφές",
     "Tips & tricks" : "Συμβουλές & τεχνάσματα",
     "Updates" : "Ενημερώσεις",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Αδυναμία αλλαγής συνθηματικού",
     "Enabled" : "Ενεργοποιημένο",
     "Not enabled" : "Μη ενεργοποιημένο",
+    "A problem occurred, please check your log files (Error: %s)" : "Παρουσιάστηκε πρόβλημα, παρακαλώ ελέγξτε τα αρχεία καταγραφής σας (Σφάλμα: %s)",
+    "Migration Completed" : "Η μετάβαση ολοκληρώθηκε",
     "Group already exists." : "Η ομάδα υπάρχει ήδη.",
     "Unable to add group." : "Αδυναμία προσθήκης ομάδας.",
     "Unable to delete group." : "Αδυναμία διαγραφής ομάδας.",
@@ -46,6 +46,8 @@
     "Email saved" : "Το email αποθηκεύτηκε ",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Είστε πραγματικά σίγουροι ότι θέλετε να προσθέσετε το \"{domain}\" σαν αξιόπιστη περιοχή;",
     "Add trusted domain" : "Προσθέστε αξιόπιστη περιοχή",
+    "Migration in progress. Please wait until the migration is finished" : "Μετάβαση σε εξέλιξη. Παρακαλούμε περιμένετε μέχρι να ολοκληρωθεί η μετάβαση",
+    "Migration started …" : "Η μετάβαση ξεκίνησε ...",
     "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 και είναι έτοιμες για χρήση.",
@@ -133,7 +135,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 λεπτά μέσω http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
-    "Enable Server-Side-Encryption" : "Ενεργοποίηση Κρυπτογράφησης από το Διακομηστή",
+    "Start migration" : "Έναρξη μετάβασης",
     "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
     "Send mode" : "Κατάσταση αποστολής",
     "Encryption" : "Κρυπτογράφηση",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 275e545fbd7..51a134063ca 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Sharing",
     "External Storage" : "External Storage",
     "Cron" : "Cron",
-    "Email Server" : "Email Server",
     "Log" : "Log",
     "Updates" : "Updates",
     "Authentication error" : "Authentication error",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index f14203d6aff..0de8369e68e 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -2,7 +2,6 @@
     "Sharing" : "Sharing",
     "External Storage" : "External Storage",
     "Cron" : "Cron",
-    "Email Server" : "Email Server",
     "Log" : "Log",
     "Updates" : "Updates",
     "Authentication error" : "Authentication error",
diff --git a/settings/l10n/eo.js b/settings/l10n/eo.js
index 040615e9d9c..84e3585b70f 100644
--- a/settings/l10n/eo.js
+++ b/settings/l10n/eo.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Kunhavigo",
     "External Storage" : "Malena memorilo",
     "Cron" : "Cron",
-    "Email Server" : "Retpoŝtoservilo",
     "Log" : "Protokolo",
     "Updates" : "Ĝisdatigoj",
     "Authentication error" : "Aŭtentiga eraro",
diff --git a/settings/l10n/eo.json b/settings/l10n/eo.json
index d77c0a38894..40522fc9519 100644
--- a/settings/l10n/eo.json
+++ b/settings/l10n/eo.json
@@ -2,7 +2,6 @@
     "Sharing" : "Kunhavigo",
     "External Storage" : "Malena memorilo",
     "Cron" : "Cron",
-    "Email Server" : "Retpoŝtoservilo",
     "Log" : "Protokolo",
     "Updates" : "Ĝisdatigoj",
     "Authentication error" : "Aŭtentiga eraro",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index f4495740922..dfbbcb0566e 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -4,9 +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",
     "Tips & tricks" : "Sugerencias y trucos",
     "Updates" : "Actualizaciones",
@@ -135,7 +133,6 @@ 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.",
-    "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",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 241e91c28f1..7cefb5d83c4 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -2,9 +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",
     "Tips & tricks" : "Sugerencias y trucos",
     "Updates" : "Actualizaciones",
@@ -133,7 +131,6 @@
     "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.",
-    "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",
diff --git a/settings/l10n/es_AR.js b/settings/l10n/es_AR.js
index fed0f97de08..abe15748f72 100644
--- a/settings/l10n/es_AR.js
+++ b/settings/l10n/es_AR.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Compartiendo",
     "External Storage" : "Almacenamiento externo",
     "Cron" : "Cron",
-    "Email Server" : "Servidor de correo electrónico",
     "Log" : "Log",
     "Updates" : "Actualizaciones",
     "Authentication error" : "Error al autenticar",
diff --git a/settings/l10n/es_AR.json b/settings/l10n/es_AR.json
index 24ae430aa1c..5e4f087c33b 100644
--- a/settings/l10n/es_AR.json
+++ b/settings/l10n/es_AR.json
@@ -2,7 +2,6 @@
     "Sharing" : "Compartiendo",
     "External Storage" : "Almacenamiento externo",
     "Cron" : "Cron",
-    "Email Server" : "Servidor de correo electrónico",
     "Log" : "Log",
     "Updates" : "Actualizaciones",
     "Authentication error" : "Error al autenticar",
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index 3d9e2a942bb..6e0677337dc 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Jagamine",
     "External Storage" : "Väline salvestuskoht",
     "Cron" : "Cron",
-    "Email Server" : "Postiserver",
     "Log" : "Logi",
     "Updates" : "Uuendused",
     "Authentication error" : "Autentimise viga",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index 9e3051441e8..0edc3d3b916 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -2,7 +2,6 @@
     "Sharing" : "Jagamine",
     "External Storage" : "Väline salvestuskoht",
     "Cron" : "Cron",
-    "Email Server" : "Postiserver",
     "Log" : "Logi",
     "Updates" : "Uuendused",
     "Authentication error" : "Autentimise viga",
diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js
index cb59604bf98..7f30c91fa52 100644
--- a/settings/l10n/eu.js
+++ b/settings/l10n/eu.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Partekatzea",
     "External Storage" : "Kanpoko biltegiratzea",
     "Cron" : "Cron",
-    "Email Server" : "Eposta zerbitzaria",
     "Log" : "Log",
     "Updates" : "Eguneraketak",
     "Authentication error" : "Autentifikazio errorea",
diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json
index f9b724e36f5..5c9ce4bdf34 100644
--- a/settings/l10n/eu.json
+++ b/settings/l10n/eu.json
@@ -2,7 +2,6 @@
     "Sharing" : "Partekatzea",
     "External Storage" : "Kanpoko biltegiratzea",
     "Cron" : "Cron",
-    "Email Server" : "Eposta zerbitzaria",
     "Log" : "Log",
     "Updates" : "Eguneraketak",
     "Authentication error" : "Autentifikazio errorea",
diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js
index 4201415d938..ddfa303ede4 100644
--- a/settings/l10n/fa.js
+++ b/settings/l10n/fa.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "اشتراک گذاری",
     "External Storage" : "حافظه خارجی",
     "Cron" : "زمانبند",
-    "Email Server" : "سرور ایمیل",
     "Log" : "کارنامه",
     "Updates" : "به روز رسانی ها",
     "Authentication error" : "خطا در اعتبار سنجی",
diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json
index 2deb4af7f16..0a84e5b5889 100644
--- a/settings/l10n/fa.json
+++ b/settings/l10n/fa.json
@@ -2,7 +2,6 @@
     "Sharing" : "اشتراک گذاری",
     "External Storage" : "حافظه خارجی",
     "Cron" : "زمانبند",
-    "Email Server" : "سرور ایمیل",
     "Log" : "کارنامه",
     "Updates" : "به روز رسانی ها",
     "Authentication error" : "خطا در اعتبار سنجی",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index add1f61c317..14097570157 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -4,9 +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",
     "Tips & tricks" : "Vinkit",
     "Updates" : "Päivitykset",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Salasanan vaihto ei onnistunut",
     "Enabled" : "Käytössä",
     "Not enabled" : "Ei käytössä",
+    "A problem occurred, please check your log files (Error: %s)" : "Tapahtui virhe, tarkista lokitiedostot (Virhe: %s)",
+    "Migration Completed" : "Migraatio valmistui",
     "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.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "Sähköposti tallennettu",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Haluatko varmasti liittää kohteen \"{domain}\" luotetuksi toimialueeksi?",
     "Add trusted domain" : "Lisää luotettu toimialue",
+    "Migration in progress. Please wait until the migration is finished" : "Migraatio on kesken. Odota kunnes migraatio valmistuu",
+    "Migration started …" : "Migraatio käynnistyi…",
     "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.",
@@ -129,7 +131,7 @@ OC.L10N.register(
     "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.",
-    "Enable Server-Side-Encryption" : "Käytä palvelinpään salausta",
+    "Start migration" : "Käynnistä migraatio",
     "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
     "Send mode" : "Lähetystila",
     "Encryption" : "Salaus",
@@ -161,6 +163,7 @@ OC.L10N.register(
     "Version" : "Versio",
     "More apps" : "Lisää sovelluksia",
     "Developer documentation" : "Kehittäjädokumentaatio",
+    "Experimental applications ahead" : "Kokeellisia sovelluksia edessä",
     "by" : " Kirjoittaja:",
     "licensed" : "lisensoitu",
     "Documentation:" : "Ohjeistus:",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index a5036d9e2ba..43f9244b343 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -2,9 +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",
     "Tips & tricks" : "Vinkit",
     "Updates" : "Päivitykset",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Salasanan vaihto ei onnistunut",
     "Enabled" : "Käytössä",
     "Not enabled" : "Ei käytössä",
+    "A problem occurred, please check your log files (Error: %s)" : "Tapahtui virhe, tarkista lokitiedostot (Virhe: %s)",
+    "Migration Completed" : "Migraatio valmistui",
     "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.",
@@ -46,6 +46,8 @@
     "Email saved" : "Sähköposti tallennettu",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Haluatko varmasti liittää kohteen \"{domain}\" luotetuksi toimialueeksi?",
     "Add trusted domain" : "Lisää luotettu toimialue",
+    "Migration in progress. Please wait until the migration is finished" : "Migraatio on kesken. Odota kunnes migraatio valmistuu",
+    "Migration started …" : "Migraatio käynnistyi…",
     "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.",
@@ -127,7 +129,7 @@
     "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.",
-    "Enable Server-Side-Encryption" : "Käytä palvelinpään salausta",
+    "Start migration" : "Käynnistä migraatio",
     "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
     "Send mode" : "Lähetystila",
     "Encryption" : "Salaus",
@@ -159,6 +161,7 @@
     "Version" : "Versio",
     "More apps" : "Lisää sovelluksia",
     "Developer documentation" : "Kehittäjädokumentaatio",
+    "Experimental applications ahead" : "Kokeellisia sovelluksia edessä",
     "by" : " Kirjoittaja:",
     "licensed" : "lisensoitu",
     "Documentation:" : "Ohjeistus:",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 37979eb0cdd..3be50ae0ee2 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -4,9 +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",
     "Tips & tricks" : "Trucs et astuces",
     "Updates" : "Mises à jour",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Impossible de modifier le mot de passe",
     "Enabled" : "Activées",
     "Not enabled" : "Désactivées",
+    "A problem occurred, please check your log files (Error: %s)" : "Une erreur est survenue, veuillez vérifier vos fichiers de log (Erreur: %s)",
+    "Migration Completed" : "Migration terminée",
     "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.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "Email sauvegardé",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
     "Add trusted domain" : "Ajouter un domaine de confiance",
+    "Migration in progress. Please wait until the migration is finished" : "Migration en cours. Veuillez attendre que celle-ci se termine",
+    "Migration started …" : "Migration démarrée...",
     "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. ",
@@ -135,7 +137,7 @@ 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.",
-    "Enable Server-Side-Encryption" : "Activer le chiffrement côté serveur",
+    "Start migration" : "Démarrer la migration",
     "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
     "Send mode" : "Mode d'envoi",
     "Encryption" : "Chiffrement",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index ab75cecc533..eac4dabeb00 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -2,9 +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",
     "Tips & tricks" : "Trucs et astuces",
     "Updates" : "Mises à jour",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Impossible de modifier le mot de passe",
     "Enabled" : "Activées",
     "Not enabled" : "Désactivées",
+    "A problem occurred, please check your log files (Error: %s)" : "Une erreur est survenue, veuillez vérifier vos fichiers de log (Erreur: %s)",
+    "Migration Completed" : "Migration terminée",
     "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.",
@@ -46,6 +46,8 @@
     "Email saved" : "Email sauvegardé",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
     "Add trusted domain" : "Ajouter un domaine de confiance",
+    "Migration in progress. Please wait until the migration is finished" : "Migration en cours. Veuillez attendre que celle-ci se termine",
+    "Migration started …" : "Migration démarrée...",
     "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. ",
@@ -133,7 +135,7 @@
     "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.",
-    "Enable Server-Side-Encryption" : "Activer le chiffrement côté serveur",
+    "Start migration" : "Démarrer la migration",
     "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
     "Send mode" : "Mode d'envoi",
     "Encryption" : "Chiffrement",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index a5243375817..415d67822c2 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -4,9 +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",
     "Tips & tricks" : "Trucos e consellos",
     "Updates" : "Actualizacións",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Non é posíbel cambiar o contrasinal",
     "Enabled" : "Activado",
     "Not enabled" : "Non activado",
+    "A problem occurred, please check your log files (Error: %s)" : "Ocorreu un problema revise os ficheiros de rexistro (Erro: %s)",
+    "Migration Completed" : "Completouse a migración",
     "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.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "Correo gardado",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Confirma que quere engadir «{domain}» como dominio de confianza?",
     "Add trusted domain" : "Engadir dominio de confianza",
+    "Migration in progress. Please wait until the migration is finished" : "A migración está en proceso. Agarde a que remate.",
+    "Migration started …" : "Iniciada a migración ...",
     "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.",
@@ -135,7 +137,7 @@ OC.L10N.register(
     "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.",
-    "Enable Server-Side-Encryption" : "Activar o cifrado na parte do servidor",
+    "Start migration" : "Iniciar a migración",
     "This is used for sending out notifications." : "Isto utilizase para o envío de notificacións.",
     "Send mode" : "Modo de envío",
     "Encryption" : "Cifrado",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index c9f940e389e..b1f998a3152 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -2,9 +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",
     "Tips & tricks" : "Trucos e consellos",
     "Updates" : "Actualizacións",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Non é posíbel cambiar o contrasinal",
     "Enabled" : "Activado",
     "Not enabled" : "Non activado",
+    "A problem occurred, please check your log files (Error: %s)" : "Ocorreu un problema revise os ficheiros de rexistro (Erro: %s)",
+    "Migration Completed" : "Completouse a migración",
     "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.",
@@ -46,6 +46,8 @@
     "Email saved" : "Correo gardado",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Confirma que quere engadir «{domain}» como dominio de confianza?",
     "Add trusted domain" : "Engadir dominio de confianza",
+    "Migration in progress. Please wait until the migration is finished" : "A migración está en proceso. Agarde a que remate.",
+    "Migration started …" : "Iniciada a migración ...",
     "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.",
@@ -133,7 +135,7 @@
     "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.",
-    "Enable Server-Side-Encryption" : "Activar o cifrado na parte do servidor",
+    "Start migration" : "Iniciar a migración",
     "This is used for sending out notifications." : "Isto utilizase para o envío de notificacións.",
     "Send mode" : "Modo de envío",
     "Encryption" : "Cifrado",
diff --git a/settings/l10n/hr.js b/settings/l10n/hr.js
index df3fe9cc7df..fcfd8fa63c1 100644
--- a/settings/l10n/hr.js
+++ b/settings/l10n/hr.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Dijeljenje zajedničkih resursa",
     "External Storage" : "Vanjsko spremište",
     "Cron" : "Cron",
-    "Email Server" : "Poslužitelj e-pošte",
     "Log" : "Zapisnik",
     "Updates" : "nadogradnje",
     "Authentication error" : "Pogrešna autentikacija",
diff --git a/settings/l10n/hr.json b/settings/l10n/hr.json
index 8029837f4ac..682ba270f68 100644
--- a/settings/l10n/hr.json
+++ b/settings/l10n/hr.json
@@ -2,7 +2,6 @@
     "Sharing" : "Dijeljenje zajedničkih resursa",
     "External Storage" : "Vanjsko spremište",
     "Cron" : "Cron",
-    "Email Server" : "Poslužitelj e-pošte",
     "Log" : "Zapisnik",
     "Updates" : "nadogradnje",
     "Authentication error" : "Pogrešna autentikacija",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index ab814016112..e408bed23e1 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Megosztás",
     "External Storage" : "Külső tárolási szolgáltatások becsatolása",
     "Cron" : "Ütemezett feladatok",
-    "Email Server" : "E-mail kiszolgáló",
     "Log" : "Naplózás",
     "Updates" : "Frissítések",
     "Authentication error" : "Azonosítási hiba",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index cca98b38ae6..0ca93409f2d 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -2,7 +2,6 @@
     "Sharing" : "Megosztás",
     "External Storage" : "Külső tárolási szolgáltatások becsatolása",
     "Cron" : "Ütemezett feladatok",
-    "Email Server" : "E-mail kiszolgáló",
     "Log" : "Naplózás",
     "Updates" : "Frissítések",
     "Authentication error" : "Azonosítási hiba",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index bc675cc4627..5719ca22195 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Berbagi",
     "External Storage" : "Penyimpanan Eksternal",
     "Cron" : "Cron",
-    "Email Server" : "Server Email",
     "Log" : "Log",
     "Updates" : "Pembaruan",
     "Authentication error" : "Terjadi kesalahan saat otentikasi",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index 366ab477779..c4b0c17df75 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -2,7 +2,6 @@
     "Sharing" : "Berbagi",
     "External Storage" : "Penyimpanan Eksternal",
     "Cron" : "Cron",
-    "Email Server" : "Server Email",
     "Log" : "Log",
     "Updates" : "Pembaruan",
     "Authentication error" : "Terjadi kesalahan saat otentikasi",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 7be28b14222..f44c9d77b0b 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -4,9 +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",
     "Tips & tricks" : "Suggerimenti e trucchi",
     "Updates" : "Aggiornamenti",
@@ -28,6 +26,7 @@ OC.L10N.register(
     "Unable to change password" : "Impossibile cambiare la password",
     "Enabled" : "Abilitata",
     "Not enabled" : "Non abilitata",
+    "Migration Completed" : "Migrazione completata",
     "Group already exists." : "Il gruppo esiste già.",
     "Unable to add group." : "Impossibile aggiungere il gruppo.",
     "Unable to delete group." : "Impossibile eliminare il gruppo.",
@@ -48,6 +47,7 @@ OC.L10N.register(
     "Email saved" : "Email salvata",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sei sicuro di voler aggiungere \"{domain}\"  come dominio attendibile?",
     "Add trusted domain" : "Aggiungi dominio attendibile",
+    "Migration started …" : "Migrazione avviata...",
     "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.",
@@ -135,7 +135,7 @@ OC.L10N.register(
     "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.",
-    "Enable Server-Side-Encryption" : "Abilita cifratura lato server",
+    "Start migration" : "Avvia migrazione",
     "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
     "Send mode" : "Modalità di invio",
     "Encryption" : "Cifratura",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 99aed5aefb5..1683ffef203 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -2,9 +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",
     "Tips & tricks" : "Suggerimenti e trucchi",
     "Updates" : "Aggiornamenti",
@@ -26,6 +24,7 @@
     "Unable to change password" : "Impossibile cambiare la password",
     "Enabled" : "Abilitata",
     "Not enabled" : "Non abilitata",
+    "Migration Completed" : "Migrazione completata",
     "Group already exists." : "Il gruppo esiste già.",
     "Unable to add group." : "Impossibile aggiungere il gruppo.",
     "Unable to delete group." : "Impossibile eliminare il gruppo.",
@@ -46,6 +45,7 @@
     "Email saved" : "Email salvata",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sei sicuro di voler aggiungere \"{domain}\"  come dominio attendibile?",
     "Add trusted domain" : "Aggiungi dominio attendibile",
+    "Migration started …" : "Migrazione avviata...",
     "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.",
@@ -133,7 +133,7 @@
     "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.",
-    "Enable Server-Side-Encryption" : "Abilita cifratura lato server",
+    "Start migration" : "Avvia migrazione",
     "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
     "Send mode" : "Modalità di invio",
     "Encryption" : "Cifratura",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 04ad2ec4ff0..11862e37b66 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "セキュリティ＆セットアップ警告",
     "Sharing" : "共有",
     "External Storage" : "外部ストレージ",
-    "Server Side Encryption" : "サーバーサイド暗号化",
     "Cron" : "Cron",
-    "Email Server" : "メールサーバー",
     "Log" : "ログ",
     "Tips & tricks" : "Tips & tricks",
     "Updates" : "アップデート",
@@ -129,7 +127,6 @@ 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は、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" : "暗号化",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index daa013178bd..47243d1c55b 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "セキュリティ＆セットアップ警告",
     "Sharing" : "共有",
     "External Storage" : "外部ストレージ",
-    "Server Side Encryption" : "サーバーサイド暗号化",
     "Cron" : "Cron",
-    "Email Server" : "メールサーバー",
     "Log" : "ログ",
     "Tips & tricks" : "Tips & tricks",
     "Updates" : "アップデート",
@@ -127,7 +125,6 @@
     "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" : "暗号化",
diff --git a/settings/l10n/km.js b/settings/l10n/km.js
index 71c614dcfb8..0798e7ca01c 100644
--- a/settings/l10n/km.js
+++ b/settings/l10n/km.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "ការចែករំលែក",
     "External Storage" : "ឃ្លាំងផ្ទុកខាងក្រៅ",
     "Cron" : "Cron",
-    "Email Server" : "ម៉ាស៊ីនបម្រើអ៊ីមែល",
     "Log" : "Log",
     "Authentication error" : "កំហុសការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវ",
     "Language changed" : "បានប្ដូរភាសា",
diff --git a/settings/l10n/km.json b/settings/l10n/km.json
index fab32e06e57..f8e193041cc 100644
--- a/settings/l10n/km.json
+++ b/settings/l10n/km.json
@@ -2,7 +2,6 @@
     "Sharing" : "ការចែករំលែក",
     "External Storage" : "ឃ្លាំងផ្ទុកខាងក្រៅ",
     "Cron" : "Cron",
-    "Email Server" : "ម៉ាស៊ីនបម្រើអ៊ីមែល",
     "Log" : "Log",
     "Authentication error" : "កំហុសការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវ",
     "Language changed" : "បានប្ដូរភាសា",
diff --git a/settings/l10n/kn.js b/settings/l10n/kn.js
index 4e739742b48..424d1493fca 100644
--- a/settings/l10n/kn.js
+++ b/settings/l10n/kn.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "settings",
     {
     "Sharing" : "ಹಂಚಿಕೆ",
-    "Email Server" : "ಇ-ಅಂಚೆಯ ಪರಿಚಾರಕ ಗಣಕಯಂತ್ರ",
     "Log" : "ಹಿನ್ನೆಲೆಯ ದಾಖಲೆ",
     "Authentication error" : "ದೃಢೀಕರಣ ದೋಷ",
     "Your full name has been changed." : "ನಿಮ್ಮ ಪೂರ್ಣ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ.",
diff --git a/settings/l10n/kn.json b/settings/l10n/kn.json
index 9f50b421edf..88cfcc52c59 100644
--- a/settings/l10n/kn.json
+++ b/settings/l10n/kn.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Sharing" : "ಹಂಚಿಕೆ",
-    "Email Server" : "ಇ-ಅಂಚೆಯ ಪರಿಚಾರಕ ಗಣಕಯಂತ್ರ",
     "Log" : "ಹಿನ್ನೆಲೆಯ ದಾಖಲೆ",
     "Authentication error" : "ದೃಢೀಕರಣ ದೋಷ",
     "Your full name has been changed." : "ನಿಮ್ಮ ಪೂರ್ಣ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ.",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index fb9b25bebdc..03b9b29a989 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "공유",
     "External Storage" : "외부 저장소",
     "Cron" : "Cron",
-    "Email Server" : "전자우편 서버",
     "Log" : "로그",
     "Updates" : "업데이트",
     "Authentication error" : "인증 오류",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index 98c612b116d..ccdaa3fdd39 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -2,7 +2,6 @@
     "Sharing" : "공유",
     "External Storage" : "외부 저장소",
     "Cron" : "Cron",
-    "Email Server" : "전자우편 서버",
     "Log" : "로그",
     "Updates" : "업데이트",
     "Authentication error" : "인증 오류",
diff --git a/settings/l10n/lo.js b/settings/l10n/lo.js
index 3f5ec7a0bce..862f93e195f 100644
--- a/settings/l10n/lo.js
+++ b/settings/l10n/lo.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "settings",
     {
     "Sharing" : "ການແບ່ງປັນ",
-    "Email Server" : "ເຊີເວີອີເມວ",
     "Log" : "ບັນທຶກ",
     "Unable to change full name" : "ບໍ່ສາມາດປ່ຽນຊື່ເຕັມໄດ້",
     "Couldn't remove app." : "ບໍ່ສາມາດລຶບແອັບຯອອກໄດ້"
diff --git a/settings/l10n/lo.json b/settings/l10n/lo.json
index e92493d0fe1..75515944189 100644
--- a/settings/l10n/lo.json
+++ b/settings/l10n/lo.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Sharing" : "ການແບ່ງປັນ",
-    "Email Server" : "ເຊີເວີອີເມວ",
     "Log" : "ບັນທຶກ",
     "Unable to change full name" : "ບໍ່ສາມາດປ່ຽນຊື່ເຕັມໄດ້",
     "Couldn't remove app." : "ບໍ່ສາມາດລຶບແອັບຯອອກໄດ້"
diff --git a/settings/l10n/lv.js b/settings/l10n/lv.js
index c0683a44fa1..dca43da8cda 100644
--- a/settings/l10n/lv.js
+++ b/settings/l10n/lv.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Dalīšanās",
     "External Storage" : "Ārējā krātuve",
     "Cron" : "Cron",
-    "Email Server" : "E-pasta serveris",
     "Log" : "Žurnāls",
     "Authentication error" : "Autentifikācijas kļūda",
     "Your full name has been changed." : "Jūsu pilnais vārds tika mainīts.",
diff --git a/settings/l10n/lv.json b/settings/l10n/lv.json
index 8b0ed430b9c..1b8afb4d657 100644
--- a/settings/l10n/lv.json
+++ b/settings/l10n/lv.json
@@ -2,7 +2,6 @@
     "Sharing" : "Dalīšanās",
     "External Storage" : "Ārējā krātuve",
     "Cron" : "Cron",
-    "Email Server" : "E-pasta serveris",
     "Log" : "Žurnāls",
     "Authentication error" : "Autentifikācijas kļūda",
     "Your full name has been changed." : "Jūsu pilnais vārds tika mainīts.",
diff --git a/settings/l10n/mk.js b/settings/l10n/mk.js
index 4119f985b59..1ee7c5e7c1d 100644
--- a/settings/l10n/mk.js
+++ b/settings/l10n/mk.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Споделување",
     "External Storage" : "Надворешно складиште",
     "Cron" : "Крон",
-    "Email Server" : "Сервер за електронска пошта",
     "Log" : "Записник",
     "Authentication error" : "Грешка во автентикација",
     "Your full name has been changed." : "Вашето целосно име е променето.",
diff --git a/settings/l10n/mk.json b/settings/l10n/mk.json
index 40b8b433dea..ab2eff42d5a 100644
--- a/settings/l10n/mk.json
+++ b/settings/l10n/mk.json
@@ -2,7 +2,6 @@
     "Sharing" : "Споделување",
     "External Storage" : "Надворешно складиште",
     "Cron" : "Крон",
-    "Email Server" : "Сервер за електронска пошта",
     "Log" : "Записник",
     "Authentication error" : "Грешка во автентикација",
     "Your full name has been changed." : "Вашето целосно име е променето.",
diff --git a/settings/l10n/mn.js b/settings/l10n/mn.js
index 099846ae293..30c8a71df7a 100644
--- a/settings/l10n/mn.js
+++ b/settings/l10n/mn.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Sharing" : "Түгээлт",
     "Cron" : "Крон",
-    "Email Server" : "И-мэйл сервер",
     "Log" : "Лог бичилт",
     "Authentication error" : "Нотолгооны алдаа",
     "Your full name has been changed." : "Таны бүтэн нэр солигдлоо.",
diff --git a/settings/l10n/mn.json b/settings/l10n/mn.json
index 7ad0993ae09..95400f3893c 100644
--- a/settings/l10n/mn.json
+++ b/settings/l10n/mn.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Sharing" : "Түгээлт",
     "Cron" : "Крон",
-    "Email Server" : "И-мэйл сервер",
     "Log" : "Лог бичилт",
     "Authentication error" : "Нотолгооны алдаа",
     "Your full name has been changed." : "Таны бүтэн нэр солигдлоо.",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index 3a5ee411a43..51e7b24564b 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -4,9 +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",
     "Tips & tricks" : "Tips og triks",
     "Updates" : "Oppdateringer",
@@ -131,7 +129,6 @@ 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.",
-    "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",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index 6e5a29f8cd4..db720d1a9e8 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -2,9 +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",
     "Tips & tricks" : "Tips og triks",
     "Updates" : "Oppdateringer",
@@ -129,7 +127,6 @@
     "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.",
-    "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",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 80389ed6d80..fedce057925 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -4,9 +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",
     "Tips & tricks" : "Tips & trucs",
     "Updates" : "Updates",
@@ -135,7 +133,6 @@ OC.L10N.register(
     "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.",
-    "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",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 80a6f944a3f..fe1e94296a4 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -2,9 +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",
     "Tips & tricks" : "Tips & trucs",
     "Updates" : "Updates",
@@ -133,7 +131,6 @@
     "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.",
-    "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",
diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js
index fb0a2469c61..924856fe64f 100644
--- a/settings/l10n/pl.js
+++ b/settings/l10n/pl.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Ostrzeżenia bezpieczeństwa i konfiguracji",
     "Sharing" : "Udostępnianie",
     "External Storage" : "Zewnętrzna zasoby dyskowe",
-    "Server Side Encryption" : "Szyfrowanie po stronie serwera",
     "Cron" : "Cron",
-    "Email Server" : "Serwer pocztowy",
     "Log" : "Logi",
     "Updates" : "Aktualizacje",
     "Authentication error" : "Błąd uwierzytelniania",
@@ -118,7 +116,6 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
     "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.",
-    "Enable Server-Side-Encryption" : "Włącz szyfrowanie po stronie serwera",
     "This is used for sending out notifications." : "To jest używane do wysyłania powiadomień",
     "Send mode" : "Tryb wysyłki",
     "Encryption" : "Szyfrowanie",
diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json
index 2510bc614a7..1e4a1054f31 100644
--- a/settings/l10n/pl.json
+++ b/settings/l10n/pl.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Ostrzeżenia bezpieczeństwa i konfiguracji",
     "Sharing" : "Udostępnianie",
     "External Storage" : "Zewnętrzna zasoby dyskowe",
-    "Server Side Encryption" : "Szyfrowanie po stronie serwera",
     "Cron" : "Cron",
-    "Email Server" : "Serwer pocztowy",
     "Log" : "Logi",
     "Updates" : "Aktualizacje",
     "Authentication error" : "Błąd uwierzytelniania",
@@ -116,7 +114,6 @@
     "Execute one task with each page loaded" : "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
     "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.",
-    "Enable Server-Side-Encryption" : "Włącz szyfrowanie po stronie serwera",
     "This is used for sending out notifications." : "To jest używane do wysyłania powiadomień",
     "Send mode" : "Tryb wysyłki",
     "Encryption" : "Szyfrowanie",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 20e1697930a..aaecb907769 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -4,9 +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",
     "Tips & tricks" : "Dicas & Truques",
     "Updates" : "Atualizações",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Impossível modificar senha",
     "Enabled" : "Habilitado",
     "Not enabled" : "Desabilitado",
+    "A problem occurred, please check your log files (Error: %s)" : "Ocorreu um problema enquanto verificava seus arquivos de log (Erro: %s)",
+    "Migration Completed" : "Migração Concluida",
     "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.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "E-mail salvo",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que você quer adicionar \"{domain}\" como domínio confiável?",
     "Add trusted domain" : "Adicionar domínio confiável",
+    "Migration in progress. Please wait until the migration is finished" : "Migração em progresso. Por favor aguarde até que a migração seja finalizada",
+    "Migration started …" : "Migração iniciada ...",
     "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.",
@@ -135,7 +137,7 @@ OC.L10N.register(
     "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.",
-    "Enable Server-Side-Encryption" : "Habilitar a Criptografia do Lado do Servidor",
+    "Start migration" : "Iniciar migração",
     "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
     "Send mode" : "Modo enviar",
     "Encryption" : "Criptografia",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index d76516f2ac0..88132b7b0f5 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -2,9 +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",
     "Tips & tricks" : "Dicas & Truques",
     "Updates" : "Atualizações",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Impossível modificar senha",
     "Enabled" : "Habilitado",
     "Not enabled" : "Desabilitado",
+    "A problem occurred, please check your log files (Error: %s)" : "Ocorreu um problema enquanto verificava seus arquivos de log (Erro: %s)",
+    "Migration Completed" : "Migração Concluida",
     "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.",
@@ -46,6 +46,8 @@
     "Email saved" : "E-mail salvo",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que você quer adicionar \"{domain}\" como domínio confiável?",
     "Add trusted domain" : "Adicionar domínio confiável",
+    "Migration in progress. Please wait until the migration is finished" : "Migração em progresso. Por favor aguarde até que a migração seja finalizada",
+    "Migration started …" : "Migração iniciada ...",
     "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.",
@@ -133,7 +135,7 @@
     "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.",
-    "Enable Server-Side-Encryption" : "Habilitar a Criptografia do Lado do Servidor",
+    "Start migration" : "Iniciar migração",
     "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
     "Send mode" : "Modo enviar",
     "Encryption" : "Criptografia",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index 73563e8b35d..44706a6f4df 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -4,9 +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",
     "Tips & tricks" : "Dicas e truqes",
     "Updates" : "Atualizações",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Não foi possível alterar a sua palavra-passe ",
     "Enabled" : "Ativada",
     "Not enabled" : "Desativada",
+    "A problem occurred, please check your log files (Error: %s)" : "Ocorreu um problema, por favor, verifique os ficheiros de registo (Erro: %s)",
+    "Migration Completed" : "Migração Concluída",
     "Group already exists." : "O grupo já existe.",
     "Unable to add group." : "Impossível acrescentar o grupo.",
     "Unable to delete group." : "Impossível apagar grupo.",
@@ -48,8 +48,11 @@ OC.L10N.register(
     "Email saved" : "E-mail guardado",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
     "Add trusted domain" : "Adicionar domínio confiável ",
+    "Migration in progress. Please wait until the migration is finished" : "Migração em progresso. Por favor, aguarde até que a mesma esteja concluída..",
+    "Migration started …" : "Migração iniciada...",
     "Sending..." : "A enviar...",
     "All" : "Todos",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As apps oficiais são desenvolvidas por e na comunidade da ownCloud. Elas oferecem funcionalidade central para a ownCloud e está pronta para uma utilização na produção.",
     "Please wait...." : "Por favor, aguarde...",
     "Error while disabling app" : "Ocorreu  um erro enquanto desativava a app",
     "Disable" : "Desativar",
@@ -128,10 +131,11 @@ OC.L10N.register(
     "Last cron job execution: %s." : "Última execução de cron job: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Última execução de cron job: %s. Algo está errado.",
     "Cron was not executed yet!" : "Cron ainda não foi executado!",
+    "Open documentation" : "Abrir documentação",
     "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.",
-    "Enable Server-Side-Encryption" : "Ativar encriptação do lado do servidor",
+    "Start migration" : "Iniciar migração",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
     "Send mode" : "Modo de Envio",
     "Encryption" : "Encriptação",
@@ -164,6 +168,8 @@ OC.L10N.register(
     "Version" : "Versão",
     "More apps" : "Mais aplicações",
     "Developer documentation" : "Documentação de Programador",
+    "Experimental applications ahead" : "Aplicações experimentais de futuro",
+    "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 apps experimentais não estão selecionadas para problemas de segurança, nova ou conhecida como instável e em forte desenvolvimento. Ao instalá-las pode causar a perda de dados ou quebra de segurança.",
     "by" : "por",
     "licensed" : "licenciado",
     "Documentation:" : "Documentação:",
@@ -175,6 +181,7 @@ OC.L10N.register(
     "Update to %s" : "Actualizar para %s",
     "Enable only for specific groups" : "Activar só para grupos específicos",
     "Uninstall App" : "Desinstalar aplicação",
+    "Enable experimental apps" : "Ativar apps experimentais",
     "No apps found for your version" : "Nenhuma aplicação encontrada 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>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!",
@@ -183,6 +190,7 @@ OC.L10N.register(
     "Administrator documentation" : "Documentação de Administrador.",
     "Online documentation" : "Documentação Online",
     "Forum" : "Fórum",
+    "Issue tracker" : "Pesquisador de problemad",
     "Commercial support" : "Suporte Comercial",
     "Get the apps to sync your files" : "Obtenha as aplicações para sincronizar os seus ficheiros",
     "Desktop client" : "Cliente Desktop",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index 438de6006f0..3b116ebfd38 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -2,9 +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",
     "Tips & tricks" : "Dicas e truqes",
     "Updates" : "Atualizações",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Não foi possível alterar a sua palavra-passe ",
     "Enabled" : "Ativada",
     "Not enabled" : "Desativada",
+    "A problem occurred, please check your log files (Error: %s)" : "Ocorreu um problema, por favor, verifique os ficheiros de registo (Erro: %s)",
+    "Migration Completed" : "Migração Concluída",
     "Group already exists." : "O grupo já existe.",
     "Unable to add group." : "Impossível acrescentar o grupo.",
     "Unable to delete group." : "Impossível apagar grupo.",
@@ -46,8 +46,11 @@
     "Email saved" : "E-mail guardado",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
     "Add trusted domain" : "Adicionar domínio confiável ",
+    "Migration in progress. Please wait until the migration is finished" : "Migração em progresso. Por favor, aguarde até que a mesma esteja concluída..",
+    "Migration started …" : "Migração iniciada...",
     "Sending..." : "A enviar...",
     "All" : "Todos",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As apps oficiais são desenvolvidas por e na comunidade da ownCloud. Elas oferecem funcionalidade central para a ownCloud e está pronta para uma utilização na produção.",
     "Please wait...." : "Por favor, aguarde...",
     "Error while disabling app" : "Ocorreu  um erro enquanto desativava a app",
     "Disable" : "Desativar",
@@ -126,10 +129,11 @@
     "Last cron job execution: %s." : "Última execução de cron job: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Última execução de cron job: %s. Algo está errado.",
     "Cron was not executed yet!" : "Cron ainda não foi executado!",
+    "Open documentation" : "Abrir documentação",
     "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.",
-    "Enable Server-Side-Encryption" : "Ativar encriptação do lado do servidor",
+    "Start migration" : "Iniciar migração",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
     "Send mode" : "Modo de Envio",
     "Encryption" : "Encriptação",
@@ -162,6 +166,8 @@
     "Version" : "Versão",
     "More apps" : "Mais aplicações",
     "Developer documentation" : "Documentação de Programador",
+    "Experimental applications ahead" : "Aplicações experimentais de futuro",
+    "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 apps experimentais não estão selecionadas para problemas de segurança, nova ou conhecida como instável e em forte desenvolvimento. Ao instalá-las pode causar a perda de dados ou quebra de segurança.",
     "by" : "por",
     "licensed" : "licenciado",
     "Documentation:" : "Documentação:",
@@ -173,6 +179,7 @@
     "Update to %s" : "Actualizar para %s",
     "Enable only for specific groups" : "Activar só para grupos específicos",
     "Uninstall App" : "Desinstalar aplicação",
+    "Enable experimental apps" : "Ativar apps experimentais",
     "No apps found for your version" : "Nenhuma aplicação encontrada 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>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!",
@@ -181,6 +188,7 @@
     "Administrator documentation" : "Documentação de Administrador.",
     "Online documentation" : "Documentação Online",
     "Forum" : "Fórum",
+    "Issue tracker" : "Pesquisador de problemad",
     "Commercial support" : "Suporte Comercial",
     "Get the apps to sync your files" : "Obtenha as aplicações para sincronizar os seus ficheiros",
     "Desktop client" : "Cliente Desktop",
diff --git a/settings/l10n/ro.js b/settings/l10n/ro.js
index 8b7f63c7197..3c51bba6cd3 100644
--- a/settings/l10n/ro.js
+++ b/settings/l10n/ro.js
@@ -1,10 +1,13 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & setup warnings" : "Alerte de securitate & configurare",
     "Sharing" : "Partajare",
     "External Storage" : "Stocare externă",
     "Cron" : "Cron",
     "Log" : "Jurnal de activitate",
+    "Tips & tricks" : "Tips & tricks",
+    "Updates" : "Actualizări",
     "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",
@@ -24,6 +27,11 @@ OC.L10N.register(
     "Saved" : "Salvat",
     "test email settings" : "verifică setările de e-mail",
     "Email sent" : "Mesajul a fost expediat",
+    "Invalid mail address" : "Adresa mail invalidă",
+    "Unable to create user." : "Imposibil de creat utilizatorul",
+    "Your %s account was created" : "Contul tău %s a fost creat",
+    "Unable to delete user." : "Imposibil de șters utilizatorul.",
+    "Forbidden" : "Interzis",
     "Invalid user" : "Utilizator nevalid",
     "Email saved" : "E-mail salvat",
     "Sending..." : "Se expediază...",
@@ -61,6 +69,7 @@ OC.L10N.register(
     "Allow apps to use the Share API" : "Permite aplicațiilor să folosească API-ul de partajare",
     "Allow public uploads" : "Permite încărcări publice",
     "Allow users to send mail notification for shared files" : "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune",
+    "days" : "zile",
     "Allow resharing" : "Permite repartajarea",
     "Execute one task with each page loaded" : "Execută o sarcină la fiecare pagină încărcată",
     "Send mode" : "Modul de expediere",
@@ -81,6 +90,9 @@ OC.L10N.register(
     "User Documentation" : "Documentație utilizator",
     "Forum" : "Forum",
     "Get the apps to sync your files" : "Ia acum aplicatia pentru sincronizarea fisierelor ",
+    "Desktop client" : "Client Desktop",
+    "Android app" : "Aplicatie Android",
+    "iOS app" : "Aplicație iOS",
     "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ă",
     "Unable to change your password" : "Imposibil de-ați schimbat parola",
diff --git a/settings/l10n/ro.json b/settings/l10n/ro.json
index cdbe2ed734a..51e5d01f190 100644
--- a/settings/l10n/ro.json
+++ b/settings/l10n/ro.json
@@ -1,8 +1,11 @@
 { "translations": {
+    "Security & setup warnings" : "Alerte de securitate & configurare",
     "Sharing" : "Partajare",
     "External Storage" : "Stocare externă",
     "Cron" : "Cron",
     "Log" : "Jurnal de activitate",
+    "Tips & tricks" : "Tips & tricks",
+    "Updates" : "Actualizări",
     "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",
@@ -22,6 +25,11 @@
     "Saved" : "Salvat",
     "test email settings" : "verifică setările de e-mail",
     "Email sent" : "Mesajul a fost expediat",
+    "Invalid mail address" : "Adresa mail invalidă",
+    "Unable to create user." : "Imposibil de creat utilizatorul",
+    "Your %s account was created" : "Contul tău %s a fost creat",
+    "Unable to delete user." : "Imposibil de șters utilizatorul.",
+    "Forbidden" : "Interzis",
     "Invalid user" : "Utilizator nevalid",
     "Email saved" : "E-mail salvat",
     "Sending..." : "Se expediază...",
@@ -59,6 +67,7 @@
     "Allow apps to use the Share API" : "Permite aplicațiilor să folosească API-ul de partajare",
     "Allow public uploads" : "Permite încărcări publice",
     "Allow users to send mail notification for shared files" : "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune",
+    "days" : "zile",
     "Allow resharing" : "Permite repartajarea",
     "Execute one task with each page loaded" : "Execută o sarcină la fiecare pagină încărcată",
     "Send mode" : "Modul de expediere",
@@ -79,6 +88,9 @@
     "User Documentation" : "Documentație utilizator",
     "Forum" : "Forum",
     "Get the apps to sync your files" : "Ia acum aplicatia pentru sincronizarea fisierelor ",
+    "Desktop client" : "Client Desktop",
+    "Android app" : "Aplicatie Android",
+    "iOS app" : "Aplicație iOS",
     "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ă",
     "Unable to change your password" : "Imposibil de-ați schimbat parola",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 6ee0f04e2b3..7f7670c960e 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Предупреждения безопасности и установки",
     "Sharing" : "Общий доступ",
     "External Storage" : "Внешнее хранилище",
-    "Server Side Encryption" : "Шифрование на стороне сервера",
     "Cron" : "Cron (планировщик задач)",
-    "Email Server" : "Почтовый сервер",
     "Log" : "Журнал",
     "Tips & tricks" : "Советы и трюки",
     "Updates" : "Обновления",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Невозможно изменить пароль",
     "Enabled" : "Включено",
     "Not enabled" : "Не включено",
+    "A problem occurred, please check your log files (Error: %s)" : "Возникла проблема, пожалуйста, проверьте ваши файлы журнала (Ошибка: %s)",
+    "Migration Completed" : "Миграция завершена",
     "Group already exists." : "Группа уже существует.",
     "Unable to add group." : "Невозможно добавить группу.",
     "Unable to delete group." : "Невозможно удалить группу.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "Email сохранен",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Вы действительно хотите добавить домен \"{domain}\" как доверенный?",
     "Add trusted domain" : "Добавить доверенный домен",
+    "Migration in progress. Please wait until the migration is finished" : "Миграция в процессе. Пожалуйста, подождите завершения миграции",
+    "Migration started …" : "Начата миграция ...",
     "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. Они полностью функциональны и готовы к работе.",
@@ -135,7 +137,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 и будет вызываться каждые 15 минут по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
-    "Enable Server-Side-Encryption" : "Включить шифрование на стороне сервера",
+    "Start migration" : "Запустить миграцию",
     "This is used for sending out notifications." : "Используется для отправки уведомлений.",
     "Send mode" : "Способ отправки",
     "Encryption" : "Шифрование",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 8d811c7a27e..14a2b1144e3 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Предупреждения безопасности и установки",
     "Sharing" : "Общий доступ",
     "External Storage" : "Внешнее хранилище",
-    "Server Side Encryption" : "Шифрование на стороне сервера",
     "Cron" : "Cron (планировщик задач)",
-    "Email Server" : "Почтовый сервер",
     "Log" : "Журнал",
     "Tips & tricks" : "Советы и трюки",
     "Updates" : "Обновления",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Невозможно изменить пароль",
     "Enabled" : "Включено",
     "Not enabled" : "Не включено",
+    "A problem occurred, please check your log files (Error: %s)" : "Возникла проблема, пожалуйста, проверьте ваши файлы журнала (Ошибка: %s)",
+    "Migration Completed" : "Миграция завершена",
     "Group already exists." : "Группа уже существует.",
     "Unable to add group." : "Невозможно добавить группу.",
     "Unable to delete group." : "Невозможно удалить группу.",
@@ -46,6 +46,8 @@
     "Email saved" : "Email сохранен",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Вы действительно хотите добавить домен \"{domain}\" как доверенный?",
     "Add trusted domain" : "Добавить доверенный домен",
+    "Migration in progress. Please wait until the migration is finished" : "Миграция в процессе. Пожалуйста, подождите завершения миграции",
+    "Migration started …" : "Начата миграция ...",
     "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. Они полностью функциональны и готовы к работе.",
@@ -133,7 +135,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 и будет вызываться каждые 15 минут по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
-    "Enable Server-Side-Encryption" : "Включить шифрование на стороне сервера",
+    "Start migration" : "Запустить миграцию",
     "This is used for sending out notifications." : "Используется для отправки уведомлений.",
     "Send mode" : "Способ отправки",
     "Encryption" : "Шифрование",
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index ea3a870d427..e0db3ab18ee 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Zdieľanie",
     "External Storage" : "Externé úložisko",
     "Cron" : "Cron",
-    "Email Server" : "Email server",
     "Log" : "Záznam",
     "Tips & tricks" : "Tipy a triky",
     "Updates" : "Aktualizácie",
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index a4f1a539a1e..30e34ac1d6c 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -2,7 +2,6 @@
     "Sharing" : "Zdieľanie",
     "External Storage" : "Externé úložisko",
     "Cron" : "Cron",
-    "Email Server" : "Email server",
     "Log" : "Záznam",
     "Tips & tricks" : "Tipy a triky",
     "Updates" : "Aktualizácie",
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index b7d8c8550a7..78af6f4d0aa 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -3,9 +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",
     "Updates" : "Posodobitve",
     "Authentication error" : "Napaka med overjanjem",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index b8ad39d592b..5fc355467bd 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -1,9 +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",
     "Updates" : "Posodobitve",
     "Authentication error" : "Napaka med overjanjem",
diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js
index 23110ad2006..c8bbca38488 100644
--- a/settings/l10n/sq.js
+++ b/settings/l10n/sq.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Sharing" : "Ndarje",
     "Cron" : "Cron",
-    "Email Server" : "Serveri Email",
     "Log" : "Historik aktiviteti",
     "Authentication error" : "Gabim autentifikimi",
     "Your full name has been changed." : "Emri juaj i plotë ka ndryshuar.",
diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json
index 57af50a4bc0..8ffdd975868 100644
--- a/settings/l10n/sq.json
+++ b/settings/l10n/sq.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Sharing" : "Ndarje",
     "Cron" : "Cron",
-    "Email Server" : "Serveri Email",
     "Log" : "Historik aktiviteti",
     "Authentication error" : "Gabim autentifikimi",
     "Your full name has been changed." : "Emri juaj i plotë ka ndryshuar.",
diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js
index 43008a05a72..c4eaa14084b 100644
--- a/settings/l10n/sr.js
+++ b/settings/l10n/sr.js
@@ -4,9 +4,7 @@ OC.L10N.register(
     "Security & setup warnings" : "Безбедносна и упозорења поставе",
     "Sharing" : "Дељење",
     "External Storage" : "Спољашње складиште",
-    "Server Side Encryption" : "Шифровање на страни сервера",
     "Cron" : "Крон",
-    "Email Server" : "Сервер е-поште",
     "Log" : "Бележење",
     "Tips & tricks" : "Савети и трикови",
     "Updates" : "Ажурирања",
@@ -28,6 +26,8 @@ OC.L10N.register(
     "Unable to change password" : "Не могу да променим лозинку",
     "Enabled" : "Укључено",
     "Not enabled" : "Искључено",
+    "A problem occurred, please check your log files (Error: %s)" : "Појавио се проблем. Проверите записнике (грешка: %s)",
+    "Migration Completed" : "Пресељење завршено",
     "Group already exists." : "Група већ постоји.",
     "Unable to add group." : "Није могуће додати групу.",
     "Unable to delete group." : "Није могуће обрисати групу.",
@@ -48,6 +48,8 @@ OC.L10N.register(
     "Email saved" : "Е-порука сачувана",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Да ли заиста желите да додате „{domain}“ као поуздан домен?",
     "Add trusted domain" : "Додај поуздан домен",
+    "Migration in progress. Please wait until the migration is finished" : "Пресељење је у току. Сачекајте док се не заврши",
+    "Migration started …" : "Пресељење покренуто...",
     "Sending..." : "Шаљем...",
     "All" : "Све",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Званичнe апликације су развиjене од стране ownCloud заједнице. Оне нуде функционалност намењену пре свега ownCloud-у и спремне су за функционалну употребу.",
@@ -135,7 +137,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 је регистрован код  вебкрон сервиса за позивање cron.php сваких 15 минута преко протокола http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Користите системски крон сервис за позивање cron.php фајла сваких 15 минута.",
-    "Enable Server-Side-Encryption" : "Укључи шифровање на страни сервера",
+    "Start migration" : "Покрени пресељење",
     "This is used for sending out notifications." : "Ово се користи за слање обавештења.",
     "Send mode" : "Режим слања",
     "Encryption" : "Шифровање",
@@ -185,7 +187,7 @@ OC.L10N.register(
     "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",
+    "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",
     "User documentation" : "Корисничка документација",
     "Administrator documentation" : "Администраторска документација",
     "Online documentation" : "Документација на мрежи",
@@ -226,7 +228,7 @@ OC.L10N.register(
     "Issued By" : "Издавач",
     "Valid until %s" : "Важи до %s",
     "Import root certificate" : "Увоз кореног сертификата",
-    "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}.",
+    "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=\"Аферо општа јавна лиценца\">АОЈЛ (AGPL)</abbr>{linkclose}.",
     "Show storage location" : "Прикажи локацију складишта",
     "Show last log in" : "Прикажи последњу пријаву",
     "Show user backend" : "Прикажи позадину за кориснике",
diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json
index 98cd3535e1f..c613cae0d8a 100644
--- a/settings/l10n/sr.json
+++ b/settings/l10n/sr.json
@@ -2,9 +2,7 @@
     "Security & setup warnings" : "Безбедносна и упозорења поставе",
     "Sharing" : "Дељење",
     "External Storage" : "Спољашње складиште",
-    "Server Side Encryption" : "Шифровање на страни сервера",
     "Cron" : "Крон",
-    "Email Server" : "Сервер е-поште",
     "Log" : "Бележење",
     "Tips & tricks" : "Савети и трикови",
     "Updates" : "Ажурирања",
@@ -26,6 +24,8 @@
     "Unable to change password" : "Не могу да променим лозинку",
     "Enabled" : "Укључено",
     "Not enabled" : "Искључено",
+    "A problem occurred, please check your log files (Error: %s)" : "Појавио се проблем. Проверите записнике (грешка: %s)",
+    "Migration Completed" : "Пресељење завршено",
     "Group already exists." : "Група већ постоји.",
     "Unable to add group." : "Није могуће додати групу.",
     "Unable to delete group." : "Није могуће обрисати групу.",
@@ -46,6 +46,8 @@
     "Email saved" : "Е-порука сачувана",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Да ли заиста желите да додате „{domain}“ као поуздан домен?",
     "Add trusted domain" : "Додај поуздан домен",
+    "Migration in progress. Please wait until the migration is finished" : "Пресељење је у току. Сачекајте док се не заврши",
+    "Migration started …" : "Пресељење покренуто...",
     "Sending..." : "Шаљем...",
     "All" : "Све",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Званичнe апликације су развиjене од стране ownCloud заједнице. Оне нуде функционалност намењену пре свега ownCloud-у и спремне су за функционалну употребу.",
@@ -133,7 +135,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 је регистрован код  вебкрон сервиса за позивање cron.php сваких 15 минута преко протокола http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Користите системски крон сервис за позивање cron.php фајла сваких 15 минута.",
-    "Enable Server-Side-Encryption" : "Укључи шифровање на страни сервера",
+    "Start migration" : "Покрени пресељење",
     "This is used for sending out notifications." : "Ово се користи за слање обавештења.",
     "Send mode" : "Режим слања",
     "Encryption" : "Шифровање",
@@ -183,7 +185,7 @@
     "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",
+    "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",
     "User documentation" : "Корисничка документација",
     "Administrator documentation" : "Администраторска документација",
     "Online documentation" : "Документација на мрежи",
@@ -224,7 +226,7 @@
     "Issued By" : "Издавач",
     "Valid until %s" : "Важи до %s",
     "Import root certificate" : "Увоз кореног сертификата",
-    "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}.",
+    "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=\"Аферо општа јавна лиценца\">АОЈЛ (AGPL)</abbr>{linkclose}.",
     "Show storage location" : "Прикажи локацију складишта",
     "Show last log in" : "Прикажи последњу пријаву",
     "Show user backend" : "Прикажи позадину за кориснике",
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
index 3a714b4c626..05b7dcba6c0 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Dela",
     "External Storage" : "Extern lagring",
     "Cron" : "Cron",
-    "Email Server" : "E-postserver",
     "Log" : "Logg",
     "Updates" : "Uppdateringar",
     "Authentication error" : "Fel vid autentisering",
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index 3c4460fd086..42bd8e5b6f4 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -2,7 +2,6 @@
     "Sharing" : "Dela",
     "External Storage" : "Extern lagring",
     "Cron" : "Cron",
-    "Email Server" : "E-postserver",
     "Log" : "Logg",
     "Updates" : "Uppdateringar",
     "Authentication error" : "Fel vid autentisering",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 38d029b037b..7b89faba329 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -4,9 +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",
     "Tips & tricks" : "İpuçları ve hileler",
     "Updates" : "Güncellemeler",
@@ -131,7 +129,6 @@ 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.",
-    "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",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 162af10663f..440b67241c0 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -2,9 +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",
     "Tips & tricks" : "İpuçları ve hileler",
     "Updates" : "Güncellemeler",
@@ -129,7 +127,6 @@
     "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.",
-    "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",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index e4d4dedb3f4..d2d571ca2af 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "Спільний доступ",
     "External Storage" : "Зовнішні сховища",
     "Cron" : "Планувальник Cron",
-    "Email Server" : "Сервер електронної пошти",
     "Log" : "Журнал",
     "Updates" : "Оновлення",
     "Authentication error" : "Помилка автентифікації",
@@ -20,7 +19,7 @@ OC.L10N.register(
     "Wrong password" : "Невірний пароль",
     "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." : "Неправильний пароль адміністратора для відновлення. Перевірте пароль та спробуйте ще раз.",
+    "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." : "Використовуваний механізм не підтримує зміну паролів, але користувальницький ключ шифрування був успішно змінено",
     "Unable to change password" : "Неможливо змінити пароль",
     "Enabled" : "Увімкнено",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index f36feec3a67..567297e384d 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -2,7 +2,6 @@
     "Sharing" : "Спільний доступ",
     "External Storage" : "Зовнішні сховища",
     "Cron" : "Планувальник Cron",
-    "Email Server" : "Сервер електронної пошти",
     "Log" : "Журнал",
     "Updates" : "Оновлення",
     "Authentication error" : "Помилка автентифікації",
@@ -18,7 +17,7 @@
     "Wrong password" : "Невірний пароль",
     "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." : "Неправильний пароль адміністратора для відновлення. Перевірте пароль та спробуйте ще раз.",
+    "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." : "Використовуваний механізм не підтримує зміну паролів, але користувальницький ключ шифрування був успішно змінено",
     "Unable to change password" : "Неможливо змінити пароль",
     "Enabled" : "Увімкнено",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index f8b40607816..242c78eee7a 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "共享",
     "External Storage" : "外部存储",
     "Cron" : "计划任务",
-    "Email Server" : "电子邮件服务器",
     "Log" : "日志",
     "Updates" : "更新",
     "Authentication error" : "认证错误",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index f6394c2437a..f911248ed41 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -2,7 +2,6 @@
     "Sharing" : "共享",
     "External Storage" : "外部存储",
     "Cron" : "计划任务",
-    "Email Server" : "电子邮件服务器",
     "Log" : "日志",
     "Updates" : "更新",
     "Authentication error" : "认证错误",
diff --git a/settings/l10n/zh_HK.js b/settings/l10n/zh_HK.js
index 3211c4dc26d..6b613fdf4f7 100644
--- a/settings/l10n/zh_HK.js
+++ b/settings/l10n/zh_HK.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "settings",
     {
     "Sharing" : "分享",
-    "Email Server" : "電子郵件伺服器",
     "Log" : "日誌",
     "Updates" : "更新",
     "Wrong password" : "密碼錯誤",
diff --git a/settings/l10n/zh_HK.json b/settings/l10n/zh_HK.json
index 9b76d35b796..1f562400c05 100644
--- a/settings/l10n/zh_HK.json
+++ b/settings/l10n/zh_HK.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Sharing" : "分享",
-    "Email Server" : "電子郵件伺服器",
     "Log" : "日誌",
     "Updates" : "更新",
     "Wrong password" : "密碼錯誤",
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
index 639b6f12617..e946e3b5de2 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Sharing" : "分享",
     "External Storage" : "外部儲存",
     "Cron" : "工作排程",
-    "Email Server" : "郵件伺服器",
     "Log" : "紀錄",
     "Updates" : "更新",
     "Authentication error" : "認證錯誤",
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index a22d8c37518..cb4858f9009 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -2,7 +2,6 @@
     "Sharing" : "分享",
     "External Storage" : "外部儲存",
     "Cron" : "工作排程",
-    "Email Server" : "郵件伺服器",
     "Log" : "紀錄",
     "Updates" : "更新",
     "Authentication error" : "認證錯誤",
author	Jenkins for ownCloud <owncloud-bot@tmit.eu>	2015-04-18 08:55:19 +0300
committer	Jenkins for ownCloud <owncloud-bot@tmit.eu>	2015-04-18 08:55:19 +0300
commit	37a871127b750d0f633cdfb7713b0582dfdf2d6a (patch)
tree	534a7c6e6fd5d443f086415607899ebc92738e30
parent	4dd2ad7f4abc66f40c93f8f974737138ba187f46 (diff)