[tx-robot] updated from transifex

32 files changed, 274 insertions, 28 deletions

diff --git a/apps/encryption/l10n/da.js b/apps/encryption/l10n/da.js
index 1310627a174..2db9f682551 100644
--- a/apps/encryption/l10n/da.js
+++ b/apps/encryption/l10n/da.js
@@ -15,8 +15,8 @@ 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",
-    "ownCloud basic encryption module" : "ownCloud basis krypteringsmodul",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
+    "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):",
     "Recovery key password" : "Gendannelsesnøgle kodeord",
     "Repeat Recovery key password" : "Gentag gendannelse af nøglekoden",
diff --git a/apps/encryption/l10n/da.json b/apps/encryption/l10n/da.json
index 64a619d067b..9aa80f72d74 100644
--- a/apps/encryption/l10n/da.json
+++ b/apps/encryption/l10n/da.json
@@ -13,8 +13,8 @@
     "Could not change the password. Maybe the old password was not correct." : "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
     "Recovery Key enabled" : "Gendannalsesnøgle aktiv",
     "Could not enable the recovery key, please try again or contact your administrator" : "Kunne ikke aktivere gendannelsesnøglen, venligst prøv igen eller kontakt din administrator",
-    "ownCloud basic encryption module" : "ownCloud basis krypteringsmodul",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
+    "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):",
     "Recovery key password" : "Gendannelsesnøgle kodeord",
     "Repeat Recovery key password" : "Gentag gendannelse af nøglekoden",
diff --git a/apps/encryption/l10n/de.js b/apps/encryption/l10n/de.js
index dc5c9b4779d..00d13fa660e 100644
--- a/apps/encryption/l10n/de.js
+++ b/apps/encryption/l10n/de.js
@@ -15,8 +15,8 @@ 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",
-    "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
     "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):",
     "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
     "Repeat Recovery key password" : "Schlüssel-Passwort zur Wiederherstellung wiederholen",
diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json
index ba4ed0e535e..47ee8e24cca 100644
--- a/apps/encryption/l10n/de.json
+++ b/apps/encryption/l10n/de.json
@@ -13,8 +13,8 @@
     "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",
-    "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
     "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):",
     "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
     "Repeat Recovery key password" : "Schlüssel-Passwort zur Wiederherstellung wiederholen",
diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js
index 9a3ba702211..cde424c218f 100644
--- a/apps/encryption/l10n/de_DE.js
+++ b/apps/encryption/l10n/de_DE.js
@@ -15,8 +15,8 @@ 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",
-    "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
     "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):",
     "Recovery key password" : "Wiederherstellungschlüsselpasswort",
     "Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen",
diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json
index 59da38e3e6d..05ebedbf79c 100644
--- a/apps/encryption/l10n/de_DE.json
+++ b/apps/encryption/l10n/de_DE.json
@@ -13,8 +13,8 @@
     "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",
-    "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
     "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):",
     "Recovery key password" : "Wiederherstellungschlüsselpasswort",
     "Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen",
diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
index 33a1f95ee61..db3b2a213c5 100644
--- a/apps/encryption/l10n/es.js
+++ b/apps/encryption/l10n/es.js
@@ -13,7 +13,10 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Por favor, repita su nueva contraseña de recuperación",
     "Password successfully changed." : "Su contraseña ha sido cambiada",
     "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
+    "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",
     "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);",
     "Recovery key password" : "Contraseña de clave de recuperación",
     "Repeat Recovery key password" : "Repite la contraseña de clave de recuperación",
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
index 501d6318752..57606eeea57 100644
--- a/apps/encryption/l10n/es.json
+++ b/apps/encryption/l10n/es.json
@@ -11,7 +11,10 @@
     "Please repeat the new recovery password" : "Por favor, repita su nueva contraseña de recuperación",
     "Password successfully changed." : "Su contraseña ha sido cambiada",
     "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
+    "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",
     "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);",
     "Recovery key password" : "Contraseña de clave de recuperación",
     "Repeat Recovery key password" : "Repite la contraseña de clave de recuperación",
diff --git a/apps/encryption/l10n/fi_FI.js b/apps/encryption/l10n/fi_FI.js
index d9ec3e2d808..f69ab49786f 100644
--- a/apps/encryption/l10n/fi_FI.js
+++ b/apps/encryption/l10n/fi_FI.js
@@ -15,8 +15,8 @@ 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",
-    "ownCloud basic encryption module" : "ownCloudin perussalausmoduuli",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
+    "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):",
     "Recovery key password" : "Palautusavaimen salasana",
     "Repeat Recovery key password" : "Toista palautusavaimen salasana",
diff --git a/apps/encryption/l10n/fi_FI.json b/apps/encryption/l10n/fi_FI.json
index 7a3aa891e28..5a08c06b972 100644
--- a/apps/encryption/l10n/fi_FI.json
+++ b/apps/encryption/l10n/fi_FI.json
@@ -13,8 +13,8 @@
     "Could not change the password. Maybe the old password was not correct." : "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
     "Recovery Key enabled" : "Palautusavain käytössä",
     "Could not enable the recovery key, please try again or contact your administrator" : "Palautusavaimen käyttöönotto epäonnistui, yritä myöhemmin uudelleen tai ota yhteys ylläpitäjään",
-    "ownCloud basic encryption module" : "ownCloudin perussalausmoduuli",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
+    "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):",
     "Recovery key password" : "Palautusavaimen salasana",
     "Repeat Recovery key password" : "Toista palautusavaimen salasana",
diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js
index 2c01315dbd5..d2c988dda0d 100644
--- a/apps/encryption/l10n/fr.js
+++ b/apps/encryption/l10n/fr.js
@@ -15,8 +15,8 @@ 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",
-    "ownCloud basic encryption module" : "Module de chiffrement de base d'ownCloud",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
+    "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).",
     "Recovery key password" : "Mot de passe de la clef de récupération",
     "Repeat Recovery key password" : "Répétez le mot de passe de la clef de récupération",
diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json
index 4b284f482f6..ba7692e0e34 100644
--- a/apps/encryption/l10n/fr.json
+++ b/apps/encryption/l10n/fr.json
@@ -13,8 +13,8 @@
     "Could not change the password. Maybe the old password was not correct." : "Erreur lors du changement de mot de passe. L'ancien mot de passe est peut-être incorrect.",
     "Recovery Key enabled" : "Clé de récupération activée",
     "Could not enable the recovery key, please try again or contact your administrator" : "Impossible d'activer la clé de récupération. Veuillez essayer à nouveau ou contacter votre administrateur",
-    "ownCloud basic encryption module" : "Module de chiffrement de base d'ownCloud",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
+    "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).",
     "Recovery key password" : "Mot de passe de la clef de récupération",
     "Repeat Recovery key password" : "Répétez le mot de passe de la clef de récupération",
diff --git a/apps/encryption/l10n/gl.js b/apps/encryption/l10n/gl.js
index 357bb0f9666..d0321b2d7c8 100644
--- a/apps/encryption/l10n/gl.js
+++ b/apps/encryption/l10n/gl.js
@@ -15,8 +15,8 @@ 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.",
-    "ownCloud basic encryption module" : "Módulo básico de cifrado de ownCloud",
     "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):",
     "Recovery key password" : "Contrasinal da chave de recuperación",
     "Repeat Recovery key password" : "Repita o contrasinal da chave de recuperación",
