diff --git a/apps/encryption/l10n/cs_CZ.js b/apps/encryption/l10n/cs_CZ.js
index e1d4b1cff31b434d6c6c6c287ede2f8841395aaa..3d753ac33778a312409d4917a8736f0969711f4e 100644
--- a/apps/encryption/l10n/cs_CZ.js
+++ b/apps/encryption/l10n/cs_CZ.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
     "Enable recovery key" : "Povolit záchranný klíč",
     "Disable recovery key" : "Vypnout záchranný klíč",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Záchranný klíč je dodatečný šifrovací klíč použitý pro\nšifrování souborů. S jeho pomocí lze obnovit soubory uživatele při zapomenutí hesla.",
     "Recovery key password" : "Heslo klíče pro obnovu",
     "Repeat recovery key password" : "Zopakovat heslo záchranného klíče",
     "Change recovery key password:" : "Změna hesla klíče pro obnovu:",
diff --git a/apps/encryption/l10n/cs_CZ.json b/apps/encryption/l10n/cs_CZ.json
index 9e3bd87b843cd8987b70ffc2e1d816904c111bbc..abdb60bc89b11f3ff0e65693627f4bd26a42606c 100644
--- a/apps/encryption/l10n/cs_CZ.json
+++ b/apps/encryption/l10n/cs_CZ.json
@@ -23,7 +23,6 @@
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
     "Enable recovery key" : "Povolit záchranný klíč",
     "Disable recovery key" : "Vypnout záchranný klíč",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Záchranný klíč je dodatečný šifrovací klíč použitý pro\nšifrování souborů. S jeho pomocí lze obnovit soubory uživatele při zapomenutí hesla.",
     "Recovery key password" : "Heslo klíče pro obnovu",
     "Repeat recovery key password" : "Zopakovat heslo záchranného klíče",
     "Change recovery key password:" : "Změna hesla klíče pro obnovu:",
diff --git a/apps/encryption/l10n/de.js b/apps/encryption/l10n/de.js
index abe85fe0a5b5d91b019702e490fbc921a4d68a79..5f875b5fc8bf45315c2a46e139373ff8a3c7406a 100644
--- a/apps/encryption/l10n/de.js
+++ b/apps/encryption/l10n/de.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melde Dich nochmals ab und wieder an.",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn Benutzer ihr Passwort vergessen.",
     "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
     "Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
     "Change recovery key password:" : "Wiederherstellungsschlüssel-Passwort ändern:",
diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json
index 41bce195844bf1f98d8a9b2b5f50fd51d88cbe1b..58b8440be0640d3a8c6f81ec18edf132013fcbc1 100644
--- a/apps/encryption/l10n/de.json
+++ b/apps/encryption/l10n/de.json
@@ -23,7 +23,6 @@
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melde Dich nochmals ab und wieder an.",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn Benutzer ihr Passwort vergessen.",
     "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
     "Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
     "Change recovery key password:" : "Wiederherstellungsschlüssel-Passwort ändern:",
diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js
index c1a599cc33fae52fdd4f73de279a6fc0f5dad1a6..d3875351836a28e3f8bbb06f4b0bf8118d4cd4ef 100644
--- a/apps/encryption/l10n/de_DE.js
+++ b/apps/encryption/l10n/de_DE.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn Benutzer ihr Passwort vergessen.",
     "Recovery key password" : "Wiederherstellungschlüsselpasswort",
     "Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
     "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json
index 858fd489090989202d3ad3136f8c7c30ae9acef6..4c0e55f05d23b7007691b8af8de4c87cead25082 100644
--- a/apps/encryption/l10n/de_DE.json
+++ b/apps/encryption/l10n/de_DE.json
@@ -23,7 +23,6 @@
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn Benutzer ihr Passwort vergessen.",
     "Recovery key password" : "Wiederherstellungschlüsselpasswort",
     "Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
     "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
