Merge branch 'master' into implement_712

nextcloud · LukasReschke · Aug 16, 2016 · Aug 8, 2016 · Aug 9, 2016 · Aug 9, 2016
commit 8261ccce1be32c1467874d537240585c0d841600
diff --git a/apps/encryption/l10n/de.js b/apps/encryption/l10n/de.js
diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json
@@ -20,6 +20,9 @@
     "The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuche es noch einmal.",
     "Private key password successfully updated." : "Passwort des privaten Schlüssels erfolgreich aktualisiert",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Verschlüsselungsschlüssel müssen von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migriert werden. Bitte 'occ encryption:migrate' ausführen oder Ihren Administrator kontaktieren.",
+    "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Falscher privater Schlüssel für die Verschlüsselungs-app. Bitte aktualisiere Deinen privaten Schlüssel in Deinen persönlichen Einstellungen um wieder Zugriff auf die verschlüsselten Dateien zu erhalten.",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-app ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte logge Dich aus und wieder ein",
+    "Encryption app is enabled and ready" : "Verschlüsselungs-app ist aktiviert und bereit",
     "Bad Signature" : "Ungültige Signatur",
     "Missing Signature" : "Fehlende Signatur",
     "one-time password for server-side-encryption" : "Einmal-Passwort für serverseitige Verschlüsselung",
@@ -41,6 +44,7 @@
     "New recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel",
     "Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
     "Change Password" : "Passwort ändern",
+    "Basic encryption module" : "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 erneut ab- und wieder anmelden.",
     "Your private key password no longer matches your log-in password." : "Dein Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Loginpasswort überein.",
     "Set your old private key password to your current log-in password:" : "Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Anmeldepasswort einstellen:",

diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js
diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json
@@ -20,6 +20,9 @@
     "The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuchen Sie es noch einmal.",
     "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migrieren. Bitte führen Sie 'occ encryption:migrate' aus oder kontaktieren Sie Ihren Administrator.",
+    "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Falscher privater Schlüssel für die Verschlüsselungs-app. Bitte aktualisieren Sie Ihren privaten Schlüssel in Ihren persönlichen Einstellungen um wieder Zugriff auf die verschlüsselten Dateien zu erhalten.",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-app ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte loggen Sie sich aus und wieder ein",
+    "Encryption app is enabled and ready" : "Verschlüsselungs-app ist aktiviert und bereit",
     "Bad Signature" : "Falsche Signatur",
     "Missing Signature" : "Fehlende Signatur",
     "one-time password for server-side-encryption" : "Einmalpasswort für Serverseitige Verschlüsselung",
@@ -41,6 +44,7 @@
     "New recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel",
     "Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
     "Change Password" : "Passwort ändern",
+    "Basic encryption module" : "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.",
     "Your private key password no longer matches your log-in password." : "Das Privatschlüsselpasswort stimmt nicht länger mit dem Anmeldepasswort überein.",
     "Set your old private key password to your current log-in password:" : "Ihr altes Privatschlüsselpasswort auf Ihr aktuelles Anmeldepasswort stellen:",

diff --git a/apps/encryption/l10n/it.js b/apps/encryption/l10n/it.js
diff --git a/apps/encryption/l10n/it.json b/apps/encryption/l10n/it.json
@@ -20,6 +20,9 @@
     "The current log-in password was not correct, please try again." : "La password di accesso attuale non era corretta, prova ancora.",
     "Private key password successfully updated." : "Password della chiave privata aggiornata correttamente.",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova. Esegui 'occ encryption:migrate' o contatta il tuo amministratore",
+    "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati.",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
+    "Encryption app is enabled and ready" : "L'applicazione Cifratura è abilitata e pronta",
     "Bad Signature" : "Firma non valida",
     "Missing Signature" : "Firma mancante",
     "one-time password for server-side-encryption" : "password monouso per la cifratura lato server",
@@ -41,6 +44,7 @@
     "New recovery key password" : "Nuova password della chiave di ripristino",
     "Repeat new recovery key password" : "Ripeti la nuova password della chiave di ripristino",
     "Change Password" : "Modifica password",
+    "Basic encryption module" : "Modulo di cifratura base",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
     "Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
     "Set your old private key password to your current log-in password:" : "Imposta la vecchia password della chiave privata sull'attuale password di accesso:",

diff --git a/apps/encryption/l10n/nl.js b/apps/encryption/l10n/nl.js
diff --git a/apps/encryption/l10n/nl.json b/apps/encryption/l10n/nl.json
@@ -20,6 +20,9 @@
     "The current log-in password was not correct, please try again." : "Het huidige inlogwachtwoord was niet juist, probeer het opnieuw.",
     "Private key password successfully updated." : "Privésleutel succesvol bijgewerkt.",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Je moet je cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe. Start 'occ encryption:migrate' of neem contact op met je beheerder",
+    "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige privésleutel voor de crypto app. Werk het privésleutel wachtwoord bij in je persoonlijke instellingen om opnieuw toegang te krijgen tot je versleutelde bestanden.",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar je sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
+    "Encryption app is enabled and ready" : "Encryptie app is geactiveerd en gereed",
     "Bad Signature" : "Verkeerde handtekening",
     "Missing Signature" : "Missende ondertekening",
     "one-time password for server-side-encryption" : "eenmalig wachtwoord voor server-side versleuteling",
@@ -41,6 +44,7 @@
     "New recovery key password" : "Nieuwe wachtwoord herstelsleutel",
     "Repeat new recovery key password" : "Herhaal nieuwe wachtwoord herstelsleutel",
     "Change Password" : "Wijzigen wachtwoord",
+    "Basic encryption module" : "Basis versleutelingsmodule",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar je sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
     "Your private key password no longer matches your log-in password." : "Het wachtwoord van je privésleutel komt niet meer overeen met je inlogwachtwoord.",
     "Set your old private key password to your current log-in password:" : "Stel het wachtwoord van je oude privésleutel in op je huidige inlogwachtwoord.",