diff --git a/apps/encryption/l10n/gl.json b/apps/encryption/l10n/gl.json
index 1a55b743ae1..6c803f3cf7f 100644
--- a/apps/encryption/l10n/gl.json
+++ b/apps/encryption/l10n/gl.json
@@ -13,8 +13,8 @@
     "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.",
-    "ownCloud basic encryption module" : "Módulo básico de cifrado de ownCloud",
     "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):",
     "Recovery key password" : "Contrasinal da chave de recuperación",
     "Repeat Recovery key password" : "Repita o contrasinal da chave de recuperación",
diff --git a/apps/encryption/l10n/pt_BR.js b/apps/encryption/l10n/pt_BR.js
index 498349d85e7..43a872d3bc4 100644
--- a/apps/encryption/l10n/pt_BR.js
+++ b/apps/encryption/l10n/pt_BR.js
@@ -15,8 +15,8 @@ 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",
-    "ownCloud basic encryption module" : "Modo de criptografia básico ownCloud",
     "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):",
     "Recovery key password" : "Senha da chave de recuperação",
     "Repeat Recovery key password" : "Repita Recuperação de senha da chave",
diff --git a/apps/encryption/l10n/pt_BR.json b/apps/encryption/l10n/pt_BR.json
index 9f9797a43ef..4e566f95878 100644
--- a/apps/encryption/l10n/pt_BR.json
+++ b/apps/encryption/l10n/pt_BR.json
@@ -13,8 +13,8 @@
     "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",
-    "ownCloud basic encryption module" : "Modo de criptografia básico ownCloud",
     "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):",
     "Recovery key password" : "Senha da chave de recuperação",
     "Repeat Recovery key password" : "Repita Recuperação de senha da chave",
diff --git a/apps/encryption/l10n/sr.js b/apps/encryption/l10n/sr.js
index 7078b070136..4383f25f638 100644
--- a/apps/encryption/l10n/sr.js
+++ b/apps/encryption/l10n/sr.js
@@ -15,8 +15,8 @@ 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" : "Не могу да укључим кључ опоравка. Покушајте поново или контактирајте администратора",
-    "ownCloud basic encryption module" : "оунКлауд основни шифрарски модул",
     "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/sr.json b/apps/encryption/l10n/sr.json
index 3aeda58af1a..b69e4fa2b3e 100644
--- a/apps/encryption/l10n/sr.json
+++ b/apps/encryption/l10n/sr.json
@@ -13,8 +13,8 @@
     "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" : "Не могу да укључим кључ опоравка. Покушајте поново или контактирајте администратора",
-    "ownCloud basic encryption module" : "оунКлауд основни шифрарски модул",
     "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/files/l10n/fr.js b/apps/files/l10n/fr.js
index 997b916b051..34d92155970 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -67,7 +67,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} et {files}",
     "Favorited" : "Marqué comme favori",
     "Favorite" : "Favoris",
-    "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la tentative de mise à jour des étiquettes",
+    "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes",
     "A new file or folder has been <strong>created</strong>" : "Un nouveau fichier ou répertoire a été <strong>créé</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un fichier ou un répertoire a été <strong>modifié</strong>",
     "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limiter les notifications à ce qui concerne la création et la modification de vos <strong>fichiers favoris</strong> <em>(Flux uniquement)</em>",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index c27bdd6ca6d..66b527512d1 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -65,7 +65,7 @@
     "{dirs} and {files}" : "{dirs} et {files}",
     "Favorited" : "Marqué comme favori",
     "Favorite" : "Favoris",
-    "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la tentative de mise à jour des étiquettes",
+    "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes",
     "A new file or folder has been <strong>created</strong>" : "Un nouveau fichier ou répertoire a été <strong>créé</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un fichier ou un répertoire a été <strong>modifié</strong>",
     "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limiter les notifications à ce qui concerne la création et la modification de vos <strong>fichiers favoris</strong> <em>(Flux uniquement)</em>",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index b5804618a9a..f63553fe50a 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -66,7 +66,7 @@ OC.L10N.register(
     "No external storage configured" : "Aucun stockage externe configuré",
     "You can add external storages in the personal settings" : "Vous pouvez ajouter des stockages externes dans les paramètres personnels",
     "Name" : "Nom",
-    "Storage type" : "Type de support de stockage",
+    "Storage type" : "Type de stockage",
     "Scope" : "Portée",
     "External Storage" : "Stockage externe",
     "Folder name" : "Nom du dossier",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index e72a6d1bf7f..af99c2c935a 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -64,7 +64,7 @@
     "No external storage configured" : "Aucun stockage externe configuré",
     "You can add external storages in the personal settings" : "Vous pouvez ajouter des stockages externes dans les paramètres personnels",
     "Name" : "Nom",
-    "Storage type" : "Type de support de stockage",
+    "Storage type" : "Type de stockage",
     "Scope" : "Portée",
     "External Storage" : "Stockage externe",
     "Folder name" : "Nom du dossier",
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index 54d1f88ef0e..0ed5c63a209 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Download %s" : "Télécharger %s",
     "Direct link" : "Lien direct",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
+    "Open documentation" : "Voir la documentation",
     "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs",
     "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs"
 },
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index 370ca5e3c49..b997b89ae57 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -54,6 +54,7 @@
     "Download %s" : "Télécharger %s",
     "Direct link" : "Lien direct",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
+    "Open documentation" : "Voir la documentation",
     "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs",
     "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/user_ldap/l10n/da.js b/apps/user_ldap/l10n/da.js