diff --git a/apps/encryption/l10n/el.js b/apps/encryption/l10n/el.js
index ad9643dabf20ca44caabcb6cbea20636b65989d4..69c876ba7998ce8d48fc28a0485af46004f58bc4 100644
--- a/apps/encryption/l10n/el.js
+++ b/apps/encryption/l10n/el.js
@@ -25,9 +25,12 @@ OC.L10N.register(
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
     "Enable recovery key" : "Ενεργοποίηση κλειδιού ανάκτησης",
     "Disable recovery key" : "Απενεργοποίηση κλειδιού ανάκτησης",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται\nγια να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν ξεχάσει τον κωδικό πρόσβασης.",
     "Recovery key password" : "Επαναφορά κωδικού κλειδιού",
+    "Repeat recovery key password" : "Επαναλάβετε τον κωδικό του κλειδιού ανάκτησης",
     "Change recovery key password:" : "Αλλαγή κλειδιού επαναφοράς κωδικού:",
+    "Old recovery key password" : "Παλιός κωδικός κλειδιού ανάκτησης",
+    "New recovery key password" : "Νέος κωδικός κλειδιού ανάκτησης",
+    "Repeat new recovery key password" : "Επαναλάβετε το νέο κωδικό κλειδιού ανάκτησης",
     "Change Password" : "Αλλαγή Κωδικού Πρόσβασης",
     "ownCloud basic encryption module" : "Βασική μονάδα κρυπτογράφησης του ",
     "Your private key password no longer matches your log-in password." : "Ο κωδικός του ιδιωτικού κλειδιού σας δεν ταιριάζει πλέον με τον κωδικό σύνδεσής σας.",
diff --git a/apps/encryption/l10n/el.json b/apps/encryption/l10n/el.json
index 1e487d5c5b684ace8f35d070558c227a19d0a945..8d4d514cfeb578fc7b3a433ba200d025d784d69d 100644
--- a/apps/encryption/l10n/el.json
+++ b/apps/encryption/l10n/el.json
@@ -23,9 +23,12 @@
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
     "Enable recovery key" : "Ενεργοποίηση κλειδιού ανάκτησης",
     "Disable recovery key" : "Απενεργοποίηση κλειδιού ανάκτησης",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται\nγια να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν ξεχάσει τον κωδικό πρόσβασης.",
     "Recovery key password" : "Επαναφορά κωδικού κλειδιού",
+    "Repeat recovery key password" : "Επαναλάβετε τον κωδικό του κλειδιού ανάκτησης",
     "Change recovery key password:" : "Αλλαγή κλειδιού επαναφοράς κωδικού:",
+    "Old recovery key password" : "Παλιός κωδικός κλειδιού ανάκτησης",
+    "New recovery key password" : "Νέος κωδικός κλειδιού ανάκτησης",
+    "Repeat new recovery key password" : "Επαναλάβετε το νέο κωδικό κλειδιού ανάκτησης",
     "Change Password" : "Αλλαγή Κωδικού Πρόσβασης",
     "ownCloud basic encryption module" : "Βασική μονάδα κρυπτογράφησης του ",
     "Your private key password no longer matches your log-in password." : "Ο κωδικός του ιδιωτικού κλειδιού σας δεν ταιριάζει πλέον με τον κωδικό σύνδεσής σας.",
diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
index aef99289ed5d520b0a1d5a0103b1bb127d6737c7..dd49810f03a37c9ebf54d2035dfc334e73adb2e0 100644
--- a/apps/encryption/l10n/es.js
+++ b/apps/encryption/l10n/es.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
     "Enable recovery key" : "Activa la clave de recuperación",
     "Disable recovery key" : "Desactiva la clave de recuperación",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "La clave de recuperación es una clave de cifrado adicional que es usada para cifrar archivos. Permite la recuperación de los archivos si el usuario olvida su clave.",
     "Recovery key password" : "Contraseña de clave de recuperación",
     "Repeat recovery key password" : "Repita la contraseña de recuperación",
     "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
index 3230ab1bf39ebd9ad19ee768717a93b1754b3420..54811d078c997652610380664271a47c25b00181 100644
--- a/apps/encryption/l10n/es.json
+++ b/apps/encryption/l10n/es.json
@@ -23,7 +23,6 @@
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
     "Enable recovery key" : "Activa la clave de recuperación",
     "Disable recovery key" : "Desactiva la clave de recuperación",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "La clave de recuperación es una clave de cifrado adicional que es usada para cifrar archivos. Permite la recuperación de los archivos si el usuario olvida su clave.",
     "Recovery key password" : "Contraseña de clave de recuperación",
     "Repeat recovery key password" : "Repita la contraseña de recuperación",
     "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
diff --git a/apps/encryption/l10n/fi_FI.js b/apps/encryption/l10n/fi_FI.js
index 6a65e7fdcff9e2f1c0ed3c748bee74cd600fbd44..8cf857481c56076bf866ea020555b698fc0ccd08 100644
--- a/apps/encryption/l10n/fi_FI.js
+++ b/apps/encryption/l10n/fi_FI.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
     "Enable recovery key" : "Ota palautusavain käyttöön",
     "Disable recovery key" : "Poista palautusavain käytöstä",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Palautusavain lisäturvaa tuova palautusavain, jolla salataan tiedostoja.\nSen avulla käyttäjien tiedostojen palauttaminen on mahdollista, jos käyttäjät unohtavat salasanansa.",
     "Recovery key password" : "Palautusavaimen salasana",
     "Repeat recovery key password" : "Toista salausavaimen salasana",
     "Change recovery key password:" : "Vaihda palautusavaimen salasana:",
diff --git a/apps/encryption/l10n/fi_FI.json b/apps/encryption/l10n/fi_FI.json
index 113f21dd8c506fe9e81b4744b7a385e1b87b19c9..617f3330a1d743b7bc3625d4d9eac42956d182ad 100644
--- a/apps/encryption/l10n/fi_FI.json
+++ b/apps/encryption/l10n/fi_FI.json
@@ -23,7 +23,6 @@
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
     "Enable recovery key" : "Ota palautusavain käyttöön",
     "Disable recovery key" : "Poista palautusavain käytöstä",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Palautusavain lisäturvaa tuova palautusavain, jolla salataan tiedostoja.\nSen avulla käyttäjien tiedostojen palauttaminen on mahdollista, jos käyttäjät unohtavat salasanansa.",
     "Recovery key password" : "Palautusavaimen salasana",
     "Repeat recovery key password" : "Toista salausavaimen salasana",
     "Change recovery key password:" : "Vaihda palautusavaimen salasana:",
diff --git a/apps/encryption/l10n/gl.js b/apps/encryption/l10n/gl.js
index 234ba969e4d049dc3a6eed55ab20bcba43099560..54916b31c5b2762875b9e2ded5a8dcbbf65956ac 100644
--- a/apps/encryption/l10n/gl.js
+++ b/apps/encryption/l10n/gl.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron preparadas, saia da sesión e volva a acceder de novo",
     "Enable recovery key" : "Activar a chave de recuperación",
     "Disable recovery key" : "Desactivar a chave de recuperación",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "A chave de recuperación é unha chave de cifrado adicional utilizada\n\t\tpara cifrar ficheiros. Permite a recuperación de ficheiros dun usuario se este esquece o seu contrasinal.",
     "Recovery key password" : "Contrasinal da chave de recuperación",
     "Repeat recovery key password" : "Repita o contrasinal da chave de recuperación",
     "Change recovery key password:" : "Cambiar o contrasinal da chave de la recuperación:",
diff --git a/apps/encryption/l10n/gl.json b/apps/encryption/l10n/gl.json
index 7b23093716ba97a267134bec43b6975ca3e41300..6d72249083726ec8912c97c51a6cbb86deead4f7 100644
--- a/apps/encryption/l10n/gl.json
+++ b/apps/encryption/l10n/gl.json
@@ -23,7 +23,6 @@
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron preparadas, saia da sesión e volva a acceder de novo",
     "Enable recovery key" : "Activar a chave de recuperación",
     "Disable recovery key" : "Desactivar a chave de recuperación",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "A chave de recuperación é unha chave de cifrado adicional utilizada\n\t\tpara cifrar ficheiros. Permite a recuperación de ficheiros dun usuario se este esquece o seu contrasinal.",
     "Recovery key password" : "Contrasinal da chave de recuperación",
     "Repeat recovery key password" : "Repita o contrasinal da chave de recuperación",
     "Change recovery key password:" : "Cambiar o contrasinal da chave de la recuperación:",
diff --git a/apps/encryption/l10n/it.js b/apps/encryption/l10n/it.js
index 4088d2f69f9d28a2fb4d44c603f4a32194a362f9..7d86a8f1919255e5003c0a01a75740537830a70d 100644
--- a/apps/encryption/l10n/it.js
+++ b/apps/encryption/l10n/it.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
     "Enable recovery key" : "Abilita chiave di ripristino",
     "Disable recovery key" : "Disabilita chiave di ripristino",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "La chiave di ripristino è un chiave di cifratura aggiuntiva utilizzata\n\t\tper cifrare i file. Consente il ripristino dei file di un utente nel caso in cui l'utente smarrisca la propria password.",
     "Recovery key password" : "Password della chiave di recupero",
     "Repeat recovery key password" : "Ripeti la password della chiave di ripristino",
     "Change recovery key password:" : "Cambia la password della chiave di recupero:",
diff --git a/apps/encryption/l10n/it.json b/apps/encryption/l10n/it.json
index 685a3e03c355164202cc00bf57bf9bf2be7c4d55..b3265b5b7e60a17f4e3a24ea0ed429f5d81dbf78 100644
--- a/apps/encryption/l10n/it.json
+++ b/apps/encryption/l10n/it.json
@@ -23,7 +23,6 @@
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
     "Enable recovery key" : "Abilita chiave di ripristino",
     "Disable recovery key" : "Disabilita chiave di ripristino",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "La chiave di ripristino è un chiave di cifratura aggiuntiva utilizzata\n\t\tper cifrare i file. Consente il ripristino dei file di un utente nel caso in cui l'utente smarrisca la propria password.",
     "Recovery key password" : "Password della chiave di recupero",
     "Repeat recovery key password" : "Ripeti la password della chiave di ripristino",
     "Change recovery key password:" : "Cambia la password della chiave di recupero:",
diff --git a/apps/encryption/l10n/nl.js b/apps/encryption/l10n/nl.js
index 1428a84ca5606db84a4bb87c51fe0d70cf2ceefa..5ba099f0182797430e3fe19f67232d4c96251b90 100644
--- a/apps/encryption/l10n/nl.js
+++ b/apps/encryption/l10n/nl.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
     "Enable recovery key" : "Activeer herstelsleutel",
     "Disable recovery key" : "Deactiveer herstelsleutel",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "De herstelsleutel is een extra cryptografische sleutel die wordt gebruikt\n\t\tom bestanden te versleutelen. Die maakt het mogelijk bestanden te herstellen als de gebruiker het wachtwoord vergeet.",
     "Recovery key password" : "Wachtwoord herstelsleulel",
     "Repeat recovery key password" : "Herhaal wachtwoord herstelsleutel",
     "Change recovery key password:" : "Wijzig wachtwoord herstelsleutel:",
diff --git a/apps/encryption/l10n/nl.json b/apps/encryption/l10n/nl.json
index fdd8cfbfda749f019fa20654c5f6c16985838bc7..933f269b4e069e9faca7c540f9cbc563295537be 100644
--- a/apps/encryption/l10n/nl.json
+++ b/apps/encryption/l10n/nl.json
@@ -23,7 +23,6 @@
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
     "Enable recovery key" : "Activeer herstelsleutel",
     "Disable recovery key" : "Deactiveer herstelsleutel",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "De herstelsleutel is een extra cryptografische sleutel die wordt gebruikt\n\t\tom bestanden te versleutelen. Die maakt het mogelijk bestanden te herstellen als de gebruiker het wachtwoord vergeet.",
     "Recovery key password" : "Wachtwoord herstelsleulel",
     "Repeat recovery key password" : "Herhaal wachtwoord herstelsleutel",
     "Change recovery key password:" : "Wijzig wachtwoord herstelsleutel:",
diff --git a/apps/encryption/l10n/pt_BR.js b/apps/encryption/l10n/pt_BR.js
index af109057705615c801e616529b0149cd3d2af888..f68cd3ae667f50b21ffdd337be959ee2e4f89323 100644
--- a/apps/encryption/l10n/pt_BR.js
+++ b/apps/encryption/l10n/pt_BR.js
@@ -25,9 +25,12 @@ OC.L10N.register(
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente",
     "Enable recovery key" : "Habilitar recuperação de chave",
     "Disable recovery key" : "Dasabilitar chave de recuperação",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "A chave de recuperação é uma chave de criptografia extra que é usada para \ncriptografar arquivos. Ela permite a recuperação de arquivos de um usuário, se o usuário esquecer sua senha.",
     "Recovery key password" : "Senha da chave de recuperação",
+    "Repeat recovery key password" : "Repita senha da chave de recuperação",
     "Change recovery key password:" : "Mudar a senha da chave de recuperação:",
+    "Old recovery key password" : "Senha da chave de recuperação antiga",
+    "New recovery key password" : "Nova senha da chave de recuperação",
+    "Repeat new recovery key password" : "Repita a nova senha da chave de recuperação",
     "Change Password" : "Trocar Senha",
     "ownCloud basic encryption module" : "Modo de criptografia básico ownCloud",
     "Your private key password no longer matches your log-in password." : "A sua senha de chave privada não corresponde a sua senha de login.",
diff --git a/apps/encryption/l10n/pt_BR.json b/apps/encryption/l10n/pt_BR.json
index 93bc9bdd66d5f555896c6fddda1628c0e575ba48..aecf8ee11c1511b20ecf45879d501be8e8a8455c 100644
--- a/apps/encryption/l10n/pt_BR.json
+++ b/apps/encryption/l10n/pt_BR.json
@@ -23,9 +23,12 @@
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente",
     "Enable recovery key" : "Habilitar recuperação de chave",
     "Disable recovery key" : "Dasabilitar chave de recuperação",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "A chave de recuperação é uma chave de criptografia extra que é usada para \ncriptografar arquivos. Ela permite a recuperação de arquivos de um usuário, se o usuário esquecer sua senha.",
     "Recovery key password" : "Senha da chave de recuperação",
+    "Repeat recovery key password" : "Repita senha da chave de recuperação",
     "Change recovery key password:" : "Mudar a senha da chave de recuperação:",
+    "Old recovery key password" : "Senha da chave de recuperação antiga",
+    "New recovery key password" : "Nova senha da chave de recuperação",
+    "Repeat new recovery key password" : "Repita a nova senha da chave de recuperação",
     "Change Password" : "Trocar Senha",
     "ownCloud basic encryption module" : "Modo de criptografia básico ownCloud",
     "Your private key password no longer matches your log-in password." : "A sua senha de chave privada não corresponde a sua senha de login.",
diff --git a/apps/encryption/l10n/ru.js b/apps/encryption/l10n/ru.js
index ca8b2574f0cb702bdca0df25d548527c1e6d0ea2..03af392d19e214fc3fb503108a61938f96c90ccb 100644
--- a/apps/encryption/l10n/ru.js
+++ b/apps/encryption/l10n/ru.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново",
     "Enable recovery key" : "Включить ключ восстановления",
     "Disable recovery key" : "Отключить ключ восстановления",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Ключ восстановления этот дополнительный ключ шифрования, используемый шифрования файлов. Он позволяет восстановить данные пользователя, если пользователь забыл свой пароль.",
     "Recovery key password" : "Пароль ключа восстановления",
     "Change recovery key password:" : "Смена пароля ключа восстановления:",
     "Change Password" : "Изменить пароль",
diff --git a/apps/encryption/l10n/ru.json b/apps/encryption/l10n/ru.json
index 49a65afc84dbaf58872dc47d942a0a173dab0f4d..2e2bcfd051311ee68fa3a18ae817178e95bff660 100644
--- a/apps/encryption/l10n/ru.json
+++ b/apps/encryption/l10n/ru.json
@@ -23,7 +23,6 @@
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново",
     "Enable recovery key" : "Включить ключ восстановления",
     "Disable recovery key" : "Отключить ключ восстановления",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Ключ восстановления этот дополнительный ключ шифрования, используемый шифрования файлов. Он позволяет восстановить данные пользователя, если пользователь забыл свой пароль.",
     "Recovery key password" : "Пароль ключа восстановления",
     "Change recovery key password:" : "Смена пароля ключа восстановления:",
     "Change Password" : "Изменить пароль",
diff --git a/apps/encryption/l10n/sr.js b/apps/encryption/l10n/sr.js
index 21f5d96f34da6e52117cbb429f5abbed820c0cfd..e528ed1a9d2f9df54640a6782d1907739e452307 100644
--- a/apps/encryption/l10n/sr.js
+++ b/apps/encryption/l10n/sr.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Апликација шифровања је укључена али ваши кључеви нису иницијализовани. Одјавите се и поново се пријавите.",
     "Enable recovery key" : "Омогући кључ за опоравак",
     "Disable recovery key" : "Онемогући кључ за опоравак",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Кључ за опоравак је додатни кључ за шифровање који се користи\n\t\tза шифровање фајлова. Омогућује опоравак корисничких фајлова ако корисник заборави своју лозинку.",
     "Recovery key password" : "Лозинка кључа за опоравак",
     "Repeat recovery key password" : "Поновите лозинку кључа за опоравак",
     "Change recovery key password:" : "Измена лозинке кључа опоравка:",
diff --git a/apps/encryption/l10n/sr.json b/apps/encryption/l10n/sr.json
index bb810a1dbb341b7c50fdabb2ee3eaa7d0cdc10ec..b15146e0b80d69b18e442694e4bd2d3af1e89721 100644
--- a/apps/encryption/l10n/sr.json
+++ b/apps/encryption/l10n/sr.json
@@ -23,7 +23,6 @@
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Апликација шифровања је укључена али ваши кључеви нису иницијализовани. Одјавите се и поново се пријавите.",
     "Enable recovery key" : "Омогући кључ за опоравак",
     "Disable recovery key" : "Онемогући кључ за опоравак",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Кључ за опоравак је додатни кључ за шифровање који се користи\n\t\tза шифровање фајлова. Омогућује опоравак корисничких фајлова ако корисник заборави своју лозинку.",
     "Recovery key password" : "Лозинка кључа за опоравак",
     "Repeat recovery key password" : "Поновите лозинку кључа за опоравак",
     "Change recovery key password:" : "Измена лозинке кључа опоравка:",
diff --git a/apps/encryption/l10n/tr.js b/apps/encryption/l10n/tr.js
index 768e29bcb703b733e2db617edaa89f022f62327b..f462437912e5c82f3d6057057495364e97d61a17 100644
--- a/apps/encryption/l10n/tr.js
+++ b/apps/encryption/l10n/tr.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
     "Enable recovery key" : "Kurtarma anahtarını aktif et",
     "Disable recovery key" : "Kurtarma anahtarını kapat",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Kurtarma anahtarı, dosyaların şifrelenmesi için daha fazla \nşifreleme sunar. Bu kullanıcının dosyasının şifresini unuttuğunda kurtarmasına imkan verir.",
     "Recovery key password" : "Kurtarma anahtarı parolası",
     "Change recovery key password:" : "Kurtarma anahtarı parolasını değiştir:",
     "Change Password" : "Parola DeÄŸiÅŸtir",
diff --git a/apps/encryption/l10n/tr.json b/apps/encryption/l10n/tr.json
index b607177afd728b82aea96a092ee2786c77951979..1f3dea88d573385ae98eb41e45611657aa1a018a 100644
--- a/apps/encryption/l10n/tr.json
+++ b/apps/encryption/l10n/tr.json
@@ -23,7 +23,6 @@
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
     "Enable recovery key" : "Kurtarma anahtarını aktif et",
     "Disable recovery key" : "Kurtarma anahtarını kapat",
-    "The recovery key is an extra encryption key that is used\n\t\tto encrypt files. It allows recovery of a user's files if the user forgets their password." : "Kurtarma anahtarı, dosyaların şifrelenmesi için daha fazla \nşifreleme sunar. Bu kullanıcının dosyasının şifresini unuttuğunda kurtarmasına imkan verir.",
     "Recovery key password" : "Kurtarma anahtarı parolası",
     "Change recovery key password:" : "Kurtarma anahtarı parolasını değiştir:",
     "Change Password" : "Parola DeÄŸiÅŸtir",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 0c9029379bb97b381007cc9a64b312c9443a9ba6..76b269cf4430bbd921b80561f3184e8c66df5efa 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -145,6 +145,7 @@ OC.L10N.register(
     "Enable server-side encryption" : "Ενεργοποίηση κρυπτογράφησης από το διακομιστή",
     "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Η κρυπτογράφηση είναι μια μη αντιστρεπτή διαδικασία. Μόλις ενεργοποιηθεί, όλα τα αρχεία από αυτό το σημείο και μετά θα κρυπτογραφηθούν στο διακομιστή και η κρυπτογράφηση δεν είναι δυνατόν να απενεργοποιηθεί αργότερα. Αυτή είναι η τελευταία προειδοποίηση: Θέλετε πραγματικά να ενεργοποιήσετε την κρυπτογράφηση;",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Δεν έχει φορτωθεί μονάδα κρυπτογράφησης, παρακαλούμε φορτώστε μια μονάδα κρυπτογράφησης από το μενού εφαρμογών.",
     "Select default encryption module:" : "Επιλογή προεπιλεγμένης μονάδας κρυπτογράφησης:",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"ownCloud Default Encryption Module\" and run 'occ encryption:migrate'" : "Πρέπει να μεταφέρετε τα κλειδιά κρυπτογράφησής σας από την παλιά κρυπτογράφηση (ownCloud <= 8.0) στην καινούρια. Παρακαλούμε ενεργοποιήστε την \"Προεπιλεγμένη Μονάδα Κρυπτογράφησης του ownCloud\" και εκτελέστε την εντολή 'occ encryption:migrate'",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Πρέπει να μεταφέρετε τα κλειδιά σας κρυπτογράφησης από την παλιά κρυπτογράφηση (ownCloud <= 8.0) στην καινούρια.",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 9c1046d962d63d1965d6659c1bf0c97d66e57d7a..023062181558740bc02bf5cfac22e24bff3d9d12 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -143,6 +143,7 @@
     "Enable server-side encryption" : "Ενεργοποίηση κρυπτογράφησης από το διακομιστή",
     "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Η κρυπτογράφηση είναι μια μη αντιστρεπτή διαδικασία. Μόλις ενεργοποιηθεί, όλα τα αρχεία από αυτό το σημείο και μετά θα κρυπτογραφηθούν στο διακομιστή και η κρυπτογράφηση δεν είναι δυνατόν να απενεργοποιηθεί αργότερα. Αυτή είναι η τελευταία προειδοποίηση: Θέλετε πραγματικά να ενεργοποιήσετε την κρυπτογράφηση;",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Δεν έχει φορτωθεί μονάδα κρυπτογράφησης, παρακαλούμε φορτώστε μια μονάδα κρυπτογράφησης από το μενού εφαρμογών.",
     "Select default encryption module:" : "Επιλογή προεπιλεγμένης μονάδας κρυπτογράφησης:",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"ownCloud Default Encryption Module\" and run 'occ encryption:migrate'" : "Πρέπει να μεταφέρετε τα κλειδιά κρυπτογράφησής σας από την παλιά κρυπτογράφηση (ownCloud <= 8.0) στην καινούρια. Παρακαλούμε ενεργοποιήστε την \"Προεπιλεγμένη Μονάδα Κρυπτογράφησης του ownCloud\" και εκτελέστε την εντολή 'occ encryption:migrate'",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Πρέπει να μεταφέρετε τα κλειδιά σας κρυπτογράφησης από την παλιά κρυπτογράφηση (ownCloud <= 8.0) στην καινούρια.",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 4420dcd2bcfb27ce3ae33a336e990f8c7cc050df..f516d763038d657c6cfbd55d7a2c0a1f3e4d42b4 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -145,6 +145,7 @@ OC.L10N.register(
     "Enable server-side encryption" : "Habilitar a Criptografia do Lado do Servidor",
     "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "A criptografia é um processo de um caminho. Uma vez que a criptografia esteja habilitada, todos os arquivos a partir desse ponto em diante serão criptografados no servidor e não será possível desativar a criptografia em uma data posterior. Este é o aviso final: Você realmente quer ativar a criptografia?",
     "Enable encryption" : "Ativar criptografia",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de criptografia carregado, por favor, ative um módulo de criptografia no menu de aplicativos.",
     "Select default encryption module:" : "Selecione o módulo de criptografia padrão:",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"ownCloud Default Encryption Module\" and run 'occ encryption:migrate'" : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova. Ative o \"Módulo de criptografia padrão ownCloud\" e execute  'occ encryption:migrate'",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova.",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index c8ee94182c943febb8a91e3d549e4bb138df813b..f982b48d15078f4a01ce140ee2c39e89b0d0172f 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -143,6 +143,7 @@
     "Enable server-side encryption" : "Habilitar a Criptografia do Lado do Servidor",
     "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "A criptografia é um processo de um caminho. Uma vez que a criptografia esteja habilitada, todos os arquivos a partir desse ponto em diante serão criptografados no servidor e não será possível desativar a criptografia em uma data posterior. Este é o aviso final: Você realmente quer ativar a criptografia?",
     "Enable encryption" : "Ativar criptografia",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de criptografia carregado, por favor, ative um módulo de criptografia no menu de aplicativos.",
     "Select default encryption module:" : "Selecione o módulo de criptografia padrão:",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"ownCloud Default Encryption Module\" and run 'occ encryption:migrate'" : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova. Ative o \"Módulo de criptografia padrão ownCloud\" e execute  'occ encryption:migrate'",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova.",