[tx-robot] updated from transifex

18 files changed, 74 insertions, 0 deletions

diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js
index ce8a9132a0c..e0a3744a378 100644
--- a/apps/files/l10n/de_DE.js
+++ b/apps/files/l10n/de_DE.js
@@ -46,6 +46,7 @@ OC.L10N.register(
     "Could not move \"{file}\"" : "Die Datei konnte nicht verschoben werden \"{file}\"",
     "{newName} already exists" : "{newName} existiert bereits",
     "Could not rename \"{fileName}\", it does not exist any more" : "Die Datei konnte nicht umbennant werden \"{fileName}\", da die Datei nicht mehr existiert",
+    "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "Der Name „{targetName}“ wird bereits im Ordner „{dir}“ benutzt. Bitte wählen Sie einen anderen Namen.",
     "Could not rename \"{fileName}\"" : "Die Datei konnte nicht umbenannt werden \"{fileName}\"",
     "Could not create file \"{file}\"" : "Die Datei konnte nicht erstellt werden \"{file}\"",
     "Could not create file \"{file}\" because it already exists" : "Die Datei konnte nicht erstellt werden \"{file}\", da diese bereits existiert",
@@ -100,6 +101,7 @@ OC.L10N.register(
     "Maximum upload size" : "Maximale Upload-Größe",
     "max. possible: " : "maximal möglich:",
     "Save" : "Speichern",
+    "With PHP-FPM it might take 5 minutes for changes to be applied." : "Bei PHP-FPM kann es 5 Minuten dauern, bis Änderungen angewendet sind.",
     "Missing permissions to edit from here." : "Fehlende Berechtigungen um von hier aus zu bearbeiten.",
     "Settings" : "Einstellungen",
     "WebDAV" : "WebDAV",
diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json
index f6a3abc9891..cdac7613678 100644
--- a/apps/files/l10n/de_DE.json
+++ b/apps/files/l10n/de_DE.json
@@ -44,6 +44,7 @@
     "Could not move \"{file}\"" : "Die Datei konnte nicht verschoben werden \"{file}\"",
     "{newName} already exists" : "{newName} existiert bereits",
     "Could not rename \"{fileName}\", it does not exist any more" : "Die Datei konnte nicht umbennant werden \"{fileName}\", da die Datei nicht mehr existiert",
+    "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "Der Name „{targetName}“ wird bereits im Ordner „{dir}“ benutzt. Bitte wählen Sie einen anderen Namen.",
     "Could not rename \"{fileName}\"" : "Die Datei konnte nicht umbenannt werden \"{fileName}\"",
     "Could not create file \"{file}\"" : "Die Datei konnte nicht erstellt werden \"{file}\"",
     "Could not create file \"{file}\" because it already exists" : "Die Datei konnte nicht erstellt werden \"{file}\", da diese bereits existiert",
@@ -98,6 +99,7 @@
     "Maximum upload size" : "Maximale Upload-Größe",
     "max. possible: " : "maximal möglich:",
     "Save" : "Speichern",
+    "With PHP-FPM it might take 5 minutes for changes to be applied." : "Bei PHP-FPM kann es 5 Minuten dauern, bis Änderungen angewendet sind.",
     "Missing permissions to edit from here." : "Fehlende Berechtigungen um von hier aus zu bearbeiten.",
     "Settings" : "Einstellungen",
     "WebDAV" : "WebDAV",
diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js
index f7789dd81b8..ec2c7d7a52c 100644
--- a/apps/files_external/l10n/fi_FI.js
+++ b/apps/files_external/l10n/fi_FI.js
@@ -17,6 +17,7 @@ OC.L10N.register(
     "Error generating key pair" : "Virhe luotaessa avainparia",
     "Enable encryption" : "Käytä salausta",
     "Enable previews" : "Käytä esikatseluja",
+    "Enable sharing" : "Käytä jakamista",
     "Check for changes" : "Tarkista muutokset",
     "Never" : "Ei koskaan",
     "Once every direct access" : "Kerran aina suoran käytön yhteydessä",
@@ -34,8 +35,12 @@ OC.L10N.register(
     "External mount error" : "Ulkoinen liitosvirhe",
     "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Windows-verkkoasemien liitospisteiden listauksen noutaminen epäonnistui: tyhjä vastaus palvelimelta",
     "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Jotkin määritetyt erilliset liitospisteet eivät ole yhdistettynä. Napsauta punaisia rivejä saadaksesi lisätietoja",
+    "Please enter the credentials for the {mount} mount" : "Anna kirjautumistiedot liitokselle {mount}",
     "Username" : "Käyttäjätunnus",
     "Password" : "Salasana",
+    "Credentials saved" : "Kirjautumistiedot tallennettu",
+    "Credentials saving failed" : "Kirjautumistietojen tallentaminen epäonnistui",
+    "Credentials required" : "Kirjautumistiedot vaaditaan",
     "Builtin" : "Sisäänrakennettu",
     "None" : "Ei mitään",
     "OAuth1" : "OAuth1",
diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json
index 022f36f635f..e74582f1962 100644
--- a/apps/files_external/l10n/fi_FI.json
+++ b/apps/files_external/l10n/fi_FI.json
@@ -15,6 +15,7 @@
     "Error generating key pair" : "Virhe luotaessa avainparia",
     "Enable encryption" : "Käytä salausta",
     "Enable previews" : "Käytä esikatseluja",
+    "Enable sharing" : "Käytä jakamista",
     "Check for changes" : "Tarkista muutokset",
     "Never" : "Ei koskaan",
     "Once every direct access" : "Kerran aina suoran käytön yhteydessä",
@@ -32,8 +33,12 @@
     "External mount error" : "Ulkoinen liitosvirhe",
     "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Windows-verkkoasemien liitospisteiden listauksen noutaminen epäonnistui: tyhjä vastaus palvelimelta",
     "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Jotkin määritetyt erilliset liitospisteet eivät ole yhdistettynä. Napsauta punaisia rivejä saadaksesi lisätietoja",
+    "Please enter the credentials for the {mount} mount" : "Anna kirjautumistiedot liitokselle {mount}",
     "Username" : "Käyttäjätunnus",
     "Password" : "Salasana",
+    "Credentials saved" : "Kirjautumistiedot tallennettu",
+    "Credentials saving failed" : "Kirjautumistietojen tallentaminen epäonnistui",
+    "Credentials required" : "Kirjautumistiedot vaaditaan",
     "Builtin" : "Sisäänrakennettu",
     "None" : "Ei mitään",
     "OAuth1" : "OAuth1",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index b456bc9bda0..5328746e5be 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -29,6 +29,7 @@ OC.L10N.register(
     "Error generating key pair" : "Erreur lors de la génération des clés",
     "Enable encryption" : "Activer le chiffrement",
     "Enable previews" : "Activer les prévisualisations",
+    "Enable sharing" : "Activer le Partage",
     "Check for changes" : "Rechercher les modifications",
     "Never" : "Jamais",
     "Once every direct access" : "Une fois à chaque accès direct",
@@ -44,10 +45,15 @@ OC.L10N.register(
     "Couldn't get the list of external mount points: {type}" : "Impossible de récupérer la liste des points de montage externes : {type}",
     "There was an error with message: " : "Il y a eu une erreur avec le message :",
     "External mount error" : "Erreur de point de montage externe",
+    "external-storage" : "Stockage externe",
     "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Impossible d'obtenir la liste des points de montage des disques réseaux Windows : Réponse vide du serveur",
     "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Certains points de montage externes configurés ne sont pas connectés. Veuillez cliquer sur la(les) ligne(s) rouge(s) pour plus d'informations",
+    "Please enter the credentials for the {mount} mount" : "Veuillez entrer les identifiants pour le montage {mount}",
     "Username" : "Nom d'utilisateur",
     "Password" : "Mot de passe",
+    "Credentials saved" : "Identifiants sauvegardés",
+    "Credentials saving failed" : "La sauvegarde des Identifiants a échoué",
+    "Credentials required" : "Des informations d'identification sont requises",
     "Access key" : "Clé d'accès",
     "Secret key" : "Clé secrète",
     "Builtin" : "Intégré",
@@ -63,7 +69,11 @@ OC.L10N.register(
     "Identity endpoint URL" : "Identity endpoint URL",
     "Rackspace" : "Rackspace",
     "API key" : "Clé API",
+    "Global Credentails" : "Identifiants globaux",
+    "Log-in credentials, save in database" : "Identifiants de connexion, sauvegardés dans la base de données",
     "Username and password" : "Nom d'utilisateur et mot de passe",
+    "Log-in credentials, save in session" : "Identifiants de connexion, sauvegardés pour la session",
+    "User entered, store in database" : "Identifiant utilisateur entré, enregistré dans la base de données",
     "RSA public key" : "Clé publique RSA",
     "Public key" : "Clef publique",
     "Amazon S3" : "Amazon S3",
@@ -106,6 +116,7 @@ OC.L10N.register(
     "Storage type" : "Type de stockage",
     "Scope" : "Portée",
     "External Storage" : "Stockage externe",
+    "Global Credentials" : "Identifiants Globaux",
     "Folder name" : "Nom du dossier",
     "Authentication" : "Authentification",
     "Configuration" : "Configuration",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index a519e8ec4cb..bfbfe0c85ca 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -27,6 +27,7 @@
     "Error generating key pair" : "Erreur lors de la génération des clés",
     "Enable encryption" : "Activer le chiffrement",
     "Enable previews" : "Activer les prévisualisations",
+    "Enable sharing" : "Activer le Partage",
     "Check for changes" : "Rechercher les modifications",
     "Never" : "Jamais",
     "Once every direct access" : "Une fois à chaque accès direct",
@@ -42,10 +43,15 @@
     "Couldn't get the list of external mount points: {type}" : "Impossible de récupérer la liste des points de montage externes : {type}",
     "There was an error with message: " : "Il y a eu une erreur avec le message :",
     "External mount error" : "Erreur de point de montage externe",
+    "external-storage" : "Stockage externe",
     "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Impossible d'obtenir la liste des points de montage des disques réseaux Windows : Réponse vide du serveur",
     "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Certains points de montage externes configurés ne sont pas connectés. Veuillez cliquer sur la(les) ligne(s) rouge(s) pour plus d'informations",
+    "Please enter the credentials for the {mount} mount" : "Veuillez entrer les identifiants pour le montage {mount}",
     "Username" : "Nom d'utilisateur",
     "Password" : "Mot de passe",
+    "Credentials saved" : "Identifiants sauvegardés",
+    "Credentials saving failed" : "La sauvegarde des Identifiants a échoué",
+    "Credentials required" : "Des informations d'identification sont requises",
     "Access key" : "Clé d'accès",
     "Secret key" : "Clé secrète",
     "Builtin" : "Intégré",
@@ -61,7 +67,11 @@
     "Identity endpoint URL" : "Identity endpoint URL",
     "Rackspace" : "Rackspace",
     "API key" : "Clé API",
+    "Global Credentails" : "Identifiants globaux",
+    "Log-in credentials, save in database" : "Identifiants de connexion, sauvegardés dans la base de données",
     "Username and password" : "Nom d'utilisateur et mot de passe",
+    "Log-in credentials, save in session" : "Identifiants de connexion, sauvegardés pour la session",
+    "User entered, store in database" : "Identifiant utilisateur entré, enregistré dans la base de données",
     "RSA public key" : "Clé publique RSA",
     "Public key" : "Clef publique",
     "Amazon S3" : "Amazon S3",
@@ -104,6 +114,7 @@
     "Storage type" : "Type de stockage",
     "Scope" : "Portée",
     "External Storage" : "Stockage externe",
+    "Global Credentials" : "Identifiants Globaux",
     "Folder name" : "Nom du dossier",
     "Authentication" : "Authentification",
     "Configuration" : "Configuration",
diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js
index 29f0d45ee3d..5b07891a8f4 100644
--- a/apps/files_external/l10n/it.js
+++ b/apps/files_external/l10n/it.js
@@ -45,10 +45,15 @@ OC.L10N.register(
     "Couldn't get the list of external mount points: {type}" : "Impossibile ottenere l'elenco dei punti di mount esterni: {type}",
     "There was an error with message: " : "Si è verificato un errore con il messaggio:",
     "External mount error" : "Errore di mount esterno",
+    "external-storage" : "archiviazione-esterna",
     "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Impossibile ottenere l'elenco dei punti di mount delle unità di rete Windows: risposta vuota dal server",
     "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Alcuni dei punti di mount esterni configurati non sono connessi. Fai clic sulle righe rosse per ulteriori informazioni",
+    "Please enter the credentials for the {mount} mount" : "Digita le credenziali per montare {mount}",
     "Username" : "Nome utente",
     "Password" : "Password",
+    "Credentials saved" : "Credenziali salvate",
+    "Credentials saving failed" : "Salvataggio delle credenziali non riuscito",
+    "Credentials required" : "Credenziali richieste",
     "Access key" : "Chiave di accesso",
     "Secret key" : "Chiave segreta",
     "Builtin" : "Integrata",
diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json
index c7863b8d139..8257027e0f3 100644
--- a/apps/files_external/l10n/it.json
+++ b/apps/files_external/l10n/it.json
@@ -43,10 +43,15 @@
     "Couldn't get the list of external mount points: {type}" : "Impossibile ottenere l'elenco dei punti di mount esterni: {type}",
     "There was an error with message: " : "Si è verificato un errore con il messaggio:",
     "External mount error" : "Errore di mount esterno",
+    "external-storage" : "archiviazione-esterna",
     "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Impossibile ottenere l'elenco dei punti di mount delle unità di rete Windows: risposta vuota dal server",
     "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Alcuni dei punti di mount esterni configurati non sono connessi. Fai clic sulle righe rosse per ulteriori informazioni",
+    "Please enter the credentials for the {mount} mount" : "Digita le credenziali per montare {mount}",
     "Username" : "Nome utente",
     "Password" : "Password",
+    "Credentials saved" : "Credenziali salvate",
+    "Credentials saving failed" : "Salvataggio delle credenziali non riuscito",
+    "Credentials required" : "Credenziali richieste",
     "Access key" : "Chiave di accesso",
     "Secret key" : "Chiave segreta",
     "Builtin" : "Integrata",
diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js
index 2286df56c9f..5a549eb04c1 100644
--- a/apps/files_external/l10n/pt_PT.js
+++ b/apps/files_external/l10n/pt_PT.js
@@ -45,10 +45,15 @@ OC.L10N.register(
     "Couldn't get the list of external mount points: {type}" : "Não foi possível conseguir a lista de pontos de montagem externos: {type}",
     "There was an error with message: " : "Houve um erro com a mensagem:",
     "External mount error" : "Erro de montagem externa",
+    "external-storage" : "Armazenamento Externo",
     "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Não foi possível conseguir a lista de pontos de montagem Windows na rede: resposta vazia do servidor",
     "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Alguns dos pontos de montagem externos configurados não estão conectados. Por favor, clique na fila vermelha para mais informação",
+    "Please enter the credentials for the {mount} mount" : "Por favor, introduza as credenciais para {mount}",
     "Username" : "Nome de utilizador",
     "Password" : "Palavra-passe",
+    "Credentials saved" : "Credenciais guardadas",
+    "Credentials saving failed" : "Falha ao salvar credenciais",
+    "Credentials required" : "Credenciais necessárias",
     "Access key" : "Código de acesso",
     "Secret key" : "Código secreto",
     "Builtin" : "Integrado",
diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json
index 84e92ef4271..98eac2442e5 100644
--- a/apps/files_external/l10n/pt_PT.json
+++ b/apps/files_external/l10n/pt_PT.json
@@ -43,10 +43,15 @@
     "Couldn't get the list of external mount points: {type}" : "Não foi possível conseguir a lista de pontos de montagem externos: {type}",
     "There was an error with message: " : "Houve um erro com a mensagem:",
     "External mount error" : "Erro de montagem externa",
+    "external-storage" : "Armazenamento Externo",
     "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Não foi possível conseguir a lista de pontos de montagem Windows na rede: resposta vazia do servidor",
     "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Alguns dos pontos de montagem externos configurados não estão conectados. Por favor, clique na fila vermelha para mais informação",
+    "Please enter the credentials for the {mount} mount" : "Por favor, introduza as credenciais para {mount}",
     "Username" : "Nome de utilizador",
     "Password" : "Palavra-passe",
+    "Credentials saved" : "Credenciais guardadas",
+    "Credentials saving failed" : "Falha ao salvar credenciais",
+    "Credentials required" : "Credenciais necessárias",
     "Access key" : "Código de acesso",
     "Secret key" : "Código secreto",
     "Builtin" : "Integrado",
diff --git a/apps/files_external/l10n/sq.js b/apps/files_external/l10n/sq.js
index 68de47456cb..bab6a24df7f 100644
--- a/apps/files_external/l10n/sq.js
+++ b/apps/files_external/l10n/sq.js
@@ -47,8 +47,12 @@ OC.L10N.register(
     "External mount error" : "Gabim i jashtëm montimi",
     "Couldn't get the list of Windows network drive mount points: empty response from the server" : "S’u mor dot lista e pikave të montimit Windows network drive: përgjigje e zbrazët nga shërbyesi",
     "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Disa nga pikat e jashtme të formësuara të montimit s’janë të lidhura. Ju lutemi, klikoni në shigjetën(at) e kuqe për më tepër të dhëna",
+    "Please enter the credentials for the {mount} mount" : "Ju lutemi, jepni kredencialet për pikën e montimit {mount}",
     "Username" : "Emër përdoruesi",
     "Password" : "Fjalëkalim",
+    "Credentials saved" : "Kredencialet u ruajtën",
+    "Credentials saving failed" : "Ruajtja e kredencialeve dështoi",
+    "Credentials required" : "Lypsen kredenciale",
     "Access key" : "Kyç hyrjesh",
     "Secret key" : "Kyç i fshehtë",
     "Builtin" : "I brendshëm",
diff --git a/apps/files_external/l10n/sq.json b/apps/files_external/l10n/sq.json
index 9ee9e8bb743..7c132ddd855 100644
--- a/apps/files_external/l10n/sq.json
+++ b/apps/files_external/l10n/sq.json
@@ -45,8 +45,12 @@
     "External mount error" : "Gabim i jashtëm montimi",
     "Couldn't get the list of Windows network drive mount points: empty response from the server" : "S’u mor dot lista e pikave të montimit Windows network drive: përgjigje e zbrazët nga shërbyesi",
     "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Disa nga pikat e jashtme të formësuara të montimit s’janë të lidhura. Ju lutemi, klikoni në shigjetën(at) e kuqe për më tepër të dhëna",
+    "Please enter the credentials for the {mount} mount" : "Ju lutemi, jepni kredencialet për pikën e montimit {mount}",
     "Username" : "Emër përdoruesi",
     "Password" : "Fjalëkalim",
+    "Credentials saved" : "Kredencialet u ruajtën",
+    "Credentials saving failed" : "Ruajtja e kredencialeve dështoi",
+    "Credentials required" : "Lypsen kredenciale",
     "Access key" : "Kyç hyrjesh",
     "Secret key" : "Kyç i fshehtë",
     "Builtin" : "I brendshëm",
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
index a013589cff2..e7136bb70a5 100644
--- a/apps/user_ldap/l10n/fr.js
+++ b/apps/user_ldap/l10n/fr.js
@@ -132,6 +132,8 @@ OC.L10N.register(
     "One Group Base DN per line" : "Un DN de base groupe par ligne",
     "Group Search Attributes" : "Attributs de recherche des groupes",
     "Group-Member association" : "Association groupe-membre",
+    "Dynamic Group Member URL" : "URL de Membre de Groupe Dynamique",
+    "The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)" : "L'attribut LDAP mis sur les objets de groupe contient une URL de recherche LDAP qui détermine quels objets appartiennent à ce groupe.  (Un attribut vide désactive la fonctionnalité de groupe dynamique)",
     "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" : "Paging chunksize",
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
index 0b6c076f0d3..50bac76a781 100644
--- a/apps/user_ldap/l10n/fr.json
+++ b/apps/user_ldap/l10n/fr.json
@@ -130,6 +130,8 @@
     "One Group Base DN per line" : "Un DN de base groupe par ligne",
     "Group Search Attributes" : "Attributs de recherche des groupes",
     "Group-Member association" : "Association groupe-membre",
+    "Dynamic Group Member URL" : "URL de Membre de Groupe Dynamique",
+    "The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)" : "L'attribut LDAP mis sur les objets de groupe contient une URL de recherche LDAP qui détermine quels objets appartiennent à ce groupe.  (Un attribut vide désactive la fonctionnalité de groupe dynamique)",
     "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" : "Paging chunksize",
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index d59fea314e3..395c21f5a21 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -34,6 +34,7 @@ OC.L10N.register(
     "_%n month ago_::_%n months ago_" : ["Il y a %n mois","Il y a %n mois"],
     "last year" : "l'année dernière",
     "_%n year ago_::_%n years ago_" : ["il y a %n an","il y a %n ans"],
+    "_%n hour ago_::_%n hours ago_" : ["Il y a %n heure","Il y a %n heures"],
     "_%n minute ago_::_%n minutes ago_" : ["il y a %n minute","il y a %n minutes"],
     "seconds ago" : "il y a quelques secondes",
     "web services under your control" : "services web sous votre contrôle",
@@ -119,6 +120,7 @@ OC.L10N.register(
     "Apps" : "Applications",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Seuls les caractères suivants sont autorisés dans un nom d'utilisateur : \"a-z\", \"A-Z\", \"0-9\", et \"_.@-'\"",
     "A valid username must be provided" : "Un nom d'utilisateur valide doit être saisi",
+    "Username contains whitespace at the beginning or at the end" : "Le nom d'utilisateur contient des espaces au début ou à la fin",
     "A valid password must be provided" : "Un mot de passe valide doit être saisi",
     "The username is already being used" : "Ce nom d'utilisateur est déjà utilisé",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Aucun pilote de base de données n’est installé (sqlite, mysql ou postgresql).",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index 21ed66eb278..b0bcc37b744 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -32,6 +32,7 @@
     "_%n month ago_::_%n months ago_" : ["Il y a %n mois","Il y a %n mois"],
     "last year" : "l'année dernière",
     "_%n year ago_::_%n years ago_" : ["il y a %n an","il y a %n ans"],
+    "_%n hour ago_::_%n hours ago_" : ["Il y a %n heure","Il y a %n heures"],
     "_%n minute ago_::_%n minutes ago_" : ["il y a %n minute","il y a %n minutes"],
     "seconds ago" : "il y a quelques secondes",
     "web services under your control" : "services web sous votre contrôle",
@@ -117,6 +118,7 @@
     "Apps" : "Applications",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Seuls les caractères suivants sont autorisés dans un nom d'utilisateur : \"a-z\", \"A-Z\", \"0-9\", et \"_.@-'\"",
     "A valid username must be provided" : "Un nom d'utilisateur valide doit être saisi",
+    "Username contains whitespace at the beginning or at the end" : "Le nom d'utilisateur contient des espaces au début ou à la fin",
     "A valid password must be provided" : "Un mot de passe valide doit être saisi",
     "The username is already being used" : "Ce nom d'utilisateur est déjà utilisé",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Aucun pilote de base de données n’est installé (sqlite, mysql ou postgresql).",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 3f314c54816..8f446dea0a5 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -155,6 +155,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
     "Please read carefully before activating server-side encryption: " : "Bitte lesen Sie ganz genau, bevor Sie die Serverseite Verschlüsselung aktivieren:",
+    "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Wollen Sie die Verschlüsselung wirklich aktivieren?",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
     "Select default encryption module:" : "Standard-Verschlüsselungs-Modul auswählen:",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 0df74f1d602..feedc0cae48 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -153,6 +153,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
     "Please read carefully before activating server-side encryption: " : "Bitte lesen Sie ganz genau, bevor Sie die Serverseite Verschlüsselung aktivieren:",
+    "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Wollen Sie die Verschlüsselung wirklich aktivieren?",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
     "Select default encryption module:" : "Standard-Verschlüsselungs-Modul auswählen:",