index 6db29699fcf..b5a0183f9f0 100644
--- a/apps/user_ldap/l10n/da.js
+++ b/apps/user_ldap/l10n/da.js
@@ -10,15 +10,38 @@ OC.L10N.register(
     "No configuration specified" : "Der er ikke angivet en konfiguration",
     "No data specified" : "Der er ikke angivet data",
     " Could not set configuration %s" : "Kunne ikke indstille konfigurationen %s",
+    "Action does not exist" : "Handlingen findes ikke",
     "Configuration incorrect" : "Konfigurationen er ikke korrekt",
     "Configuration incomplete" : "Konfigurationen er ikke komplet",
     "Configuration OK" : "Konfigurationen er OK",
     "Select groups" : "Vælg grupper",
     "Select object classes" : "Vælg objektklasser",
+    "Please check the credentials, they seem to be wrong." : "Tjek venligst brugeroplysningerne - de ser ud til at være forkerte.",
+    "Please specify the port, it could not be auto-detected." : "Angiv venligst porten - den kunne ikke registreres automatisk.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Base DN kunne ikke registreres automatisk - gennemse venligst brugeroplysningerne, vært og port.",
+    "Could not detect Base DN, please enter it manually." : "Kunne ikke registrere Base DN - angiv den venligst manuelt.",
     "{nthServer}. Server" : "{nthServer}. server",
+    "No object found in the given Base DN. Please revise." : "Intet objekt fundet i den givne Base DN. Gennemse venligst.",
+    "More then 1.000 directory entries available." : "Mere end 1.000 tilgængelige katalogposter.",
+    " entries available within the provided Base DN" : "poster tilgængelige inden for det angivne Base DN.",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Der opstod en fejl. Tjek venligst Base DN, såvel som forbindelsesindstillingerne og brugeroplysningerne.",
     "Do you really want to delete the current Server Configuration?" : "Ønsker du virkelig at slette den nuværende Server Konfiguration?",
     "Confirm Deletion" : "Bekræft Sletning",
+    "Mappings cleared successfully!" : "Kortlægningerne blev ryddet af vejen!",
+    "Error while clearing the mappings." : "Fejl under rydning af kortlægninger.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Lagringen mislykkedes. Sørg venligst for at databasen er i drift. Genindlæs for der fortsættes.",
+    "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?" : "Skift af tilstanden vil betyde aktivering af automatiske LDAP-forespørgsler. Afhængig af størrelsen på din LDAP, vil det kunne tage noget tid. Ønsker du stadig at ændre tilstanden?",
+    "Mode switch" : "Skift af tilstand",
     "Select attributes" : "Vælg attributter",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Bruger blev ikke fundet. Tjek venligst dine login-attributter og brugernavnet. Gældende filter (til kopiér-og-indsæt for validering via kommandolinje): <br/>",
+    "User found and settings verified." : "Bruger blev fundetog indstillingerne bekræftet.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Indstillingerne blev verificieret, men én bruger blev fundet. Det er blot den første, der vil kunne logge ind. Overvej et mere begrænset filter.",
+    "An unspecified error occurred. Please check the settings and the log." : "Der opstod en uspecificeret fejl. Tjek venligst indstillingerne og loggen.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Søgefilteret er ugyldigt - sandsynligvis på grund af problemer med syntaksen, såsom et ulige antal åbne og lukkede parenteser. Gennemse venligst. ",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Der opstod en forbindelsesfejl til LDAP/AD - tjek venligst vært, port og brugeroplysninger.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "Pladsholderen for %uid mangler. Den vil blive erstattes med loginnavnet, når LDAP/AD forespørges.",
+    "Please provide a login name to test against" : "Angiv venligst et loginnavn for at teste mod",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Gruppeboksen var slået fra, fordi LDAP/AD-serveren ikke understøtter memberOf.",
     "_%s group found_::_%s groups found_" : ["Der blev fundet %s gruppe","Der blev fundet %s grupper"],
     "_%s user found_::_%s users found_" : ["Der blev fundet %s bruger","Der blev fundet %s brugere"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunne ikke registrere navneattributten for visning af bruger. Angiv den venligst selv i de avancerede ldap-indstillinger.",
@@ -26,29 +49,50 @@ OC.L10N.register(
     "Invalid Host" : "Ugyldig vært",
     "Server" : "Server",
     "Users" : "Brugere",
+    "Login Attributes" : "Login-attributter",
     "Groups" : "Grupper",
     "Test Configuration" : "Test Konfiguration",
     "Help" : "Hjælp",
     "Groups meeting these criteria are available in %s:" : "Grupper som opfylder disse kriterier er tilgængelige i %s:",
+    "Only these object classes:" : "Kun disse objektklasser:",
+    "Only from these groups:" : "Kun fra disse grupper:",
+    "Search groups" : "Søg grupper",
+    "Available groups" : "Tilgængelige grupper",
+    "Selected groups" : "Valgte grupper",
+    "Edit LDAP Query" : "Redigér LDAP-forespørgsel",
+    "LDAP Filter:" : "LDAP-filter:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filteret angiver hvilke LDAP-grupper, der skal have adgang til instansen %s.",
     "Test Filter" : "Test filter",
+    "Verify settings and count groups" : "Verificér indstillinger og optællingsgrupper",
+    "When logging in, %s will find the user based on the following attributes:" : "Når der logges ind, så vil %s finde brugeren baseret på følgende attributter:",
+    "LDAP / AD Username:" : "LDAP/AD-brugernavn:",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Tillader login mod LDAP/AD-brugernavnet, hvilket enten er et uid eller samaccountname, og vil blive detekteret.",
+    "LDAP / AD Email Address:" : "E-mailadresser for LDAP/AD:",
+    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Tillader login mod en e-mailattribut. Mail og mailPrimaryAddress vil være tilladt.",
     "Other Attributes:" : "Andre attributter:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer dét filter der anvendes, når der er forsøg på at logge ind. %%uuid erstattter brugernavnet i login-handlingen. Eksempel: \"uid=%%uuid\"",
+    "Test Loginname" : "Test loginnavn",
+    "Verify settings" : "Verificér indstillinger",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
     "Host" : "Vært",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://",
     "Port" : "Port",
+    "Detect Port" : "Registrér port",
     "User DN" : "Bruger 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'et for klientbrugeren, for hvilken forbindelsen skal foretages, eks. uid=agent,dc=eksempel,dc=com. For anonym adgang lades DN og Password stå tomme.",
     "Password" : "Kodeord",
     "For anonymous access, leave DN and Password empty." : "For anonym adgang, skal du lade DN og Adgangskode tomme.",
     "One Base DN per line" : "Ét Base DN per linje",
     "You can specify Base DN for users and groups in the Advanced tab" : "Du kan specificere base DN for brugere og grupper i fanen Advanceret",
+    "Detect Base DN" : "Registrér Base DN",
+    "Test Base DN" : "Test Base DN",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Undgår automatiske LDAP-forespørgsler. Bedre på større opsætninger, men kræver en del LDAP-kendskab.",
     "Manually enter LDAP filters (recommended for large directories)" : "Angiv LDAP-filtre manuelt (anbefales til større kataloger)",
     "Limit %s access to users meeting these criteria:" : "Begræns %s-adgangen til brugere som imødekommer disse kriterier:",
+    "The 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." : "De fleste gængse objektklasser for brugere er organizationalPerson, person, user og inetOrgPerson. Hvis du ikker er sikker på hvilken objektklasse, der skal vælges, så tal med administratoren af dit katalog.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret angiver hvilke LDAP-brugere, der skal have adgang til %s-instansen.",
+    "Verify settings and count users" : "Verificér indstillinger og optalte brugere",
     "Saving" : "Gemmer",
     "Back" : "Tilbage",
     "Continue" : "Videre",
diff --git a/apps/user_ldap/l10n/da.json b/apps/user_ldap/l10n/da.json
index ffbc502f76b..f57c8d212ef 100644
--- a/apps/user_ldap/l10n/da.json
+++ b/apps/user_ldap/l10n/da.json
@@ -8,15 +8,38 @@
     "No configuration specified" : "Der er ikke angivet en konfiguration",
     "No data specified" : "Der er ikke angivet data",
     " Could not set configuration %s" : "Kunne ikke indstille konfigurationen %s",
+    "Action does not exist" : "Handlingen findes ikke",
     "Configuration incorrect" : "Konfigurationen er ikke korrekt",
     "Configuration incomplete" : "Konfigurationen er ikke komplet",
     "Configuration OK" : "Konfigurationen er OK",
     "Select groups" : "Vælg grupper",
     "Select object classes" : "Vælg objektklasser",
+    "Please check the credentials, they seem to be wrong." : "Tjek venligst brugeroplysningerne - de ser ud til at være forkerte.",
+    "Please specify the port, it could not be auto-detected." : "Angiv venligst porten - den kunne ikke registreres automatisk.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Base DN kunne ikke registreres automatisk - gennemse venligst brugeroplysningerne, vært og port.",
+    "Could not detect Base DN, please enter it manually." : "Kunne ikke registrere Base DN - angiv den venligst manuelt.",
     "{nthServer}. Server" : "{nthServer}. server",
+    "No object found in the given Base DN. Please revise." : "Intet objekt fundet i den givne Base DN. Gennemse venligst.",
+    "More then 1.000 directory entries available." : "Mere end 1.000 tilgængelige katalogposter.",
+    " entries available within the provided Base DN" : "poster tilgængelige inden for det angivne Base DN.",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Der opstod en fejl. Tjek venligst Base DN, såvel som forbindelsesindstillingerne og brugeroplysningerne.",
     "Do you really want to delete the current Server Configuration?" : "Ønsker du virkelig at slette den nuværende Server Konfiguration?",
     "Confirm Deletion" : "Bekræft Sletning",
+    "Mappings cleared successfully!" : "Kortlægningerne blev ryddet af vejen!",
+    "Error while clearing the mappings." : "Fejl under rydning af kortlægninger.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Lagringen mislykkedes. Sørg venligst for at databasen er i drift. Genindlæs for der fortsættes.",
+    "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?" : "Skift af tilstanden vil betyde aktivering af automatiske LDAP-forespørgsler. Afhængig af størrelsen på din LDAP, vil det kunne tage noget tid. Ønsker du stadig at ændre tilstanden?",
+    "Mode switch" : "Skift af tilstand",
     "Select attributes" : "Vælg attributter",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Bruger blev ikke fundet. Tjek venligst dine login-attributter og brugernavnet. Gældende filter (til kopiér-og-indsæt for validering via kommandolinje): <br/>",
+    "User found and settings verified." : "Bruger blev fundetog indstillingerne bekræftet.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Indstillingerne blev verificieret, men én bruger blev fundet. Det er blot den første, der vil kunne logge ind. Overvej et mere begrænset filter.",
+    "An unspecified error occurred. Please check the settings and the log." : "Der opstod en uspecificeret fejl. Tjek venligst indstillingerne og loggen.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Søgefilteret er ugyldigt - sandsynligvis på grund af problemer med syntaksen, såsom et ulige antal åbne og lukkede parenteser. Gennemse venligst. ",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Der opstod en forbindelsesfejl til LDAP/AD - tjek venligst vært, port og brugeroplysninger.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "Pladsholderen for %uid mangler. Den vil blive erstattes med loginnavnet, når LDAP/AD forespørges.",
+    "Please provide a login name to test against" : "Angiv venligst et loginnavn for at teste mod",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Gruppeboksen var slået fra, fordi LDAP/AD-serveren ikke understøtter memberOf.",
     "_%s group found_::_%s groups found_" : ["Der blev fundet %s gruppe","Der blev fundet %s grupper"],
     "_%s user found_::_%s users found_" : ["Der blev fundet %s bruger","Der blev fundet %s brugere"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunne ikke registrere navneattributten for visning af bruger. Angiv den venligst selv i de avancerede ldap-indstillinger.",
@@ -24,29 +47,50 @@
     "Invalid Host" : "Ugyldig vært",
     "Server" : "Server",
     "Users" : "Brugere",
+    "Login Attributes" : "Login-attributter",
     "Groups" : "Grupper",
     "Test Configuration" : "Test Konfiguration",
     "Help" : "Hjælp",
     "Groups meeting these criteria are available in %s:" : "Grupper som opfylder disse kriterier er tilgængelige i %s:",
+    "Only these object classes:" : "Kun disse objektklasser:",
+    "Only from these groups:" : "Kun fra disse grupper:",
+    "Search groups" : "Søg grupper",
+    "Available groups" : "Tilgængelige grupper",
+    "Selected groups" : "Valgte grupper",
+    "Edit LDAP Query" : "Redigér LDAP-forespørgsel",
+    "LDAP Filter:" : "LDAP-filter:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filteret angiver hvilke LDAP-grupper, der skal have adgang til instansen %s.",
     "Test Filter" : "Test filter",
+    "Verify settings and count groups" : "Verificér indstillinger og optællingsgrupper",
+    "When logging in, %s will find the user based on the following attributes:" : "Når der logges ind, så vil %s finde brugeren baseret på følgende attributter:",
+    "LDAP / AD Username:" : "LDAP/AD-brugernavn:",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Tillader login mod LDAP/AD-brugernavnet, hvilket enten er et uid eller samaccountname, og vil blive detekteret.",
+    "LDAP / AD Email Address:" : "E-mailadresser for LDAP/AD:",
+    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Tillader login mod en e-mailattribut. Mail og mailPrimaryAddress vil være tilladt.",
     "Other Attributes:" : "Andre attributter:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer dét filter der anvendes, når der er forsøg på at logge ind. %%uuid erstattter brugernavnet i login-handlingen. Eksempel: \"uid=%%uuid\"",
+    "Test Loginname" : "Test loginnavn",
+    "Verify settings" : "Verificér indstillinger",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
     "Host" : "Vært",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://",
     "Port" : "Port",
+    "Detect Port" : "Registrér port",
     "User DN" : "Bruger 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'et for klientbrugeren, for hvilken forbindelsen skal foretages, eks. uid=agent,dc=eksempel,dc=com. For anonym adgang lades DN og Password stå tomme.",
     "Password" : "Kodeord",
     "For anonymous access, leave DN and Password empty." : "For anonym adgang, skal du lade DN og Adgangskode tomme.",
     "One Base DN per line" : "Ét Base DN per linje",
     "You can specify Base DN for users and groups in the Advanced tab" : "Du kan specificere base DN for brugere og grupper i fanen Advanceret",
+    "Detect Base DN" : "Registrér Base DN",
+    "Test Base DN" : "Test Base DN",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Undgår automatiske LDAP-forespørgsler. Bedre på større opsætninger, men kræver en del LDAP-kendskab.",
     "Manually enter LDAP filters (recommended for large directories)" : "Angiv LDAP-filtre manuelt (anbefales til større kataloger)",
     "Limit %s access to users meeting these criteria:" : "Begræns %s-adgangen til brugere som imødekommer disse kriterier:",
+    "The 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." : "De fleste gængse objektklasser for brugere er organizationalPerson, person, user og inetOrgPerson. Hvis du ikker er sikker på hvilken objektklasse, der skal vælges, så tal med administratoren af dit katalog.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret angiver hvilke LDAP-brugere, der skal have adgang til %s-instansen.",
+    "Verify settings and count users" : "Verificér indstillinger og optalte brugere",
     "Saving" : "Gemmer",
     "Back" : "Tilbage",
     "Continue" : "Videre",
diff --git a/apps/user_ldap/l10n/es.js b/apps/user_ldap/l10n/es.js
index 7c62430966a..84297d32ba5 100644
--- a/apps/user_ldap/l10n/es.js
+++ b/apps/user_ldap/l10n/es.js
@@ -18,11 +18,30 @@ OC.L10N.register(
     "Select object classes" : "Seleccionar la clase de objeto",
     "Please check the credentials, they seem to be wrong." : "Por favor verifique las credenciales, parecen no ser correctas.",
     "Please specify the port, it could not be auto-detected." : "Por favor especifique el puerto, no pudo ser auto-detectado.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Base DN no puede ser detectada automáticamente, por favor revise credenciales, host y puerto.",
+    "Could not detect Base DN, please enter it manually." : "No se pudo detectar Base DN, por favor ingrésela manualmente.",
     "{nthServer}. Server" : "{nthServer}. servidor",
+    "No object found in the given Base DN. Please revise." : "No se encuentra ningún objeto en la Base DN dada. Por favor revisar.",
+    "More then 1.000 directory entries available." : "Más de 1.000 entradas de directorios disponibles.",
+    " entries available within the provided Base DN" : "entradas disponibles dentro de la BaseDN provista",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Un error ocurrió. Por favor revise la Base DN, también como la configuración de la conexión y credenciales.",
     "Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
     "Confirm Deletion" : "Confirmar eliminación",
+    "Mappings cleared successfully!" : "Asignaciones borrado exitosamente!",
+    "Error while clearing the mappings." : "Error mientras se borraban las asignaciones.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Guardado fallido. Por favor, asegúrese que la base de datos esta en Operación. Actualizar antes de continuar.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Cambiando el modo habilitará automáticamente las consultas LDAP. Dependiendo del tamaño de su LDAP puede tardar un rato. Desea cambiar el modo?",
+    "Mode switch" : "Modo interruptor",
     "Select attributes" : "Seleccionar atributos",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Usuario no encontrado. Por favor verifique los atributos de inicio de sesión y nombre de usuario. Filtro eficaz (copie-y-pegue para validar desde la línea de comando):<br/>",
     "User found and settings verified." : "Usuario encontrado y configuración verificada.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Configuración verificada, pero no se encuentra ningún usuario. Sólo el primero podrá iniciar sesión. Considere un filtro más estrecho.",
+    "An unspecified error occurred. Please check the settings and the log." : "Un error no especificado ocurrió. Por favor verifique las configuraciones y el registro.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "El filtro de búsqueda es inválido, probablemente debido a problemas de sintáxis tales como números impares de paréntesis abiertos y cerrados. Por favor revíselos.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Un error de conexión a LDAP / AD ocurrió, por favor verifique host, puerto y credenciales.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "El marcador de posición %uid no está presente. Será reemplazado con el nombre de inicio de sesión cuando se consulte LDAP / AD.",
+    "Please provide a login name to test against" : "Por favor suministre un nombre de inicio de sesión para probar",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "El cuadro de grupo fue deshabilitado, porque el servidor LDAP / AD no admite memberOf.",
     "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","Grupos %s encontrados"],
     "_%s user found_::_%s users found_" : ["Usuario %s encontrado","Usuarios %s encontrados"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "No se pudo detectar el atributo de nombre de usuario pantalla. Por favor especifique lo mismo en ajustes avanzados ldap.",
@@ -30,16 +49,24 @@ OC.L10N.register(
     "Invalid Host" : "Host inválido",
     "Server" : "Servidor",
     "Users" : "Usuarios",
+    "Login Attributes" : "Atributos de inicio de sesión",
     "Groups" : "Grupos",
     "Test Configuration" : "Configuración de prueba",
     "Help" : "Ayuda",
     "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen estos criterios están disponibles en %s:",
+    "Only these object classes:" : "Sólo estas clases de objetos:",
+    "Only from these groups:" : "Sólo desde estos grupos:",
+    "Search groups" : "Buscar grupos",
     "Available groups" : "Grupos disponibles",
     "Selected groups" : "Grupos seleccionados",
     "Edit LDAP Query" : "Editar consulta LDAP",
     "LDAP Filter:" : "Filtro LDAP:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica que grupos LDAP tendrán acceso a %s.",
     "Test Filter" : "Filtro de prueba",
+    "Verify settings and count groups" : "Verificar configuraciones y contar grupos",
+    "When logging in, %s will find the user based on the following attributes:" : "Cuando se inicia sesión, %s encontrará al usuario basado en los siguientes atributos:",
+    "LDAP / AD Username:" : "Nombre de usuario LDAP /AD:",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Permite el inicio de sesión contra el nombre de usuario LDAP / AD, el cual es o el uid o samaccountname y será detectado.",
     "LDAP / AD Email Address:" : "LDAP / AD dirección de correo electrónico:",
     "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Permite el inicio de sesión contra un atributo de correo electrónico. Correo y dirección primario de correo electrónico está habilitada.",
     "Other Attributes:" : "Otros atributos:",
@@ -63,6 +90,7 @@ OC.L10N.register(
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita peticiones automáticas al LDAP. Mejor para grandes configuraciones, pero requiere cierto conocimiento de LDAP.",
     "Manually enter LDAP filters (recommended for large directories)" : "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)",
     "Limit %s access to users meeting these criteria:" : "Limitar el acceso a %s a los usuarios que cumplan estos criterios:",
+    "The 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." : "Los objetos de clases más comunes para los usuarios son organizationalPerson, persona, usuario y inetOrgPerson. Si no está seguro que objeto de clase seleccionar, por favor consulte con su administrador de directorio. ",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
     "Verify settings and count users" : "Verificar configuración y contar usuarios",
     "Saving" : "Guardando",
diff --git a/apps/user_ldap/l10n/es.json b/apps/user_ldap/l10n/es.json
index c5605e10676..7a9448882fe 100644
--- a/apps/user_ldap/l10n/es.json
+++ b/apps/user_ldap/l10n/es.json
@@ -16,11 +16,30 @@
     "Select object classes" : "Seleccionar la clase de objeto",
     "Please check the credentials, they seem to be wrong." : "Por favor verifique las credenciales, parecen no ser correctas.",
     "Please specify the port, it could not be auto-detected." : "Por favor especifique el puerto, no pudo ser auto-detectado.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Base DN no puede ser detectada automáticamente, por favor revise credenciales, host y puerto.",
+    "Could not detect Base DN, please enter it manually." : "No se pudo detectar Base DN, por favor ingrésela manualmente.",
     "{nthServer}. Server" : "{nthServer}. servidor",
+    "No object found in the given Base DN. Please revise." : "No se encuentra ningún objeto en la Base DN dada. Por favor revisar.",
+    "More then 1.000 directory entries available." : "Más de 1.000 entradas de directorios disponibles.",
+    " entries available within the provided Base DN" : "entradas disponibles dentro de la BaseDN provista",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Un error ocurrió. Por favor revise la Base DN, también como la configuración de la conexión y credenciales.",
     "Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
     "Confirm Deletion" : "Confirmar eliminación",
+    "Mappings cleared successfully!" : "Asignaciones borrado exitosamente!",
+    "Error while clearing the mappings." : "Error mientras se borraban las asignaciones.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Guardado fallido. Por favor, asegúrese que la base de datos esta en Operación. Actualizar antes de continuar.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Cambiando el modo habilitará automáticamente las consultas LDAP. Dependiendo del tamaño de su LDAP puede tardar un rato. Desea cambiar el modo?",
+    "Mode switch" : "Modo interruptor",
     "Select attributes" : "Seleccionar atributos",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Usuario no encontrado. Por favor verifique los atributos de inicio de sesión y nombre de usuario. Filtro eficaz (copie-y-pegue para validar desde la línea de comando):<br/>",
     "User found and settings verified." : "Usuario encontrado y configuración verificada.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Configuración verificada, pero no se encuentra ningún usuario. Sólo el primero podrá iniciar sesión. Considere un filtro más estrecho.",
+    "An unspecified error occurred. Please check the settings and the log." : "Un error no especificado ocurrió. Por favor verifique las configuraciones y el registro.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "El filtro de búsqueda es inválido, probablemente debido a problemas de sintáxis tales como números impares de paréntesis abiertos y cerrados. Por favor revíselos.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Un error de conexión a LDAP / AD ocurrió, por favor verifique host, puerto y credenciales.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "El marcador de posición %uid no está presente. Será reemplazado con el nombre de inicio de sesión cuando se consulte LDAP / AD.",
+    "Please provide a login name to test against" : "Por favor suministre un nombre de inicio de sesión para probar",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "El cuadro de grupo fue deshabilitado, porque el servidor LDAP / AD no admite memberOf.",
     "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","Grupos %s encontrados"],
     "_%s user found_::_%s users found_" : ["Usuario %s encontrado","Usuarios %s encontrados"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "No se pudo detectar el atributo de nombre de usuario pantalla. Por favor especifique lo mismo en ajustes avanzados ldap.",
@@ -28,16 +47,24 @@
     "Invalid Host" : "Host inválido",
     "Server" : "Servidor",
     "Users" : "Usuarios",
+    "Login Attributes" : "Atributos de inicio de sesión",
     "Groups" : "Grupos",
     "Test Configuration" : "Configuración de prueba",
     "Help" : "Ayuda",
     "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen estos criterios están disponibles en %s:",
+    "Only these object classes:" : "Sólo estas clases de objetos:",
+    "Only from these groups:" : "Sólo desde estos grupos:",
+    "Search groups" : "Buscar grupos",
     "Available groups" : "Grupos disponibles",
     "Selected groups" : "Grupos seleccionados",
     "Edit LDAP Query" : "Editar consulta LDAP",
     "LDAP Filter:" : "Filtro LDAP:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica que grupos LDAP tendrán acceso a %s.",
     "Test Filter" : "Filtro de prueba",
+    "Verify settings and count groups" : "Verificar configuraciones y contar grupos",
+    "When logging in, %s will find the user based on the following attributes:" : "Cuando se inicia sesión, %s encontrará al usuario basado en los siguientes atributos:",
+    "LDAP / AD Username:" : "Nombre de usuario LDAP /AD:",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Permite el inicio de sesión contra el nombre de usuario LDAP / AD, el cual es o el uid o samaccountname y será detectado.",
     "LDAP / AD Email Address:" : "LDAP / AD dirección de correo electrónico:",
     "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Permite el inicio de sesión contra un atributo de correo electrónico. Correo y dirección primario de correo electrónico está habilitada.",
     "Other Attributes:" : "Otros atributos:",
@@ -61,6 +88,7 @@
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita peticiones automáticas al LDAP. Mejor para grandes configuraciones, pero requiere cierto conocimiento de LDAP.",
     "Manually enter LDAP filters (recommended for large directories)" : "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)",
     "Limit %s access to users meeting these criteria:" : "Limitar el acceso a %s a los usuarios que cumplan estos criterios:",
+    "The 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." : "Los objetos de clases más comunes para los usuarios son organizationalPerson, persona, usuario y inetOrgPerson. Si no está seguro que objeto de clase seleccionar, por favor consulte con su administrador de directorio. ",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
     "Verify settings and count users" : "Verificar configuración y contar usuarios",
     "Saving" : "Guardando",
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
index cd71fa7905c..193094fca59 100644
--- a/apps/user_ldap/l10n/fr.js
+++ b/apps/user_ldap/l10n/fr.js
@@ -36,6 +36,12 @@ OC.L10N.register(
     "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Utilisateur introuvable. Veuillez vérifier les attributs de login et le nom d'utilisateur. Filtre effectif (à copier-coller pour valider en ligne de commande):<br/>",
     "User found and settings verified." : "Utilisateur trouvé et paramètres vérifiés.",
     "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres vérifiés, mais seul le premier utilisateur pourra se connecter. Considérez utiliser un filtre plus restrictif.",
+    "An unspecified error occurred. Please check the settings and the log." : "Une erreur non spécifiée s'est produite. Veuillez vérifier les paramètres et le log.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Le filtre de recherche n'est pas valide, probablement à cause de problèmes de syntaxe tels que des parenthèses manquantes. Veuillez le corriger.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Une erreur s'est produite à la connexion au LDAP / AD. Veuillez vérifier l'hôte, le port et les informations d'identification.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "La chaîne %uid est manquante. Cette chaîne est remplacée par l'identifiant de connexion lors des requêtes LDAP / AD.",
+    "Please provide a login name to test against" : "Veuillez indiquer un identifiant de connexion avec lequel tester.",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Les groupes sont désactivés car le serveur LDAP / AD ne prend pas en charge memberOf.",
     "_%s group found_::_%s groups found_" : ["%s groupe trouvé","%s groupes trouvés"],
     "_%s user found_::_%s users found_" : ["%s utilisateur trouvé","%s utilisateurs trouvés"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossible de détecter l'attribut contenant le nom d'affichage des utilisateurs. Veuillez l'indiquer vous-même dans les paramètres ldap avancés.",
@@ -43,36 +49,57 @@ OC.L10N.register(
     "Invalid Host" : "Hôte non valide",
     "Server" : "Serveur",
     "Users" : "Utilisateurs",
+    "Login Attributes" : "Attributs de login",
     "Groups" : "Groupes",
     "Test Configuration" : "Tester la configuration",
     "Help" : "Aide",
     "Groups meeting these criteria are available in %s:" : "Les groupes respectant ces critères sont disponibles dans %s :",
+    "Only these object classes:" : "Seulement ces classes d'objets :",
+    "Only from these groups:" : "Seulement dans ces groupes :",
+    "Search groups" : "Chercher dans les groupes",
+    "Available groups" : "Chercher dans les utilisateurs",
+    "Selected groups" : "Groupes sélectionnés",
+    "Edit LDAP Query" : "Modifier la requête LDAP",
+    "LDAP Filter:" : "Filtre LDAP :",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Le filtre spécifie quels groupes LDAP ont accès à l'instance %s.",
     "Test Filter" : "Test du filtre",
+    "Verify settings and count groups" : "Vérifier les paramètres et compter les groupes",
+    "When logging in, %s will find the user based on the following attributes:" : "Au login, %s cherchera l'utilisateur sur base de ces attributs :",
+    "LDAP / AD Username:" : "Nom d'utilisateur LDAP / AD :",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Autoriser le login avec le nom d'utilisateur LDAP / AD (uid ou samaccountname, la détection est automatique). ",
+    "LDAP / AD Email Address:" : "Adresse mail LDAP / AD :",
+    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Autoriser le login avec une adresse mail. Mail et mailPrimaryAddress sont autorisés.",
     "Other Attributes:" : "Autres attributs :",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur. Exemple : \"uid=%%uid\"",
+    "Test Loginname" : "Loginname de test",
+    "Verify settings" : "Tester les paramètres",
     "1. Server" : "1. Serveur",
     "%s. Server:" : "%s. Serveur :",
     "Host" : "Hôte",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
     "Port" : "Port",
+    "Detect Port" : "Détecter le port",
     "User DN" : "DN Utilisateur (Autorisé à consulter l'annuaire)",
     "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 de l'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accès anonyme, laisser le DN et le mot de passe vides.",
     "Password" : "Mot de passe",
     "For anonymous access, leave DN and Password empty." : "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
     "One Base DN per line" : "Un DN de base par ligne",
     "You can specify Base DN for users and groups in the Advanced tab" : "Vous pouvez spécifier les DN de base de vos utilisateurs et groupes via l'onglet Avancé",
+    "Detect Base DN" : "Détecter le DN de base",
+    "Test Base DN" : "Tester le DN de base",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Évite les requêtes LDAP automatiques. Mieux pour les installations de grande ampleur, mais demande des connaissances en LDAP.",
     "Manually enter LDAP filters (recommended for large directories)" : "Entrée manuelle des filtres LDAP (recommandé pour les annuaires de grande ampleur)",
     "Limit %s access to users meeting these criteria:" : "Limiter l'accès à %s aux utilisateurs respectant ces critères :",
+    "The 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." : "Les classes d'objets fréquentes pour les utilisateurs sont : organizationalPerson, person, user et inetOrgPerson. Si vous n'êtes pas sûr de la classe à utiliser, demandez à l'administrateur de l'annuaire.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Le filtre spécifie quels utilisateurs LDAP doivent avoir accès à l'instance %s.",
+    "Verify settings and count users" : "Vérifier les paramètres et compter les utilisateurs",
     "Saving" : "Enregistrement...",
     "Back" : "Retour",
     "Continue" : "Poursuivre",
     "LDAP" : "LDAP",
     "Expert" : "Expert",
     "Advanced" : "Avancé",
-    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
+    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il en désactive une.",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Attention :</b> Le module php LDAP n'est pas installé, par conséquent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur système afin qu'il l'installe.",
     "Connection Settings" : "Paramètres de connexion",
     "Configuration Active" : "Configuration active",
@@ -81,7 +108,7 @@ OC.L10N.register(
     "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Fournir un serveur de backup optionnel.  Il doit s'agir d'une réplique du serveur LDAP/AD principal.",
     "Backup (Replica) Port" : "Port du serveur de backup (réplique)",
     "Disable Main Server" : "Désactiver le serveur principal",
-    "Only connect to the replica server." : "Se connecter uniquement au serveur de replica.",
+    "Only connect to the replica server." : "Se connecter uniquement à la réplique",
     "Case insensitive LDAP server (Windows)" : "Serveur LDAP insensible à la casse (Windows)",
     "Turn off SSL certificate validation." : "Désactiver la validation des certificats SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s.",
@@ -102,8 +129,8 @@ OC.L10N.register(
     "Group-Member association" : "Association groupe-membre",
     "Nested Groups" : "Groupes imbriqués",
     "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Si activé, les groupes contenant d'autres groupes sont pris en charge (fonctionne uniquement si l'attribut membre du groupe contient des DNs).",
-    "Paging chunksize" : "Dimensionnement des paginations",
-    "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "La taille d'une part (chunksize) est utilisée pour les recherches paginées de LDAP qui peuvent retourner des résultats par lots comme une énumération d'utilisateurs ou groupes. (Configurer à 0 pour désactiver les recherches paginées de LDAP.)",
+    "Paging chunksize" : "Paging chunksize",
+    "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Chunksize utilisée pour les recherches LDAP paginées qui peuvent retourner des résultats par lots comme une énumération d'utilisateurs ou de groupes. (Configurer à 0 pour désactiver les recherches LDAP paginées)",
     "Special Attributes" : "Attributs spéciaux",
     "Quota Field" : "Champ du quota",
     "Quota Default" : "Quota par défaut",
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
index 709fe2c7ceb..b6408cfaef4 100644
--- a/apps/user_ldap/l10n/fr.json
+++ b/apps/user_ldap/l10n/fr.json
@@ -34,6 +34,12 @@
     "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Utilisateur introuvable. Veuillez vérifier les attributs de login et le nom d'utilisateur. Filtre effectif (à copier-coller pour valider en ligne de commande):<br/>",
     "User found and settings verified." : "Utilisateur trouvé et paramètres vérifiés.",
     "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres vérifiés, mais seul le premier utilisateur pourra se connecter. Considérez utiliser un filtre plus restrictif.",
+    "An unspecified error occurred. Please check the settings and the log." : "Une erreur non spécifiée s'est produite. Veuillez vérifier les paramètres et le log.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Le filtre de recherche n'est pas valide, probablement à cause de problèmes de syntaxe tels que des parenthèses manquantes. Veuillez le corriger.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Une erreur s'est produite à la connexion au LDAP / AD. Veuillez vérifier l'hôte, le port et les informations d'identification.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "La chaîne %uid est manquante. Cette chaîne est remplacée par l'identifiant de connexion lors des requêtes LDAP / AD.",
+    "Please provide a login name to test against" : "Veuillez indiquer un identifiant de connexion avec lequel tester.",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Les groupes sont désactivés car le serveur LDAP / AD ne prend pas en charge memberOf.",
     "_%s group found_::_%s groups found_" : ["%s groupe trouvé","%s groupes trouvés"],
     "_%s user found_::_%s users found_" : ["%s utilisateur trouvé","%s utilisateurs trouvés"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossible de détecter l'attribut contenant le nom d'affichage des utilisateurs. Veuillez l'indiquer vous-même dans les paramètres ldap avancés.",
@@ -41,36 +47,57 @@
     "Invalid Host" : "Hôte non valide",
     "Server" : "Serveur",
     "Users" : "Utilisateurs",
+    "Login Attributes" : "Attributs de login",
     "Groups" : "Groupes",
     "Test Configuration" : "Tester la configuration",
     "Help" : "Aide",
     "Groups meeting these criteria are available in %s:" : "Les groupes respectant ces critères sont disponibles dans %s :",
+    "Only these object classes:" : "Seulement ces classes d'objets :",
+    "Only from these groups:" : "Seulement dans ces groupes :",
+    "Search groups" : "Chercher dans les groupes",
+    "Available groups" : "Chercher dans les utilisateurs",
+    "Selected groups" : "Groupes sélectionnés",
+    "Edit LDAP Query" : "Modifier la requête LDAP",
+    "LDAP Filter:" : "Filtre LDAP :",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Le filtre spécifie quels groupes LDAP ont accès à l'instance %s.",
     "Test Filter" : "Test du filtre",
+    "Verify settings and count groups" : "Vérifier les paramètres et compter les groupes",
+    "When logging in, %s will find the user based on the following attributes:" : "Au login, %s cherchera l'utilisateur sur base de ces attributs :",
+    "LDAP / AD Username:" : "Nom d'utilisateur LDAP / AD :",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Autoriser le login avec le nom d'utilisateur LDAP / AD (uid ou samaccountname, la détection est automatique). ",
+    "LDAP / AD Email Address:" : "Adresse mail LDAP / AD :",
+    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Autoriser le login avec une adresse mail. Mail et mailPrimaryAddress sont autorisés.",
     "Other Attributes:" : "Autres attributs :",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur. Exemple : \"uid=%%uid\"",
+    "Test Loginname" : "Loginname de test",
+    "Verify settings" : "Tester les paramètres",
     "1. Server" : "1. Serveur",
     "%s. Server:" : "%s. Serveur :",
     "Host" : "Hôte",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
     "Port" : "Port",
+    "Detect Port" : "Détecter le port",
     "User DN" : "DN Utilisateur (Autorisé à consulter l'annuaire)",
     "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 de l'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accès anonyme, laisser le DN et le mot de passe vides.",
     "Password" : "Mot de passe",
     "For anonymous access, leave DN and Password empty." : "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
     "One Base DN per line" : "Un DN de base par ligne",
     "You can specify Base DN for users and groups in the Advanced tab" : "Vous pouvez spécifier les DN de base de vos utilisateurs et groupes via l'onglet Avancé",
+    "Detect Base DN" : "Détecter le DN de base",
+    "Test Base DN" : "Tester le DN de base",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Évite les requêtes LDAP automatiques. Mieux pour les installations de grande ampleur, mais demande des connaissances en LDAP.",
     "Manually enter LDAP filters (recommended for large directories)" : "Entrée manuelle des filtres LDAP (recommandé pour les annuaires de grande ampleur)",
     "Limit %s access to users meeting these criteria:" : "Limiter l'accès à %s aux utilisateurs respectant ces critères :",
+    "The 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." : "Les classes d'objets fréquentes pour les utilisateurs sont : organizationalPerson, person, user et inetOrgPerson. Si vous n'êtes pas sûr de la classe à utiliser, demandez à l'administrateur de l'annuaire.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Le filtre spécifie quels utilisateurs LDAP doivent avoir accès à l'instance %s.",
+    "Verify settings and count users" : "Vérifier les paramètres et compter les utilisateurs",
     "Saving" : "Enregistrement...",
     "Back" : "Retour",
     "Continue" : "Poursuivre",
     "LDAP" : "LDAP",
     "Expert" : "Expert",
     "Advanced" : "Avancé",
-    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
+    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il en désactive une.",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Attention :</b> Le module php LDAP n'est pas installé, par conséquent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur système afin qu'il l'installe.",
     "Connection Settings" : "Paramètres de connexion",
     "Configuration Active" : "Configuration active",
@@ -79,7 +106,7 @@
     "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Fournir un serveur de backup optionnel.  Il doit s'agir d'une réplique du serveur LDAP/AD principal.",
     "Backup (Replica) Port" : "Port du serveur de backup (réplique)",
     "Disable Main Server" : "Désactiver le serveur principal",
-    "Only connect to the replica server." : "Se connecter uniquement au serveur de replica.",
+    "Only connect to the replica server." : "Se connecter uniquement à la réplique",
     "Case insensitive LDAP server (Windows)" : "Serveur LDAP insensible à la casse (Windows)",
     "Turn off SSL certificate validation." : "Désactiver la validation des certificats SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s.",
@@ -100,8 +127,8 @@
     "Group-Member association" : "Association groupe-membre",
     "Nested Groups" : "Groupes imbriqués",
     "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Si activé, les groupes contenant d'autres groupes sont pris en charge (fonctionne uniquement si l'attribut membre du groupe contient des DNs).",
-    "Paging chunksize" : "Dimensionnement des paginations",
-    "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "La taille d'une part (chunksize) est utilisée pour les recherches paginées de LDAP qui peuvent retourner des résultats par lots comme une énumération d'utilisateurs ou groupes. (Configurer à 0 pour désactiver les recherches paginées de LDAP.)",
+    "Paging chunksize" : "Paging chunksize",
+    "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Chunksize utilisée pour les recherches LDAP paginées qui peuvent retourner des résultats par lots comme une énumération d'utilisateurs ou de groupes. (Configurer à 0 pour désactiver les recherches LDAP paginées)",
     "Special Attributes" : "Attributs spéciaux",
     "Quota Field" : "Champ du quota",
     "Quota Default" : "Quota par défaut",
diff --git a/apps/user_ldap/l10n/sr.js b/apps/user_ldap/l10n/sr.js
index 92b5a86474e..0312baf6b75 100644
--- a/apps/user_ldap/l10n/sr.js
+++ b/apps/user_ldap/l10n/sr.js
@@ -16,10 +16,23 @@ OC.L10N.register(
     "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." : "Базни ДН се не може открити. Проверите акредитиве, домаћина и порт.",
+    "Could not detect Base DN, please enter it manually." : "Не могу да откријем базни ДН. Унесите га ручно.",
     "{nthServer}. Server" : "{nthServer}. Сервер",
+    "No object found in the given Base DN. Please revise." : "Нема објекта за дати базни ДН. Проверите.",
+    "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." : "Грешка. Проверите базни ДН као и поставке везе и акредитиве.",
     "Do you really want to delete the current Server Configuration?" : "Да ли стварно желите да обришете тренутну конфигурацију сервера?",
     "Confirm Deletion" : "Потврдa брисањa",
+    "Mappings cleared successfully!" : "Мапирања успешно очишћена!",
+    "Error while clearing the mappings." : "Грешка при чишћењу мапирања.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Упис није успео. Проверите да је база у функцији. Поново учитајте пре настављања.",
+    "Mode switch" : "Промена режима",
     "Select attributes" : "Изаберите атрибуте",
+    "User found and settings verified." : "Корисник нађен и поставке проверене.",
     "_%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",
@@ -27,19 +40,26 @@ OC.L10N.register(
     "Invalid Host" : "Неважећи домаћин",
     "Server" : "Сервер",
     "Users" : "Корисници",
+    "Login Attributes" : "Атрибути пријаве",
     "Groups" : "Групе",
     "Test Configuration" : "Тестирај конфигурацију",
     "Help" : "Помоћ",
     "Groups meeting these criteria are available in %s:" : "Групе које испуњавају ове критеријуме су доступне у %s:",
+    "Search groups" : "Претражи групе",
+    "Available groups" : "Доступне групе",
+    "Selected groups" : "Изабране групе",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтер прецизира које ће LDAP групе требају имати приступ %s случају.",
     "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 замењује корисничко име при пријављивању. Пример: \"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://" : "Можете да изоставите протокол, осим ако захтевате ССЛ. У том случају почните са ldaps://",
     "Port" : "Порт",
+    "Detect Port" : "Откриј порт",
     "User DN" : "Корисников 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/sr.json b/apps/user_ldap/l10n/sr.json
index d21310f034c..97aa229839e 100644
--- a/apps/user_ldap/l10n/sr.json
+++ b/apps/user_ldap/l10n/sr.json
@@ -14,10 +14,23 @@
     "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." : "Базни ДН се не може открити. Проверите акредитиве, домаћина и порт.",
+    "Could not detect Base DN, please enter it manually." : "Не могу да откријем базни ДН. Унесите га ручно.",
     "{nthServer}. Server" : "{nthServer}. Сервер",
+    "No object found in the given Base DN. Please revise." : "Нема објекта за дати базни ДН. Проверите.",
+    "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." : "Грешка. Проверите базни ДН као и поставке везе и акредитиве.",
     "Do you really want to delete the current Server Configuration?" : "Да ли стварно желите да обришете тренутну конфигурацију сервера?",
     "Confirm Deletion" : "Потврдa брисањa",
+    "Mappings cleared successfully!" : "Мапирања успешно очишћена!",
+    "Error while clearing the mappings." : "Грешка при чишћењу мапирања.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Упис није успео. Проверите да је база у функцији. Поново учитајте пре настављања.",
+    "Mode switch" : "Промена режима",
     "Select attributes" : "Изаберите атрибуте",
+    "User found and settings verified." : "Корисник нађен и поставке проверене.",
     "_%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",
@@ -25,19 +38,26 @@
     "Invalid Host" : "Неважећи домаћин",
     "Server" : "Сервер",
     "Users" : "Корисници",
+    "Login Attributes" : "Атрибути пријаве",
     "Groups" : "Групе",
     "Test Configuration" : "Тестирај конфигурацију",
     "Help" : "Помоћ",
     "Groups meeting these criteria are available in %s:" : "Групе које испуњавају ове критеријуме су доступне у %s:",
+    "Search groups" : "Претражи групе",
+    "Available groups" : "Доступне групе",
+    "Selected groups" : "Изабране групе",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтер прецизира које ће LDAP групе требају имати приступ %s случају.",
     "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 замењује корисничко име при пријављивању. Пример: \"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://" : "Можете да изоставите протокол, осим ако захтевате ССЛ. У том случају почните са ldaps://",
     "Port" : "Порт",
+    "Detect Port" : "Откриј порт",
     "User DN" : "Корисников 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" : "Лозинка",