[tx-robot] updated from transifex

88 files changed, 82 insertions, 446 deletions

diff --git a/apps/encryption/l10n/ar.js b/apps/encryption/l10n/ar.js
index 446f2bda9a3..3e3d73ead26 100644
--- a/apps/encryption/l10n/ar.js
+++ b/apps/encryption/l10n/ar.js
@@ -11,11 +11,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "المفتاح الخاص بتشفير التطبيقات غير صالح. يرجى تحديث كلمة السر الخاصة بالمفتاح الخاص من الإعدادت الشخصية حتى تتمكن من الوصول للملفات المشفرة.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
     "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" : "عدل كلمة السر",
     " If you don't remember your old password you can ask your administrator to recover your files." : "اذا كنت لاتتذكر كلمة السر تستطيع ان تطلب من المدير ان يستعيد ملفاتك.",
     "Old log-in password" : "كلمة المرور القديمة الخاصة بالدخول",
diff --git a/apps/encryption/l10n/ar.json b/apps/encryption/l10n/ar.json
index b1dd298d419..8cb0aa2e3a5 100644
--- a/apps/encryption/l10n/ar.json
+++ b/apps/encryption/l10n/ar.json
@@ -9,11 +9,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "المفتاح الخاص بتشفير التطبيقات غير صالح. يرجى تحديث كلمة السر الخاصة بالمفتاح الخاص من الإعدادت الشخصية حتى تتمكن من الوصول للملفات المشفرة.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
     "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" : "عدل كلمة السر",
     " If you don't remember your old password you can ask your administrator to recover your files." : "اذا كنت لاتتذكر كلمة السر تستطيع ان تطلب من المدير ان يستعيد ملفاتك.",
     "Old log-in password" : "كلمة المرور القديمة الخاصة بالدخول",
diff --git a/apps/encryption/l10n/ast.js b/apps/encryption/l10n/ast.js
index b5d4796ade9..637a66d178c 100644
--- a/apps/encryption/l10n/ast.js
+++ b/apps/encryption/l10n/ast.js
@@ -11,11 +11,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clave privada non válida pa Encryption. Por favor, anueva la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
     "Recovery key password" : "Contraseña de clave de recuperación",
-    "Repeat Recovery key password" : "Repeti la contraseña de clave de recuperación",
     "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
-    "Old Recovery key password" : "Clave de recuperación vieya",
-    "New Recovery key password" : "Clave de recuperación nueva",
-    "Repeat New Recovery key password" : "Repetir la clave de recuperación nueva",
     "Change Password" : "Camudar contraseña",
     "Set your old private key password to your current log-in password:" : "Afita la contraseña de clave privada vieya pa la to contraseña d'aniciu de sesión actual:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.",
diff --git a/apps/encryption/l10n/ast.json b/apps/encryption/l10n/ast.json
index f58905f762a..30f3c70aab8 100644
--- a/apps/encryption/l10n/ast.json
+++ b/apps/encryption/l10n/ast.json
@@ -9,11 +9,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clave privada non válida pa Encryption. Por favor, anueva la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
     "Recovery key password" : "Contraseña de clave de recuperación",
-    "Repeat Recovery key password" : "Repeti la contraseña de clave de recuperación",
     "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
-    "Old Recovery key password" : "Clave de recuperación vieya",
-    "New Recovery key password" : "Clave de recuperación nueva",
-    "Repeat New Recovery key password" : "Repetir la clave de recuperación nueva",
     "Change Password" : "Camudar contraseña",
     "Set your old private key password to your current log-in password:" : "Afita la contraseña de clave privada vieya pa la to contraseña d'aniciu de sesión actual:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.",
diff --git a/apps/encryption/l10n/az.js b/apps/encryption/l10n/az.js
index f453f5aa757..b82034083e9 100644
--- a/apps/encryption/l10n/az.js
+++ b/apps/encryption/l10n/az.js
@@ -20,11 +20,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifrələnmə proqramı üçün yalnış şəxsi açar. Xahiş olunur öz şəxsi quraşdırmalarınızda şəxsi açarınızı yeniləyəsiniz ki, şifrələnmiş fayllara yetki ala biləsiniz.   ",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Proqram şifrələnməsi işə salınıb ancaq, sizin açarlar inisializasiya edilməyib. Xahiş edilir çıxıb yenidən daxil olasınız",
     "Recovery key password" : "Açar şifrənin bərpa edilməsi",
-    "Repeat Recovery key password" : "Bərpa açarın şifrəsini təkrar edin",
     "Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
-    "Old Recovery key password" : "Köhnə bərpa açarı şifrəsi",
-    "New Recovery key password" : "Yeni bərpa açarı şifrəsi",
-    "Repeat New Recovery key password" : "Yeni bərpa açarı şifrəsini təkrar edin",
     "Change Password" : "Şifrəni dəyişdir",
     "Your private key password no longer matches your log-in password." : "Sizin gizli açar şifrəsi, artıq giriş adınızla uyğun gəlmir.",
     "Set your old private key password to your current log-in password:" : "Köhnə açar şifrənizi, sizin hal-hazırki giriş şifrənizə təyin edin: ",
diff --git a/apps/encryption/l10n/az.json b/apps/encryption/l10n/az.json
index 72f5c2a29df..32f59791733 100644
--- a/apps/encryption/l10n/az.json
+++ b/apps/encryption/l10n/az.json
@@ -18,11 +18,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifrələnmə proqramı üçün yalnış şəxsi açar. Xahiş olunur öz şəxsi quraşdırmalarınızda şəxsi açarınızı yeniləyəsiniz ki, şifrələnmiş fayllara yetki ala biləsiniz.   ",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Proqram şifrələnməsi işə salınıb ancaq, sizin açarlar inisializasiya edilməyib. Xahiş edilir çıxıb yenidən daxil olasınız",
     "Recovery key password" : "Açar şifrənin bərpa edilməsi",
-    "Repeat Recovery key password" : "Bərpa açarın şifrəsini təkrar edin",
     "Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
-    "Old Recovery key password" : "Köhnə bərpa açarı şifrəsi",
-    "New Recovery key password" : "Yeni bərpa açarı şifrəsi",
-    "Repeat New Recovery key password" : "Yeni bərpa açarı şifrəsini təkrar edin",
     "Change Password" : "Şifrəni dəyişdir",
     "Your private key password no longer matches your log-in password." : "Sizin gizli açar şifrəsi, artıq giriş adınızla uyğun gəlmir.",
     "Set your old private key password to your current log-in password:" : "Köhnə açar şifrənizi, sizin hal-hazırki giriş şifrənizə təyin edin: ",
diff --git a/apps/encryption/l10n/bg_BG.js b/apps/encryption/l10n/bg_BG.js
index e6a064201eb..4683f2c05bc 100644
--- a/apps/encryption/l10n/bg_BG.js
+++ b/apps/encryption/l10n/bg_BG.js
@@ -20,11 +20,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
     "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" : "Промени Паролата",
     "Your private key password no longer matches your log-in password." : "Личният ти ключ не съвпада с паролата за вписване.",
     "Set your old private key password to your current log-in password:" : "Промени паролата за тайния ти включ на паролата за вписване:",
diff --git a/apps/encryption/l10n/bg_BG.json b/apps/encryption/l10n/bg_BG.json
index 23df23adc79..562dd0d2af5 100644
--- a/apps/encryption/l10n/bg_BG.json
+++ b/apps/encryption/l10n/bg_BG.json
@@ -18,11 +18,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
     "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" : "Промени Паролата",
     "Your private key password no longer matches your log-in password." : "Личният ти ключ не съвпада с паролата за вписване.",
     "Set your old private key password to your current log-in password:" : "Промени паролата за тайния ти включ на паролата за вписване:",
diff --git a/apps/encryption/l10n/bn_BD.js b/apps/encryption/l10n/bn_BD.js
index 83a18e92f88..f91008e2408 100644
--- a/apps/encryption/l10n/bn_BD.js
+++ b/apps/encryption/l10n/bn_BD.js
@@ -4,11 +4,7 @@ OC.L10N.register(
     "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
     "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
     "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
-    "Repeat Recovery key password" : "পূণরূদ্ধার কি এর  কুটশব্দ পূণরায় দিন",
     "Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
-    "Old Recovery key password" : "পূণরূদ্ধার কি এর  পুরাতন কুটশব্দ",
-    "New Recovery key password" : "পূণরূদ্ধার কি এর  নতুন কুটশব্দ",
-    "Repeat New Recovery key password" : "পূণরূদ্ধার কি এর  নতুন কুটশব্দ পূণরায় দিন",
     "Change Password" : "কূটশব্দ পরিবর্তন করুন",
     "Enabled" : "কার্যকর",
     "Disabled" : "অকার্যকর"
diff --git a/apps/encryption/l10n/bn_BD.json b/apps/encryption/l10n/bn_BD.json
index 4ce04754e6b..375bbd517a7 100644
--- a/apps/encryption/l10n/bn_BD.json
+++ b/apps/encryption/l10n/bn_BD.json
@@ -2,11 +2,7 @@
     "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
     "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
     "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
-    "Repeat Recovery key password" : "পূণরূদ্ধার কি এর  কুটশব্দ পূণরায় দিন",
     "Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
-    "Old Recovery key password" : "পূণরূদ্ধার কি এর  পুরাতন কুটশব্দ",
-    "New Recovery key password" : "পূণরূদ্ধার কি এর  নতুন কুটশব্দ",
-    "Repeat New Recovery key password" : "পূণরূদ্ধার কি এর  নতুন কুটশব্দ পূণরায় দিন",
     "Change Password" : "কূটশব্দ পরিবর্তন করুন",
     "Enabled" : "কার্যকর",
     "Disabled" : "অকার্যকর"
diff --git a/apps/encryption/l10n/ca.js b/apps/encryption/l10n/ca.js
index d9351d848a1..d1eff280140 100644
--- a/apps/encryption/l10n/ca.js
+++ b/apps/encryption/l10n/ca.js
@@ -11,11 +11,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clau privada de l'aplicació d'encriptació no és vàlida! Actualitzeu la contrasenya de la clau privada a l'arranjament personal per recuperar els fitxers encriptats.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.",
     "Recovery key password" : "Clau de recuperació de la contrasenya",
-    "Repeat Recovery key password" : "Repetiu la clau de recuperació de contrasenya",
     "Change recovery key password:" : "Canvia la clau de recuperació de contrasenya:",
-    "Old Recovery key password" : "Antiga clau de recuperació de contrasenya",
-    "New Recovery key password" : "Nova clau de recuperació de contrasenya",
-    "Repeat New Recovery key password" : "Repetiu la nova clau de recuperació de contrasenya",
     "Change Password" : "Canvia la contrasenya",
     "Your private key password no longer matches your log-in password." : "La clau privada ja no es correspon amb la contrasenya d'accés:",
     "Set your old private key password to your current log-in password:" : "Establiu la vostra antiga clau privada a l'actual contrasenya d'accés:",
diff --git a/apps/encryption/l10n/ca.json b/apps/encryption/l10n/ca.json
index 16205e27683..0bb29d59c5a 100644
--- a/apps/encryption/l10n/ca.json
+++ b/apps/encryption/l10n/ca.json
@@ -9,11 +9,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clau privada de l'aplicació d'encriptació no és vàlida! Actualitzeu la contrasenya de la clau privada a l'arranjament personal per recuperar els fitxers encriptats.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.",
     "Recovery key password" : "Clau de recuperació de la contrasenya",
-    "Repeat Recovery key password" : "Repetiu la clau de recuperació de contrasenya",
     "Change recovery key password:" : "Canvia la clau de recuperació de contrasenya:",
-    "Old Recovery key password" : "Antiga clau de recuperació de contrasenya",
-    "New Recovery key password" : "Nova clau de recuperació de contrasenya",
-    "Repeat New Recovery key password" : "Repetiu la nova clau de recuperació de contrasenya",
     "Change Password" : "Canvia la contrasenya",
     "Your private key password no longer matches your log-in password." : "La clau privada ja no es correspon amb la contrasenya d'accés:",
     "Set your old private key password to your current log-in password:" : "Establiu la vostra antiga clau privada a l'actual contrasenya d'accés:",
diff --git a/apps/encryption/l10n/cs_CZ.js b/apps/encryption/l10n/cs_CZ.js
index 1dc7a468233..75a36e772ca 100644
--- a/apps/encryption/l10n/cs_CZ.js
+++ b/apps/encryption/l10n/cs_CZ.js
@@ -23,17 +23,12 @@ OC.L10N.register(
     "Private key password successfully updated." : "Heslo soukromého klíče úspěšně aktualizováno.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
-    "ownCloud basic encryption module" : "ownCloud základní šifrovací modul",
-    "Enable recovery key: " : "Povolit záchranný klíč:",
-    "Recovery key password" : "Heslo klíče pro obnovu",
-    "Repeat Recovery key password" : "Zopakujte heslo klíče pro obnovu",
     "Enable recovery key" : "Povolit záchranný klíč",
     "Disable recovery key" : "Vypnout záchranný klíč",
+    "Recovery key password" : "Heslo klíče pro obnovu",
     "Change recovery key password:" : "Změna hesla klíče pro obnovu:",
-    "Old Recovery key password" : "Původní heslo klíče pro obnovu",
-    "New Recovery key password" : "Nové heslo klíče pro obnovu",
-    "Repeat New Recovery key password" : "Zopakujte nové heslo klíče pro obnovu",
     "Change Password" : "Změnit heslo",
+    "ownCloud basic encryption module" : "ownCloud základní šifrovací modul",
     "Your private key password no longer matches your log-in password." : "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem.",
     "Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
diff --git a/apps/encryption/l10n/cs_CZ.json b/apps/encryption/l10n/cs_CZ.json
index 4c93ef45ac1..c069a74b710 100644
--- a/apps/encryption/l10n/cs_CZ.json
+++ b/apps/encryption/l10n/cs_CZ.json
@@ -21,17 +21,12 @@
     "Private key password successfully updated." : "Heslo soukromého klíče úspěšně aktualizováno.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
-    "ownCloud basic encryption module" : "ownCloud základní šifrovací modul",
-    "Enable recovery key: " : "Povolit záchranný klíč:",
-    "Recovery key password" : "Heslo klíče pro obnovu",
-    "Repeat Recovery key password" : "Zopakujte heslo klíče pro obnovu",
     "Enable recovery key" : "Povolit záchranný klíč",
     "Disable recovery key" : "Vypnout záchranný klíč",
+    "Recovery key password" : "Heslo klíče pro obnovu",
     "Change recovery key password:" : "Změna hesla klíče pro obnovu:",
-    "Old Recovery key password" : "Původní heslo klíče pro obnovu",
-    "New Recovery key password" : "Nové heslo klíče pro obnovu",
-    "Repeat New Recovery key password" : "Zopakujte nové heslo klíče pro obnovu",
     "Change Password" : "Změnit heslo",
+    "ownCloud basic encryption module" : "ownCloud základní šifrovací modul",
     "Your private key password no longer matches your log-in password." : "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem.",
     "Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
diff --git a/apps/encryption/l10n/da.js b/apps/encryption/l10n/da.js
index 806a2a15e9a..233c3b7ae68 100644
--- a/apps/encryption/l10n/da.js
+++ b/apps/encryption/l10n/da.js
@@ -21,14 +21,10 @@ OC.L10N.register(
     "Private key password successfully updated." : "Privat nøgle kodeord succesfuldt opdateret.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
-    "ownCloud basic encryption module" : "ownCloud basis krypteringsmodul",
     "Recovery key password" : "Gendannelsesnøgle kodeord",
-    "Repeat Recovery key password" : "Gentag gendannelse af nøglekoden",
     "Change recovery key password:" : "Skift gendannelsesnøgle kodeord:",
-    "Old Recovery key password" : "Gammel Gendannelsesnøgle kodeord",
-    "New Recovery key password" : "Ny Gendannelsesnøgle kodeord",
-    "Repeat New Recovery key password" : "Gentag det nye gendannaleses nøglekodeord",
     "Change Password" : "Skift Kodeord",
+    "ownCloud basic encryption module" : "ownCloud basis krypteringsmodul",
     "Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
     "Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
diff --git a/apps/encryption/l10n/da.json b/apps/encryption/l10n/da.json
index 0511170d8ff..a3c69c46a09 100644
--- a/apps/encryption/l10n/da.json
+++ b/apps/encryption/l10n/da.json
@@ -19,14 +19,10 @@
     "Private key password successfully updated." : "Privat nøgle kodeord succesfuldt opdateret.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
-    "ownCloud basic encryption module" : "ownCloud basis krypteringsmodul",
     "Recovery key password" : "Gendannelsesnøgle kodeord",
-    "Repeat Recovery key password" : "Gentag gendannelse af nøglekoden",
     "Change recovery key password:" : "Skift gendannelsesnøgle kodeord:",
-    "Old Recovery key password" : "Gammel Gendannelsesnøgle kodeord",
-    "New Recovery key password" : "Ny Gendannelsesnøgle kodeord",
-    "Repeat New Recovery key password" : "Gentag det nye gendannaleses nøglekodeord",
     "Change Password" : "Skift Kodeord",
+    "ownCloud basic encryption module" : "ownCloud basis krypteringsmodul",
     "Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
     "Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
diff --git a/apps/encryption/l10n/de.js b/apps/encryption/l10n/de.js
index defbd8ae8b2..a8c71e89de5 100644
--- a/apps/encryption/l10n/de.js
+++ b/apps/encryption/l10n/de.js
@@ -23,17 +23,12 @@ OC.L10N.register(
     "Private key password successfully updated." : "Passwort des privaten Schlüssels erfolgreich aktualisiert",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselung-App. Bitte aktualisiere Dein privates Schlüssel-Passwort, um den Zugriff auf Deine verschlüsselten Dateien wiederherzustellen.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melde Dich nochmals ab und wieder an.",
-    "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
-    "Enable recovery key: " : "Wiederherstellungsschlüssel aktivieren:",
-    "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
-    "Repeat Recovery key password" : "Schlüssel-Passwort zur Wiederherstellung wiederholen",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
+    "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
     "Change recovery key password:" : "Wiederherstellungsschlüssel-Passwort ändern:",
-    "Old Recovery key password" : "Altes Wiederherstellungsschlüssel-Passwort",
-    "New Recovery key password" : "Neues Wiederherstellungsschlüssel-Passwort",
-    "Repeat New Recovery key password" : "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
     "Change Password" : "Passwort ändern",
+    "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
     "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:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.",
diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json
index a9d19846c93..e7c1c3be813 100644
--- a/apps/encryption/l10n/de.json
+++ b/apps/encryption/l10n/de.json
@@ -21,17 +21,12 @@
     "Private key password successfully updated." : "Passwort des privaten Schlüssels erfolgreich aktualisiert",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselung-App. Bitte aktualisiere Dein privates Schlüssel-Passwort, um den Zugriff auf Deine verschlüsselten Dateien wiederherzustellen.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melde Dich nochmals ab und wieder an.",
-    "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
-    "Enable recovery key: " : "Wiederherstellungsschlüssel aktivieren:",
-    "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
-    "Repeat Recovery key password" : "Schlüssel-Passwort zur Wiederherstellung wiederholen",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
+    "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
     "Change recovery key password:" : "Wiederherstellungsschlüssel-Passwort ändern:",
-    "Old Recovery key password" : "Altes Wiederherstellungsschlüssel-Passwort",
-    "New Recovery key password" : "Neues Wiederherstellungsschlüssel-Passwort",
-    "Repeat New Recovery key password" : "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
     "Change Password" : "Passwort ändern",
+    "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
     "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:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.",
diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js
index 4e8276ec039..3fabdfe711c 100644
--- a/apps/encryption/l10n/de_DE.js
+++ b/apps/encryption/l10n/de_DE.js
@@ -23,17 +23,12 @@ OC.L10N.register(
     "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihr privates Schlüsselpasswort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
-    "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
-    "Enable recovery key: " : "Wiederherstellungsschlüssel aktivieren:",
-    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
-    "Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
+    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
     "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
-    "Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort",
-    "New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ",
-    "Repeat New Recovery key password" : "Neues Schlüsselpasswort zur Wiederherstellung wiederholen",
     "Change Password" : "Passwort ändern",
+    "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
     "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:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json
index f8d984a081b..f9fd7207789 100644
--- a/apps/encryption/l10n/de_DE.json
+++ b/apps/encryption/l10n/de_DE.json
@@ -21,17 +21,12 @@
     "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihr privates Schlüsselpasswort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
-    "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
-    "Enable recovery key: " : "Wiederherstellungsschlüssel aktivieren:",
-    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
-    "Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
+    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
     "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
-    "Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort",
-    "New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ",
-    "Repeat New Recovery key password" : "Neues Schlüsselpasswort zur Wiederherstellung wiederholen",
     "Change Password" : "Passwort ändern",
+    "ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
     "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:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
diff --git a/apps/encryption/l10n/el.js b/apps/encryption/l10n/el.js
index f8a28e77a5f..ad9643dabf2 100644
--- a/apps/encryption/l10n/el.js
+++ b/apps/encryption/l10n/el.js
@@ -23,18 +23,13 @@ OC.L10N.register(
     "Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
-    "ownCloud basic encryption module" : "Βασική μονάδα κρυπτογράφησης του ",
-    "Enable recovery key: " : "Ενεργοποίηση κλειδιού ανάκτησης:",
-    "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" : "Επαναλάβετε το κλειδί επαναφοράς κωδικού",
     "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" : "Επαναφορά κωδικού κλειδιού",
     "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." : "Ο κωδικός του ιδιωτικού κλειδιού σας δεν ταιριάζει πλέον με τον κωδικό σύνδεσής σας.",
     "Set your old private key password to your current log-in password:" : "Ορίστε τον παλιό σας κωδικό ιδιωτικού κλειδιού στον τρέχοντα κωδικό σύνδεσης.",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Εάν δεν θυμάστε τον παλιό σας κωδικό μπορείτε να ζητήσετε από τον διαχειριστή σας να επανακτήσει τα αρχεία σας.",
diff --git a/apps/encryption/l10n/el.json b/apps/encryption/l10n/el.json
index 7939f97e426..1e487d5c5b6 100644
--- a/apps/encryption/l10n/el.json
+++ b/apps/encryption/l10n/el.json
@@ -21,18 +21,13 @@
     "Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
-    "ownCloud basic encryption module" : "Βασική μονάδα κρυπτογράφησης του ",
-    "Enable recovery key: " : "Ενεργοποίηση κλειδιού ανάκτησης:",
-    "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" : "Επαναλάβετε το κλειδί επαναφοράς κωδικού",
     "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" : "Επαναφορά κωδικού κλειδιού",
     "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." : "Ο κωδικός του ιδιωτικού κλειδιού σας δεν ταιριάζει πλέον με τον κωδικό σύνδεσής σας.",
     "Set your old private key password to your current log-in password:" : "Ορίστε τον παλιό σας κωδικό ιδιωτικού κλειδιού στον τρέχοντα κωδικό σύνδεσης.",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Εάν δεν θυμάστε τον παλιό σας κωδικό μπορείτε να ζητήσετε από τον διαχειριστή σας να επανακτήσει τα αρχεία σας.",
diff --git a/apps/encryption/l10n/en_GB.js b/apps/encryption/l10n/en_GB.js
index a9668b26ab0..678c62f982d 100644
--- a/apps/encryption/l10n/en_GB.js
+++ b/apps/encryption/l10n/en_GB.js
@@ -21,14 +21,10 @@ OC.L10N.register(
     "Private key password successfully updated." : "Private key password updated successfully.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
-    "ownCloud basic encryption module" : "ownCloud basic encryption module",
     "Recovery key password" : "Recovery key password",
-    "Repeat Recovery key password" : "Repeat recovery key password",
     "Change recovery key password:" : "Change recovery key password:",
-    "Old Recovery key password" : "Old recovery key password",
-    "New Recovery key password" : "New recovery key password",
-    "Repeat New Recovery key password" : "Repeat new recovery key password",
     "Change Password" : "Change Password",
+    "ownCloud basic encryption module" : "ownCloud basic encryption module",
     "Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
     "Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
     " If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
diff --git a/apps/encryption/l10n/en_GB.json b/apps/encryption/l10n/en_GB.json
index 4d77e4353fb..6132868f396 100644
--- a/apps/encryption/l10n/en_GB.json
+++ b/apps/encryption/l10n/en_GB.json
@@ -19,14 +19,10 @@
     "Private key password successfully updated." : "Private key password updated successfully.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
-    "ownCloud basic encryption module" : "ownCloud basic encryption module",
     "Recovery key password" : "Recovery key password",
-    "Repeat Recovery key password" : "Repeat recovery key password",
     "Change recovery key password:" : "Change recovery key password:",
-    "Old Recovery key password" : "Old recovery key password",
-    "New Recovery key password" : "New recovery key password",
-    "Repeat New Recovery key password" : "Repeat new recovery key password",
     "Change Password" : "Change Password",
+    "ownCloud basic encryption module" : "ownCloud basic encryption module",
     "Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
     "Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
     " If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
index 43951951c54..36cd347491c 100644
--- a/apps/encryption/l10n/es.js
+++ b/apps/encryption/l10n/es.js
@@ -23,18 +23,13 @@ OC.L10N.register(
     "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
-    "ownCloud basic encryption module" : "Módulo básico de cifrado ownCloud",
-    "Enable recovery key: " : "Activa 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" : "Repite la contraseña de clave de recuperación",
     "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",
     "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
-    "Old Recovery key password" : "Antigua clave de recuperación",
-    "New Recovery key password" : "Nueva clave de recuperación",
-    "Repeat New Recovery key password" : "Repetir la nueva clave de recuperación",
     "Change Password" : "Cambiar contraseña",
+    "ownCloud basic encryption module" : "Módulo básico de cifrado ownCloud",
     "Your private key password no longer matches your log-in password." : "Su contraseña de clave privada ya no coincide con su contraseña de acceso.",
     "Set your old private key password to your current log-in password:" : "Establezca la contraseña de clave privada antigua para su contraseña de inicio de sesión actual:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros.",
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
index 43c69c0aa05..c5492a2250a 100644
--- a/apps/encryption/l10n/es.json
+++ b/apps/encryption/l10n/es.json
@@ -21,18 +21,13 @@
     "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
-    "ownCloud basic encryption module" : "Módulo básico de cifrado ownCloud",
-    "Enable recovery key: " : "Activa 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" : "Repite la contraseña de clave de recuperación",
     "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",
     "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
-    "Old Recovery key password" : "Antigua clave de recuperación",
-    "New Recovery key password" : "Nueva clave de recuperación",
-    "Repeat New Recovery key password" : "Repetir la nueva clave de recuperación",
     "Change Password" : "Cambiar contraseña",
+    "ownCloud basic encryption module" : "Módulo básico de cifrado ownCloud",
     "Your private key password no longer matches your log-in password." : "Su contraseña de clave privada ya no coincide con su contraseña de acceso.",
     "Set your old private key password to your current log-in password:" : "Establezca la contraseña de clave privada antigua para su contraseña de inicio de sesión actual:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros.",
diff --git a/apps/encryption/l10n/es_AR.js b/apps/encryption/l10n/es_AR.js
index c3e1d60982e..4b47a49e629 100644
--- a/apps/encryption/l10n/es_AR.js
+++ b/apps/encryption/l10n/es_AR.js
@@ -11,11 +11,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Llave privada inválida para la aplicación de encriptación. Por favor actualice la clave de la llave privada en las configuraciones personales para recobrar el acceso a sus archivos encriptados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión",
     "Recovery key password" : "Contraseña de recuperación de clave",
-    "Repeat Recovery key password" : "Repetir la contraseña de la clave de recuperación",
     "Change recovery key password:" : "Cambiar contraseña para recuperar la clave:",
-    "Old Recovery key password" : "Contraseña antigua de recuperación de clave",
-    "New Recovery key password" : "Nueva contraseña de recuperación de clave",
-    "Repeat New Recovery key password" : "Repetir Nueva contraseña para la clave de recuperación",
     "Change Password" : "Cambiar contraseña",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos",
     "Old log-in password" : "Contraseña anterior",
diff --git a/apps/encryption/l10n/es_AR.json b/apps/encryption/l10n/es_AR.json
index b344e3e8f9e..9c5d2519333 100644
--- a/apps/encryption/l10n/es_AR.json
+++ b/apps/encryption/l10n/es_AR.json
@@ -9,11 +9,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Llave privada inválida para la aplicación de encriptación. Por favor actualice la clave de la llave privada en las configuraciones personales para recobrar el acceso a sus archivos encriptados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión",
     "Recovery key password" : "Contraseña de recuperación de clave",
-    "Repeat Recovery key password" : "Repetir la contraseña de la clave de recuperación",
     "Change recovery key password:" : "Cambiar contraseña para recuperar la clave:",
-    "Old Recovery key password" : "Contraseña antigua de recuperación de clave",
-    "New Recovery key password" : "Nueva contraseña de recuperación de clave",
-    "Repeat New Recovery key password" : "Repetir Nueva contraseña para la clave de recuperación",
     "Change Password" : "Cambiar contraseña",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos",
     "Old log-in password" : "Contraseña anterior",
diff --git a/apps/encryption/l10n/es_MX.js b/apps/encryption/l10n/es_MX.js
index 3ee57f500f1..64bfc291f82 100644
--- a/apps/encryption/l10n/es_MX.js
+++ b/apps/encryption/l10n/es_MX.js
@@ -11,11 +11,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la aplicación de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
     "Recovery key password" : "Contraseña de clave de recuperación",
-    "Repeat Recovery key password" : "Repite la contraseña de clave de recuperación",
     "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
-    "Old Recovery key password" : "Antigua clave de recuperación",
-    "New Recovery key password" : "Nueva clave de recuperación",
-    "Repeat New Recovery key password" : "Repetir la nueva clave de recuperación",
     "Change Password" : "Cambiar contraseña",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus archivos.",
     "Old log-in password" : "Contraseña de acceso antigua",
diff --git a/apps/encryption/l10n/es_MX.json b/apps/encryption/l10n/es_MX.json
index f36f0dbd5fd..9115513d7b1 100644
--- a/apps/encryption/l10n/es_MX.json
+++ b/apps/encryption/l10n/es_MX.json
@@ -9,11 +9,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la aplicación de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
     "Recovery key password" : "Contraseña de clave de recuperación",
-    "Repeat Recovery key password" : "Repite la contraseña de clave de recuperación",
     "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
-    "Old Recovery key password" : "Antigua clave de recuperación",
-    "New Recovery key password" : "Nueva clave de recuperación",
-    "Repeat New Recovery key password" : "Repetir la nueva clave de recuperación",
     "Change Password" : "Cambiar contraseña",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus archivos.",
     "Old log-in password" : "Contraseña de acceso antigua",
diff --git a/apps/encryption/l10n/et_EE.js b/apps/encryption/l10n/et_EE.js
index 5805b8e8e1c..6e2684058fe 100644
--- a/apps/encryption/l10n/et_EE.js
+++ b/apps/encryption/l10n/et_EE.js
@@ -20,11 +20,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.",
     "Recovery key password" : "Taastevõtme parool",
-    "Repeat Recovery key password" : "Korda taastevõtme parooli",
     "Change recovery key password:" : "Muuda taastevõtme parooli:",
-    "Old Recovery key password" : "Vana taastevõtme parool",
-    "New Recovery key password" : "Uus taastevõtme parool",
-    "Repeat New Recovery key password" : "Korda uut taastevõtme parooli",
     "Change Password" : "Muuda parooli",
     "Your private key password no longer matches your log-in password." : "Sinu provaatvõtme parool ei kattu enam sinu sisselogimise parooliga.",
     "Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",
diff --git a/apps/encryption/l10n/et_EE.json b/apps/encryption/l10n/et_EE.json
index 37887eb73b2..66839779f67 100644
--- a/apps/encryption/l10n/et_EE.json
+++ b/apps/encryption/l10n/et_EE.json
@@ -18,11 +18,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.",
     "Recovery key password" : "Taastevõtme parool",
-    "Repeat Recovery key password" : "Korda taastevõtme parooli",
     "Change recovery key password:" : "Muuda taastevõtme parooli:",
-    "Old Recovery key password" : "Vana taastevõtme parool",
-    "New Recovery key password" : "Uus taastevõtme parool",
-    "Repeat New Recovery key password" : "Korda uut taastevõtme parooli",
     "Change Password" : "Muuda parooli",
     "Your private key password no longer matches your log-in password." : "Sinu provaatvõtme parool ei kattu enam sinu sisselogimise parooliga.",
     "Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",
diff --git a/apps/encryption/l10n/eu.js b/apps/encryption/l10n/eu.js
index 10afacfcfac..083bd125ba9 100644
--- a/apps/encryption/l10n/eu.js
+++ b/apps/encryption/l10n/eu.js
@@ -20,11 +20,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Enkriptazio aplikaziorako gako pribatu okerra. Mesedez eguneratu zure gako pribatuaren pasahitza zure ezarpen pertsonaletan zure enkriptatuko fitxategietarako sarrera berreskuratzeko.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
     "Recovery key password" : "Berreskuratze gako pasahitza",
-    "Repeat Recovery key password" : "Errepikatu berreskuratze gakoaren pasahitza",
     "Change recovery key password:" : "Aldatu berreskuratze gako pasahitza:",
-    "Old Recovery key password" : "Berreskuratze gako pasahitz zaharra",
-    "New Recovery key password" : "Berreskuratze gako pasahitz berria",
-    "Repeat New Recovery key password" : "Errepikatu berreskuratze gako berriaren pasahitza",
     "Change Password" : "Aldatu Pasahitza",
     "Your private key password no longer matches your log-in password." : "Zure gako pasahitza pribatua ez da dagoeneko bat etortzen zure sartzeko pasahitzarekin.",
     "Set your old private key password to your current log-in password:" : "Ezarri zure gako pasahitz zaharra orain duzun  sartzeko pasahitzan:",
diff --git a/apps/encryption/l10n/eu.json b/apps/encryption/l10n/eu.json
index e1355ce6b06..88639331be4 100644
--- a/apps/encryption/l10n/eu.json
+++ b/apps/encryption/l10n/eu.json
@@ -18,11 +18,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Enkriptazio aplikaziorako gako pribatu okerra. Mesedez eguneratu zure gako pribatuaren pasahitza zure ezarpen pertsonaletan zure enkriptatuko fitxategietarako sarrera berreskuratzeko.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
     "Recovery key password" : "Berreskuratze gako pasahitza",
-    "Repeat Recovery key password" : "Errepikatu berreskuratze gakoaren pasahitza",
     "Change recovery key password:" : "Aldatu berreskuratze gako pasahitza:",
-    "Old Recovery key password" : "Berreskuratze gako pasahitz zaharra",
-    "New Recovery key password" : "Berreskuratze gako pasahitz berria",
-    "Repeat New Recovery key password" : "Errepikatu berreskuratze gako berriaren pasahitza",
     "Change Password" : "Aldatu Pasahitza",
     "Your private key password no longer matches your log-in password." : "Zure gako pasahitza pribatua ez da dagoeneko bat etortzen zure sartzeko pasahitzarekin.",
     "Set your old private key password to your current log-in password:" : "Ezarri zure gako pasahitz zaharra orain duzun  sartzeko pasahitzan:",
diff --git a/apps/encryption/l10n/fa.js b/apps/encryption/l10n/fa.js
index dd1dff78984..493b3992a62 100644
--- a/apps/encryption/l10n/fa.js
+++ b/apps/encryption/l10n/fa.js
@@ -10,8 +10,6 @@ OC.L10N.register(
     "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
     "Recovery key password" : "رمزعبور کلید بازیابی",
     "Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
-    "Old Recovery key password" : "رمزعبور قدیمی  کلید بازیابی ",
-    "New Recovery key password" : "رمزعبور جدید کلید بازیابی",
     "Change Password" : "تغییر رمزعبور",
     " If you don't remember your old password you can ask your administrator to recover your files." : "اگر رمزعبور قدیمی را فراموش کرده اید میتوانید از مدیر خود برای بازیابی فایل هایتان درخواست نمایید.",
     "Old log-in password" : "رمزعبور قدیمی",
diff --git a/apps/encryption/l10n/fa.json b/apps/encryption/l10n/fa.json
index 9d059a7cc1e..ccb7949e7e5 100644
--- a/apps/encryption/l10n/fa.json
+++ b/apps/encryption/l10n/fa.json
@@ -8,8 +8,6 @@
     "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
     "Recovery key password" : "رمزعبور کلید بازیابی",
     "Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
-    "Old Recovery key password" : "رمزعبور قدیمی  کلید بازیابی ",
-    "New Recovery key password" : "رمزعبور جدید کلید بازیابی",
     "Change Password" : "تغییر رمزعبور",
     " If you don't remember your old password you can ask your administrator to recover your files." : "اگر رمزعبور قدیمی را فراموش کرده اید میتوانید از مدیر خود برای بازیابی فایل هایتان درخواست نمایید.",
     "Old log-in password" : "رمزعبور قدیمی",
diff --git a/apps/encryption/l10n/fi_FI.js b/apps/encryption/l10n/fi_FI.js
index 6baefc8de4c..0de5b5d6a32 100644
--- a/apps/encryption/l10n/fi_FI.js
+++ b/apps/encryption/l10n/fi_FI.js
@@ -23,18 +23,13 @@ OC.L10N.register(
     "Private key password successfully updated." : "Yksityisen avaimen salasana päivitettiin onnistuneesti.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Salaussovelluksen salausavain on virheellinen. Ole hyvä ja päivitä salausavain henkilökohtaisissa asetuksissasi jotta voit taas avata salatuskirjoitetut tiedostosi.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
-    "ownCloud basic encryption module" : "ownCloudin perussalausmoduuli",
-    "Enable recovery key: " : "Ota palautusavain käyttöö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." : "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 palautusavaimen salasana",
     "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",
     "Change recovery key password:" : "Vaihda palautusavaimen salasana:",
-    "Old Recovery key password" : "Vanha palautusavaimen salasana",
-    "New Recovery key password" : "Uusi palautusavaimen salasana",
-    "Repeat New Recovery key password" : "Toista uusi palautusavaimen salasana",
     "Change Password" : "Vaihda salasana",
+    "ownCloud basic encryption module" : "ownCloudin perussalausmoduuli",
     "Your private key password no longer matches your log-in password." : "Salaisen avaimesi salasana ei enää vastaa kirjautumissalasanaasi.",
     "Set your old private key password to your current log-in password:" : "Aseta yksityisen avaimen vanha salasana vastaamaan nykyistä kirjautumissalasanaasi:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
diff --git a/apps/encryption/l10n/fi_FI.json b/apps/encryption/l10n/fi_FI.json
index a130fc98c77..f0788d13a44 100644
--- a/apps/encryption/l10n/fi_FI.json
+++ b/apps/encryption/l10n/fi_FI.json
@@ -21,18 +21,13 @@
     "Private key password successfully updated." : "Yksityisen avaimen salasana päivitettiin onnistuneesti.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Salaussovelluksen salausavain on virheellinen. Ole hyvä ja päivitä salausavain henkilökohtaisissa asetuksissasi jotta voit taas avata salatuskirjoitetut tiedostosi.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
-    "ownCloud basic encryption module" : "ownCloudin perussalausmoduuli",
-    "Enable recovery key: " : "Ota palautusavain käyttöö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." : "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 palautusavaimen salasana",
     "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",
     "Change recovery key password:" : "Vaihda palautusavaimen salasana:",
-    "Old Recovery key password" : "Vanha palautusavaimen salasana",
-    "New Recovery key password" : "Uusi palautusavaimen salasana",
-    "Repeat New Recovery key password" : "Toista uusi palautusavaimen salasana",
     "Change Password" : "Vaihda salasana",
+    "ownCloud basic encryption module" : "ownCloudin perussalausmoduuli",
     "Your private key password no longer matches your log-in password." : "Salaisen avaimesi salasana ei enää vastaa kirjautumissalasanaasi.",
     "Set your old private key password to your current log-in password:" : "Aseta yksityisen avaimen vanha salasana vastaamaan nykyistä kirjautumissalasanaasi:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js
index 09910bf5fef..fcdb7d76442 100644
--- a/apps/encryption/l10n/fr.js
+++ b/apps/encryption/l10n/fr.js
@@ -21,14 +21,10 @@ OC.L10N.register(
     "Private key password successfully updated." : "Mot de passe de la clef privée mis à jour avec succès.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée pour le chiffrement n'est pas valide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
-    "ownCloud basic encryption module" : "Module de chiffrement de base d'ownCloud",
     "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",
     "Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :",
-    "Old Recovery key password" : "Ancien mot de passe de la clef de récupération",
-    "New Recovery key password" : "Nouveau mot de passe de la clef de récupération",
-    "Repeat New Recovery key password" : "Répétez le nouveau mot de passe de la clef de récupération",
     "Change Password" : "Changer de mot de passe",
+    "ownCloud basic encryption module" : "Module de chiffrement de base d'ownCloud",
     "Your private key password no longer matches your log-in password." : "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion.",
     "Set your old private key password to your current log-in password:" : "Faites de votre mot de passe de connexion le mot de passe de votre clef privée :",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json
index a18086cce05..680be0d24ae 100644
--- a/apps/encryption/l10n/fr.json
+++ b/apps/encryption/l10n/fr.json
@@ -19,14 +19,10 @@
     "Private key password successfully updated." : "Mot de passe de la clef privée mis à jour avec succès.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée pour le chiffrement n'est pas valide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
-    "ownCloud basic encryption module" : "Module de chiffrement de base d'ownCloud",
     "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",
     "Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :",
-    "Old Recovery key password" : "Ancien mot de passe de la clef de récupération",
-    "New Recovery key password" : "Nouveau mot de passe de la clef de récupération",
-    "Repeat New Recovery key password" : "Répétez le nouveau mot de passe de la clef de récupération",
     "Change Password" : "Changer de mot de passe",
+    "ownCloud basic encryption module" : "Module de chiffrement de base d'ownCloud",
     "Your private key password no longer matches your log-in password." : "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion.",
     "Set your old private key password to your current log-in password:" : "Faites de votre mot de passe de connexion le mot de passe de votre clef privée :",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
diff --git a/apps/encryption/l10n/gl.js b/apps/encryption/l10n/gl.js
index 4cf00535490..3fbbe21c7c4 100644
--- a/apps/encryption/l10n/gl.js
+++ b/apps/encryption/l10n/gl.js
@@ -23,18 +23,13 @@ OC.L10N.register(
     "Private key password successfully updated." : "A chave privada foi actualizada correctamente.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "A chave privada para a aplicación de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron preparadas, saia da sesión e volva a acceder de novo",
-    "ownCloud basic encryption module" : "Módulo básico de cifrado de ownCloud",
-    "Enable recovery key: " : "Activar 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",
     "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",
     "Change recovery key password:" : "Cambiar o contrasinal da chave de la recuperación:",
-    "Old Recovery key password" : "Antigo contrasinal da chave de recuperación",
-    "New Recovery key password" : "Novo contrasinal da chave de recuperación",
-    "Repeat New Recovery key password" : "Repita o novo contrasinal da chave de recuperación",
     "Change Password" : "Cambiar o contrasinal",
+    "ownCloud basic encryption module" : "Módulo básico de cifrado de ownCloud",
     "Your private key password no longer matches your log-in password." : "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso.",
     "Set your old private key password to your current log-in password:" : "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu antigo contrasinal pode pedírllelo ao seu administrador para recuperar os seus ficheiros.",
diff --git a/apps/encryption/l10n/gl.json b/apps/encryption/l10n/gl.json
index b1654e75a54..a53b55c3fb0 100644
--- a/apps/encryption/l10n/gl.json
+++ b/apps/encryption/l10n/gl.json
@@ -21,18 +21,13 @@
     "Private key password successfully updated." : "A chave privada foi actualizada correctamente.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "A chave privada para a aplicación de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron preparadas, saia da sesión e volva a acceder de novo",
-    "ownCloud basic encryption module" : "Módulo básico de cifrado de ownCloud",
-    "Enable recovery key: " : "Activar 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",
     "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",
     "Change recovery key password:" : "Cambiar o contrasinal da chave de la recuperación:",
-    "Old Recovery key password" : "Antigo contrasinal da chave de recuperación",
-    "New Recovery key password" : "Novo contrasinal da chave de recuperación",
-    "Repeat New Recovery key password" : "Repita o novo contrasinal da chave de recuperación",
     "Change Password" : "Cambiar o contrasinal",
+    "ownCloud basic encryption module" : "Módulo básico de cifrado de ownCloud",
     "Your private key password no longer matches your log-in password." : "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso.",
     "Set your old private key password to your current log-in password:" : "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu antigo contrasinal pode pedírllelo ao seu administrador para recuperar os seus ficheiros.",
diff --git a/apps/encryption/l10n/hr.js b/apps/encryption/l10n/hr.js
index b00d74e3e9e..40ad26f9daa 100644
--- a/apps/encryption/l10n/hr.js
+++ b/apps/encryption/l10n/hr.js
@@ -11,11 +11,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molimo ažurirajte lozinku svoga privatnog ključa u svojim osobnimpostavkama da biste obnovili pristup svojim šifriranim datotekama.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je aktivirana ali vaši ključevi nisu inicijalizirani, molimo odjavite se iponovno prijavite.",
     "Recovery key password" : "Lozinka ključa za oporavak",
-    "Repeat Recovery key password" : "Ponovite lozinku ključa za oporavak",
     "Change recovery key password:" : "Promijenite lozinku ključa za oporavak",
-    "Old Recovery key password" : "Stara lozinka ključa za oporavak",
-    "New Recovery key password" : "Nova lozinka ključa za oporavak",
-    "Repeat New Recovery key password" : "Ponovite novu lozinku ključa za oporavak",
     "Change Password" : "Promijenite lozinku",
     "Your private key password no longer matches your log-in password." : "Lozinka vašeg privatnog ključa više se ne slaže s vašom lozinkom za prijavu.",
     "Set your old private key password to your current log-in password:" : "Postavite svoju staru lozinku privatnog ključa u svoju postojeću lozinku za prijavu.",
diff --git a/apps/encryption/l10n/hr.json b/apps/encryption/l10n/hr.json
index 95f1c004f1f..71f83db1bdf 100644
--- a/apps/encryption/l10n/hr.json
+++ b/apps/encryption/l10n/hr.json
@@ -9,11 +9,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molimo ažurirajte lozinku svoga privatnog ključa u svojim osobnimpostavkama da biste obnovili pristup svojim šifriranim datotekama.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je aktivirana ali vaši ključevi nisu inicijalizirani, molimo odjavite se iponovno prijavite.",
     "Recovery key password" : "Lozinka ključa za oporavak",
-    "Repeat Recovery key password" : "Ponovite lozinku ključa za oporavak",
     "Change recovery key password:" : "Promijenite lozinku ključa za oporavak",
-    "Old Recovery key password" : "Stara lozinka ključa za oporavak",
-    "New Recovery key password" : "Nova lozinka ključa za oporavak",
-    "Repeat New Recovery key password" : "Ponovite novu lozinku ključa za oporavak",
     "Change Password" : "Promijenite lozinku",
     "Your private key password no longer matches your log-in password." : "Lozinka vašeg privatnog ključa više se ne slaže s vašom lozinkom za prijavu.",
     "Set your old private key password to your current log-in password:" : "Postavite svoju staru lozinku privatnog ključa u svoju postojeću lozinku za prijavu.",
diff --git a/apps/encryption/l10n/hu_HU.js b/apps/encryption/l10n/hu_HU.js
index edd92d670a6..be4df724ef8 100644
--- a/apps/encryption/l10n/hu_HU.js
+++ b/apps/encryption/l10n/hu_HU.js
@@ -11,11 +11,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Kérjük frissítse a titkos kulcs jelszót a személyes beállításokban, hogy ismét hozzáférjen a titkosított állományaihoz!",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!",
     "Recovery key password" : "A helyreállítási kulcs jelszava",
-    "Repeat Recovery key password" : "Ismételje meg a helyreállítási kulcs jelszavát",
     "Change recovery key password:" : "A helyreállítási kulcs jelszavának módosítása:",
-    "Old Recovery key password" : "Régi Helyreállítási Kulcs Jelszava",
-    "New Recovery key password" : "Új Helyreállítási kulcs jelszava",
-    "Repeat New Recovery key password" : "Ismételje meg az új helyreállítási kulcs jelszavát",
     "Change Password" : "Jelszó megváltoztatása",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára akkor megkérheti a rendszergazdát, hogy állítsa vissza az állományait.",
     "Old log-in password" : "Régi bejelentkezési jelszó",
diff --git a/apps/encryption/l10n/hu_HU.json b/apps/encryption/l10n/hu_HU.json
index 439e137d1c9..260a6ae3342 100644
--- a/apps/encryption/l10n/hu_HU.json
+++ b/apps/encryption/l10n/hu_HU.json
@@ -9,11 +9,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Kérjük frissítse a titkos kulcs jelszót a személyes beállításokban, hogy ismét hozzáférjen a titkosított állományaihoz!",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!",
     "Recovery key password" : "A helyreállítási kulcs jelszava",
-    "Repeat Recovery key password" : "Ismételje meg a helyreállítási kulcs jelszavát",
     "Change recovery key password:" : "A helyreállítási kulcs jelszavának módosítása:",
-    "Old Recovery key password" : "Régi Helyreállítási Kulcs Jelszava",
-    "New Recovery key password" : "Új Helyreállítási kulcs jelszava",
-    "Repeat New Recovery key password" : "Ismételje meg az új helyreállítási kulcs jelszavát",
     "Change Password" : "Jelszó megváltoztatása",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára akkor megkérheti a rendszergazdát, hogy állítsa vissza az állományait.",
     "Old log-in password" : "Régi bejelentkezési jelszó",
diff --git a/apps/encryption/l10n/id.js b/apps/encryption/l10n/id.js
index 37c538613d4..f1aebdbe1ac 100644
--- a/apps/encryption/l10n/id.js
+++ b/apps/encryption/l10n/id.js
@@ -20,11 +20,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
     "Recovery key password" : "Sandi kunci pemulihan",
-    "Repeat Recovery key password" : "Ulangi sandi kunci Pemulihan",
     "Change recovery key password:" : "Ubah sandi kunci pemulihan:",
-    "Old Recovery key password" : "Sandi kunci Pemulihan Lama",
-    "New Recovery key password" : "Sandi kunci Pemulihan Baru",
-    "Repeat New Recovery key password" : "Ulangi sandi kunci Pemulihan baru",
     "Change Password" : "Ubah Sandi",
     "Your private key password no longer matches your log-in password." : "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.",
     "Set your old private key password to your current log-in password:" : "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:",
diff --git a/apps/encryption/l10n/id.json b/apps/encryption/l10n/id.json
index 949e4cd1d4c..25433f810ac 100644
--- a/apps/encryption/l10n/id.json
+++ b/apps/encryption/l10n/id.json
@@ -18,11 +18,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
     "Recovery key password" : "Sandi kunci pemulihan",
-    "Repeat Recovery key password" : "Ulangi sandi kunci Pemulihan",
     "Change recovery key password:" : "Ubah sandi kunci pemulihan:",
-    "Old Recovery key password" : "Sandi kunci Pemulihan Lama",
-    "New Recovery key password" : "Sandi kunci Pemulihan Baru",
-    "Repeat New Recovery key password" : "Ulangi sandi kunci Pemulihan baru",
     "Change Password" : "Ubah Sandi",
     "Your private key password no longer matches your log-in password." : "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.",
     "Set your old private key password to your current log-in password:" : "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:",
diff --git a/apps/encryption/l10n/it.js b/apps/encryption/l10n/it.js
index a4bcf637916..a02d86f9ab3 100644
--- a/apps/encryption/l10n/it.js
+++ b/apps/encryption/l10n/it.js
@@ -23,16 +23,11 @@ OC.L10N.register(
     "Private key password successfully updated." : "Password della chiave privata aggiornata correttamente.",
     "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",
-    "Enable recovery key: " : "Abilita 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 recupero",
     "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",
     "Change recovery key password:" : "Cambia la password della chiave di recupero:",
-    "Old Recovery key password" : "Vecchia password della chiave di recupero",
-    "New Recovery key password" : "Nuova password della chiave di recupero",
-    "Repeat New Recovery key password" : "Ripeti la nuova password della chiave di recupero",
     "Change Password" : "Modifica password",
     "ownCloud basic encryption module" : "Modulo di cifratura di base di ownCloud",
     "Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
diff --git a/apps/encryption/l10n/it.json b/apps/encryption/l10n/it.json
index d99fc66dd81..86509efa30e 100644
--- a/apps/encryption/l10n/it.json
+++ b/apps/encryption/l10n/it.json
@@ -21,16 +21,11 @@
     "Private key password successfully updated." : "Password della chiave privata aggiornata correttamente.",
     "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",
-    "Enable recovery key: " : "Abilita 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 recupero",
     "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",
     "Change recovery key password:" : "Cambia la password della chiave di recupero:",
-    "Old Recovery key password" : "Vecchia password della chiave di recupero",
-    "New Recovery key password" : "Nuova password della chiave di recupero",
-    "Repeat New Recovery key password" : "Ripeti la nuova password della chiave di recupero",
     "Change Password" : "Modifica password",
     "ownCloud basic encryption module" : "Modulo di cifratura di base di ownCloud",
     "Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
diff --git a/apps/encryption/l10n/ja.js b/apps/encryption/l10n/ja.js
index 395a2bb292a..1f2cf3cf49d 100644
--- a/apps/encryption/l10n/ja.js
+++ b/apps/encryption/l10n/ja.js
@@ -21,14 +21,10 @@ OC.L10N.register(
     "Private key password successfully updated." : "秘密鍵のパスワードが正常に更新されました。",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
-    "ownCloud basic encryption module" : "ownCloud 基本暗号化モジュール",
     "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" : "ownCloud 基本暗号化モジュール",
     "Your private key password no longer matches your log-in password." : "もはや秘密鍵はログインパスワードと一致しません。",
     "Set your old private key password to your current log-in password:" : "古い秘密鍵のパスワードを現在のログインパスワードに設定:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。",
diff --git a/apps/encryption/l10n/ja.json b/apps/encryption/l10n/ja.json
index 49ce1522363..38f8a84d8c7 100644
--- a/apps/encryption/l10n/ja.json
+++ b/apps/encryption/l10n/ja.json
@@ -19,14 +19,10 @@
     "Private key password successfully updated." : "秘密鍵のパスワードが正常に更新されました。",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
-    "ownCloud basic encryption module" : "ownCloud 基本暗号化モジュール",
     "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" : "ownCloud 基本暗号化モジュール",
     "Your private key password no longer matches your log-in password." : "もはや秘密鍵はログインパスワードと一致しません。",
     "Set your old private key password to your current log-in password:" : "古い秘密鍵のパスワードを現在のログインパスワードに設定:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。",
diff --git a/apps/encryption/l10n/ko.js b/apps/encryption/l10n/ko.js
index 8ec1b5173a3..9091d5fa775 100644
--- a/apps/encryption/l10n/ko.js
+++ b/apps/encryption/l10n/ko.js
@@ -20,11 +20,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
     "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" : "암호 변경",
     "Your private key password no longer matches your log-in password." : "개인 키 암호와 로그인 암호가 일치하지 않습니다.",
     "Set your old private key password to your current log-in password:" : "기존 개인 키 암호를 로그인 암호와 동일하게 설정하십시오:",
diff --git a/apps/encryption/l10n/ko.json b/apps/encryption/l10n/ko.json
index c4411489401..b50c03854f4 100644
--- a/apps/encryption/l10n/ko.json
+++ b/apps/encryption/l10n/ko.json
@@ -18,11 +18,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
     "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" : "암호 변경",
     "Your private key password no longer matches your log-in password." : "개인 키 암호와 로그인 암호가 일치하지 않습니다.",
     "Set your old private key password to your current log-in password:" : "기존 개인 키 암호를 로그인 암호와 동일하게 설정하십시오:",
diff --git a/apps/encryption/l10n/lt_LT.js b/apps/encryption/l10n/lt_LT.js
index 502c7b35268..2fd29ca7788 100644
--- a/apps/encryption/l10n/lt_LT.js
+++ b/apps/encryption/l10n/lt_LT.js
@@ -11,11 +11,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Netinkamas privatus raktas Šifravimo programai. Prašome atnaujinti savo privataus rakto slaptažodį asmeniniuose nustatymuose, kad atkurti prieigą prie šifruotų failų.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti",
     "Recovery key password" : "Atkūrimo rakto slaptažodis",
-    "Repeat Recovery key password" : "Pakartokite atkūrimo rakto slaptažodį",
     "Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
-    "Old Recovery key password" : "Senas atkūrimo rakto slaptažodis",
-    "New Recovery key password" : "Naujas atkūrimo rakto slaptažodis",
-    "Repeat New Recovery key password" : "Pakartokite naują atkūrimo rakto slaptažodį",
     "Change Password" : "Pakeisti slaptažodį",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus.",
     "Old log-in password" : "Senas prisijungimo slaptažodis",
diff --git a/apps/encryption/l10n/lt_LT.json b/apps/encryption/l10n/lt_LT.json
index e73973b48ea..3e97937d60d 100644
--- a/apps/encryption/l10n/lt_LT.json
+++ b/apps/encryption/l10n/lt_LT.json
@@ -9,11 +9,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Netinkamas privatus raktas Šifravimo programai. Prašome atnaujinti savo privataus rakto slaptažodį asmeniniuose nustatymuose, kad atkurti prieigą prie šifruotų failų.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti",
     "Recovery key password" : "Atkūrimo rakto slaptažodis",
-    "Repeat Recovery key password" : "Pakartokite atkūrimo rakto slaptažodį",
     "Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
-    "Old Recovery key password" : "Senas atkūrimo rakto slaptažodis",
-    "New Recovery key password" : "Naujas atkūrimo rakto slaptažodis",
-    "Repeat New Recovery key password" : "Pakartokite naują atkūrimo rakto slaptažodį",
     "Change Password" : "Pakeisti slaptažodį",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus.",
     "Old log-in password" : "Senas prisijungimo slaptažodis",
diff --git a/apps/encryption/l10n/mk.js b/apps/encryption/l10n/mk.js
index 6a886626fb5..f1abdd2f518 100644
--- a/apps/encryption/l10n/mk.js
+++ b/apps/encryption/l10n/mk.js
@@ -3,9 +3,6 @@ OC.L10N.register(
     {
     "Password successfully changed." : "Лозинката е успешно променета.",
     "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
-    "Repeat Recovery key password" : "Повтори ја лозинката за клучот на обновување",
-    "Old Recovery key password" : "Старата лозинка за клучот на обновување ",
-    "Repeat New Recovery key password" : "Повтори ја лозинката за клучот на обновувањето",
     "Change Password" : "Смени лозинка",
     "Old log-in password" : "Старата лозинка за најавување",
     "Current log-in password" : "Тековната лозинка за најавување",
diff --git a/apps/encryption/l10n/mk.json b/apps/encryption/l10n/mk.json
index 4d6b7db5255..112d818347c 100644
--- a/apps/encryption/l10n/mk.json
+++ b/apps/encryption/l10n/mk.json
@@ -1,9 +1,6 @@
 { "translations": {
     "Password successfully changed." : "Лозинката е успешно променета.",
     "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
-    "Repeat Recovery key password" : "Повтори ја лозинката за клучот на обновување",
-    "Old Recovery key password" : "Старата лозинка за клучот на обновување ",
-    "Repeat New Recovery key password" : "Повтори ја лозинката за клучот на обновувањето",
     "Change Password" : "Смени лозинка",
     "Old log-in password" : "Старата лозинка за најавување",
     "Current log-in password" : "Тековната лозинка за најавување",
diff --git a/apps/encryption/l10n/nb_NO.js b/apps/encryption/l10n/nb_NO.js
index b0b6a4d2c9b..205f9713583 100644
--- a/apps/encryption/l10n/nb_NO.js
+++ b/apps/encryption/l10n/nb_NO.js
@@ -20,11 +20,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
     "Recovery key password" : "Passord for gjenopprettingsnøkkel",
-    "Repeat Recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
     "Change recovery key password:" : "Endre passord for gjenopprettingsnøkkel:",
-    "Old Recovery key password" : "Gammelt passord for gjenopprettingsnøkkel",
-    "New Recovery key password" : "Nytt passord for gjenopprettingsnøkkel",
-    "Repeat New Recovery key password" : "Gjenta nytt passord for gjenopprettingsnøkkel",
     "Change Password" : "Endre passord",
     "Your private key password no longer matches your log-in password." : "Passordet for din private nøkkel stemmer ikke lenger med påloggingspassordet ditt.",
     "Set your old private key password to your current log-in password:" : "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord:",
diff --git a/apps/encryption/l10n/nb_NO.json b/apps/encryption/l10n/nb_NO.json
index 2e402fb8b15..8f0a09d56b5 100644
--- a/apps/encryption/l10n/nb_NO.json
+++ b/apps/encryption/l10n/nb_NO.json
@@ -18,11 +18,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
     "Recovery key password" : "Passord for gjenopprettingsnøkkel",
-    "Repeat Recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
     "Change recovery key password:" : "Endre passord for gjenopprettingsnøkkel:",
-    "Old Recovery key password" : "Gammelt passord for gjenopprettingsnøkkel",
-    "New Recovery key password" : "Nytt passord for gjenopprettingsnøkkel",
-    "Repeat New Recovery key password" : "Gjenta nytt passord for gjenopprettingsnøkkel",
     "Change Password" : "Endre passord",
     "Your private key password no longer matches your log-in password." : "Passordet for din private nøkkel stemmer ikke lenger med påloggingspassordet ditt.",
     "Set your old private key password to your current log-in password:" : "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord:",
diff --git a/apps/encryption/l10n/nl.js b/apps/encryption/l10n/nl.js
index d7da433965e..1081c662d86 100644
--- a/apps/encryption/l10n/nl.js
+++ b/apps/encryption/l10n/nl.js
@@ -23,18 +23,13 @@ OC.L10N.register(
     "Private key password successfully updated." : "Privésleutel succesvol bijgewerkt.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige privésleutel voor crypto app. Werk het privésleutel wachtwoord bij in uw persoonlijke instellingen om opnieuw toegang te krijgen tot uw versleutelde bestanden.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
-    "ownCloud basic encryption module" : "ownCloud basis versleutelingsmodule",
-    "Enable recovery key: " : "Activeer 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 het herstelsleutel wachtwoord",
     "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",
     "Change recovery key password:" : "Wijzig wachtwoord herstelsleutel:",
-    "Old Recovery key password" : "Oude wachtwoord herstelsleutel",
-    "New Recovery key password" : "Nieuwe wachtwoord herstelsleutel",
-    "Repeat New Recovery key password" : "Herhaal het nieuwe herstelsleutel wachtwoord",
     "Change Password" : "Wijzigen wachtwoord",
+    "ownCloud basic encryption module" : "ownCloud basis versleutelingsmodule",
     "Your private key password no longer matches your log-in password." : "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord.",
     "Set your old private key password to your current log-in password:" : "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord.",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Als u uw oude wachtwoord niet meer weet, kunt u uw beheerder vragen uw bestanden terug te halen.",
diff --git a/apps/encryption/l10n/nl.json b/apps/encryption/l10n/nl.json
index 6374d983d89..ce2e6d8a2a5 100644
--- a/apps/encryption/l10n/nl.json
+++ b/apps/encryption/l10n/nl.json
@@ -21,18 +21,13 @@
     "Private key password successfully updated." : "Privésleutel succesvol bijgewerkt.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige privésleutel voor crypto app. Werk het privésleutel wachtwoord bij in uw persoonlijke instellingen om opnieuw toegang te krijgen tot uw versleutelde bestanden.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
-    "ownCloud basic encryption module" : "ownCloud basis versleutelingsmodule",
-    "Enable recovery key: " : "Activeer 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 het herstelsleutel wachtwoord",
     "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",
     "Change recovery key password:" : "Wijzig wachtwoord herstelsleutel:",
-    "Old Recovery key password" : "Oude wachtwoord herstelsleutel",
-    "New Recovery key password" : "Nieuwe wachtwoord herstelsleutel",
-    "Repeat New Recovery key password" : "Herhaal het nieuwe herstelsleutel wachtwoord",
     "Change Password" : "Wijzigen wachtwoord",
+    "ownCloud basic encryption module" : "ownCloud basis versleutelingsmodule",
     "Your private key password no longer matches your log-in password." : "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord.",
     "Set your old private key password to your current log-in password:" : "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord.",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Als u uw oude wachtwoord niet meer weet, kunt u uw beheerder vragen uw bestanden terug te halen.",
diff --git a/apps/encryption/l10n/pl.js b/apps/encryption/l10n/pl.js
index 287b2d6ede5..dd8ecd2081b 100644
--- a/apps/encryption/l10n/pl.js
+++ b/apps/encryption/l10n/pl.js
@@ -20,11 +20,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz. Można zaktualizować hasło klucza prywatnego w ustawieniach osobistych w celu odzyskania dostępu do plików",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.",
     "Recovery key password" : "Hasło klucza odzyskiwania",
-    "Repeat Recovery key password" : "Powtórz hasło klucza odzyskiwania",
     "Change recovery key password:" : "Zmień hasło klucza odzyskiwania",
-    "Old Recovery key password" : "Stare hasło klucza odzyskiwania",
-    "New Recovery key password" : "Nowe hasło klucza odzyskiwania",
-    "Repeat New Recovery key password" : "Powtórz nowe hasło klucza odzyskiwania",
     "Change Password" : "Zmień hasło",
     "Your private key password no longer matches your log-in password." : "Hasło Twojego klucza prywatnego nie pasuje już do Twojego hasła logowania.",
     "Set your old private key password to your current log-in password:" : "Ustaw stare hasło klucza prywatnego na aktualne hasło logowania:",
diff --git a/apps/encryption/l10n/pl.json b/apps/encryption/l10n/pl.json
index 472ab93b063..8e40fe41200 100644
--- a/apps/encryption/l10n/pl.json
+++ b/apps/encryption/l10n/pl.json
@@ -18,11 +18,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz. Można zaktualizować hasło klucza prywatnego w ustawieniach osobistych w celu odzyskania dostępu do plików",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.",
     "Recovery key password" : "Hasło klucza odzyskiwania",
-    "Repeat Recovery key password" : "Powtórz hasło klucza odzyskiwania",
     "Change recovery key password:" : "Zmień hasło klucza odzyskiwania",
-    "Old Recovery key password" : "Stare hasło klucza odzyskiwania",
-    "New Recovery key password" : "Nowe hasło klucza odzyskiwania",
-    "Repeat New Recovery key password" : "Powtórz nowe hasło klucza odzyskiwania",
     "Change Password" : "Zmień hasło",
     "Your private key password no longer matches your log-in password." : "Hasło Twojego klucza prywatnego nie pasuje już do Twojego hasła logowania.",
     "Set your old private key password to your current log-in password:" : "Ustaw stare hasło klucza prywatnego na aktualne hasło logowania:",
diff --git a/apps/encryption/l10n/pt_BR.js b/apps/encryption/l10n/pt_BR.js
index b4550578cf4..af109057705 100644
--- a/apps/encryption/l10n/pt_BR.js
+++ b/apps/encryption/l10n/pt_BR.js
@@ -23,18 +23,13 @@ OC.L10N.register(
     "Private key password successfully updated." : "Senha de chave privada atualizada com sucesso.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave do App de Criptografia é inválida. Por favor, atualize sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente",
-    "ownCloud basic encryption module" : "Modo de criptografia básico ownCloud",
-    "Enable recovery key: " : "Habilitar recuperação de chave:",
-    "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 Recuperação de senha da chave",
     "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",
     "Change recovery key password:" : "Mudar a senha da chave de recuperação:",
-    "Old Recovery key password" : "Senha antiga da chave de recuperação",
-    "New Recovery key password" : "Nova senha da chave de recuperação",
-    "Repeat New Recovery key password" : "Repita 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.",
     "Set your old private key password to your current log-in password:" : "Defina a sua antiga senha da chave privada para sua senha de login atual:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos.",
diff --git a/apps/encryption/l10n/pt_BR.json b/apps/encryption/l10n/pt_BR.json
index 44ba8f85fed..93bc9bdd66d 100644
--- a/apps/encryption/l10n/pt_BR.json
+++ b/apps/encryption/l10n/pt_BR.json
@@ -21,18 +21,13 @@
     "Private key password successfully updated." : "Senha de chave privada atualizada com sucesso.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave do App de Criptografia é inválida. Por favor, atualize sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente",
-    "ownCloud basic encryption module" : "Modo de criptografia básico ownCloud",
-    "Enable recovery key: " : "Habilitar recuperação de chave:",
-    "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 Recuperação de senha da chave",
     "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",
     "Change recovery key password:" : "Mudar a senha da chave de recuperação:",
-    "Old Recovery key password" : "Senha antiga da chave de recuperação",
-    "New Recovery key password" : "Nova senha da chave de recuperação",
-    "Repeat New Recovery key password" : "Repita 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.",
     "Set your old private key password to your current log-in password:" : "Defina a sua antiga senha da chave privada para sua senha de login atual:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos.",
diff --git a/apps/encryption/l10n/pt_PT.js b/apps/encryption/l10n/pt_PT.js
index 947f91a955e..d3055cd4a40 100644
--- a/apps/encryption/l10n/pt_PT.js
+++ b/apps/encryption/l10n/pt_PT.js
@@ -21,14 +21,10 @@ OC.L10N.register(
     "Private key password successfully updated." : "A senha da chave privada foi atualizada com sucesso. ",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
-    "ownCloud basic encryption module" : "módulo de encriptação básico da ownCloud",
     "Recovery key password" : "Senha da chave de recuperação",
-    "Repeat Recovery key password" : "Contrassenha da chave de recuperação",
     "Change recovery key password:" : "Alterar 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" : "Contrassenha da nova chave de recuperação",
     "Change Password" : "Alterar a Senha",
+    "ownCloud basic encryption module" : "módulo de encriptação básico da ownCloud",
     "Your private key password no longer matches your log-in password." : "A Password da sua chave privada não coincide mais com a password do seu login.",
     "Set your old private key password to your current log-in password:" : "Altere a password antiga da chave privada para a nova password do login:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Se não se lembra da senha antiga pode pedir ao administrador para recuperar os seus ficheiros. ",
diff --git a/apps/encryption/l10n/pt_PT.json b/apps/encryption/l10n/pt_PT.json
index 1231a23b82b..57baaa64ff1 100644
--- a/apps/encryption/l10n/pt_PT.json
+++ b/apps/encryption/l10n/pt_PT.json
@@ -19,14 +19,10 @@
     "Private key password successfully updated." : "A senha da chave privada foi atualizada com sucesso. ",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
-    "ownCloud basic encryption module" : "módulo de encriptação básico da ownCloud",
     "Recovery key password" : "Senha da chave de recuperação",
-    "Repeat Recovery key password" : "Contrassenha da chave de recuperação",
     "Change recovery key password:" : "Alterar 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" : "Contrassenha da nova chave de recuperação",
     "Change Password" : "Alterar a Senha",
+    "ownCloud basic encryption module" : "módulo de encriptação básico da ownCloud",
     "Your private key password no longer matches your log-in password." : "A Password da sua chave privada não coincide mais com a password do seu login.",
     "Set your old private key password to your current log-in password:" : "Altere a password antiga da chave privada para a nova password do login:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Se não se lembra da senha antiga pode pedir ao administrador para recuperar os seus ficheiros. ",
diff --git a/apps/encryption/l10n/ro.js b/apps/encryption/l10n/ro.js
index f01bc68ff26..3f699577243 100644
--- a/apps/encryption/l10n/ro.js
+++ b/apps/encryption/l10n/ro.js
@@ -17,8 +17,8 @@ OC.L10N.register(
     "Private key password successfully updated." : "Cheia privata a fost actualizata cu succes",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Cheie privată nevalidă pentru aplicația Încriptare. Te rog, actualizează-ți parola cheii private folosind setările personale pentru a reaccesa fișierele tale încriptate.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicatia de criptare este activata dar tastatura nu este initializata , va rugam deconectati-va si reconectati-va",
-    "ownCloud basic encryption module" : "modul de ecnriptie bazic ownCloud",
     "Change Password" : "Schimbă parola",
+    "ownCloud basic encryption module" : "modul de ecnriptie bazic ownCloud",
     "Enabled" : "Activat",
     "Disabled" : "Dezactivat"
 },
diff --git a/apps/encryption/l10n/ro.json b/apps/encryption/l10n/ro.json
index b7c12785ab1..e546b400935 100644
--- a/apps/encryption/l10n/ro.json
+++ b/apps/encryption/l10n/ro.json
@@ -15,8 +15,8 @@
     "Private key password successfully updated." : "Cheia privata a fost actualizata cu succes",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Cheie privată nevalidă pentru aplicația Încriptare. Te rog, actualizează-ți parola cheii private folosind setările personale pentru a reaccesa fișierele tale încriptate.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicatia de criptare este activata dar tastatura nu este initializata , va rugam deconectati-va si reconectati-va",
-    "ownCloud basic encryption module" : "modul de ecnriptie bazic ownCloud",
     "Change Password" : "Schimbă parola",
+    "ownCloud basic encryption module" : "modul de ecnriptie bazic ownCloud",
     "Enabled" : "Activat",
     "Disabled" : "Dezactivat"
 },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
diff --git a/apps/encryption/l10n/ru.js b/apps/encryption/l10n/ru.js
index 753582cd996..ca8b2574f0c 100644
--- a/apps/encryption/l10n/ru.js
+++ b/apps/encryption/l10n/ru.js
@@ -23,18 +23,13 @@ OC.L10N.register(
     "Private key password successfully updated." : "Пароль закрытого ключа успешно обновлён.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Закрытый ключ приложения шифрования недействителен. Обновите закрытый ключ в личных настройках, чтобы восстановить доступ к зашифрованным файлам.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново",
-    "ownCloud basic encryption module" : "Базовый модуль шифрования ownCloud",
-    "Enable recovery key: " : "Enable 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" : "Пароль ключа восстановления",
-    "Repeat Recovery key password" : "Повторите пароль ключа восстановления",
     "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:" : "Смена пароля ключа восстановления:",
-    "Old Recovery key password" : "Старый пароль ключа восстановления",
-    "New Recovery key password" : "Новый пароль ключа восстановления",
-    "Repeat New Recovery key password" : "Повторите новый пароль ключа восстановления",
     "Change Password" : "Изменить пароль",
+    "ownCloud basic encryption module" : "Базовый модуль шифрования ownCloud",
     "Your private key password no longer matches your log-in password." : "Пароль закрытого ключа больше не соответствует паролю вашей учетной записи.",
     "Set your old private key password to your current log-in password:" : "Замените старый пароль закрытого ключа на текущий пароль учётной записи.",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы",
diff --git a/apps/encryption/l10n/ru.json b/apps/encryption/l10n/ru.json
index 429d557f804..49a65afc84d 100644
--- a/apps/encryption/l10n/ru.json
+++ b/apps/encryption/l10n/ru.json
@@ -21,18 +21,13 @@
     "Private key password successfully updated." : "Пароль закрытого ключа успешно обновлён.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Закрытый ключ приложения шифрования недействителен. Обновите закрытый ключ в личных настройках, чтобы восстановить доступ к зашифрованным файлам.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново",
-    "ownCloud basic encryption module" : "Базовый модуль шифрования ownCloud",
-    "Enable recovery key: " : "Enable 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" : "Пароль ключа восстановления",
-    "Repeat Recovery key password" : "Повторите пароль ключа восстановления",
     "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:" : "Смена пароля ключа восстановления:",
-    "Old Recovery key password" : "Старый пароль ключа восстановления",
-    "New Recovery key password" : "Новый пароль ключа восстановления",
-    "Repeat New Recovery key password" : "Повторите новый пароль ключа восстановления",
     "Change Password" : "Изменить пароль",
+    "ownCloud basic encryption module" : "Базовый модуль шифрования ownCloud",
     "Your private key password no longer matches your log-in password." : "Пароль закрытого ключа больше не соответствует паролю вашей учетной записи.",
     "Set your old private key password to your current log-in password:" : "Замените старый пароль закрытого ключа на текущий пароль учётной записи.",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы",
diff --git a/apps/encryption/l10n/sk_SK.js b/apps/encryption/l10n/sk_SK.js
index 40f594db21e..ff9f5df4b15 100644
--- a/apps/encryption/l10n/sk_SK.js
+++ b/apps/encryption/l10n/sk_SK.js
@@ -20,11 +20,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný súkromný kľúč na šifrovanie aplikácií. Zaktualizujte si heslo súkromného kľúča v svojom osobnom nastavení, aby ste znovu získali prístup k svojim zašifrovaným súborom.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
     "Recovery key password" : "Heslo obnovovacieho kľúča",
-    "Repeat Recovery key password" : "Zopakujte heslo kľúča pre obnovu",
     "Change recovery key password:" : "Zmeniť heslo obnovovacieho kľúča:",
-    "Old Recovery key password" : "Staré heslo obnovovacieho kľúča",
-    "New Recovery key password" : "Nové heslo obnovovacieho kľúča",
-    "Repeat New Recovery key password" : "Zopakujte nové heslo kľúča pre obnovu",
     "Change Password" : "Zmeniť heslo",
     "Your private key password no longer matches your log-in password." : "Heslo vášho súkromného kľúča sa nezhoduje v vašim prihlasovacím heslom.",
     "Set your old private key password to your current log-in password:" : "Zmeňte si vaše staré heslo súkromného kľúča na rovnaké, aké je vaše aktuálne prihlasovacie heslo:",
diff --git a/apps/encryption/l10n/sk_SK.json b/apps/encryption/l10n/sk_SK.json
index c9de838f9af..1dd03e0f9ea 100644
--- a/apps/encryption/l10n/sk_SK.json
+++ b/apps/encryption/l10n/sk_SK.json
@@ -18,11 +18,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný súkromný kľúč na šifrovanie aplikácií. Zaktualizujte si heslo súkromného kľúča v svojom osobnom nastavení, aby ste znovu získali prístup k svojim zašifrovaným súborom.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
     "Recovery key password" : "Heslo obnovovacieho kľúča",
-    "Repeat Recovery key password" : "Zopakujte heslo kľúča pre obnovu",
     "Change recovery key password:" : "Zmeniť heslo obnovovacieho kľúča:",
-    "Old Recovery key password" : "Staré heslo obnovovacieho kľúča",
-    "New Recovery key password" : "Nové heslo obnovovacieho kľúča",
-    "Repeat New Recovery key password" : "Zopakujte nové heslo kľúča pre obnovu",
     "Change Password" : "Zmeniť heslo",
     "Your private key password no longer matches your log-in password." : "Heslo vášho súkromného kľúča sa nezhoduje v vašim prihlasovacím heslom.",
     "Set your old private key password to your current log-in password:" : "Zmeňte si vaše staré heslo súkromného kľúča na rovnaké, aké je vaše aktuálne prihlasovacie heslo:",
diff --git a/apps/encryption/l10n/sl.js b/apps/encryption/l10n/sl.js
index df745a189ae..fe9f775fbef 100644
--- a/apps/encryption/l10n/sl.js
+++ b/apps/encryption/l10n/sl.js
@@ -20,11 +20,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.",
     "Recovery key password" : "Ključ za obnovitev gesla",
-    "Repeat Recovery key password" : "Ponovi ključ za obnovitev gesla",
     "Change recovery key password:" : "Spremeni ključ za obnovitev gesla:",
-    "Old Recovery key password" : "Stari ključ za obnovitev gesla",
-    "New Recovery key password" : "Novi ključ za obnovitev gesla",
-    "Repeat New Recovery key password" : "Ponovi novi ključ za obnovitev gesla",
     "Change Password" : "Spremeni geslo",
     "Your private key password no longer matches your log-in password." : "Zasebno geslo ni več skladno s prijavnim geslom.",
     "Set your old private key password to your current log-in password:" : "Nastavite star zasebni ključ na trenutno prijavno geslo:",
diff --git a/apps/encryption/l10n/sl.json b/apps/encryption/l10n/sl.json
index 71f2dfe4ea5..f650196eac1 100644
--- a/apps/encryption/l10n/sl.json
+++ b/apps/encryption/l10n/sl.json
@@ -18,11 +18,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.",
     "Recovery key password" : "Ključ za obnovitev gesla",
-    "Repeat Recovery key password" : "Ponovi ključ za obnovitev gesla",
     "Change recovery key password:" : "Spremeni ključ za obnovitev gesla:",
-    "Old Recovery key password" : "Stari ključ za obnovitev gesla",
-    "New Recovery key password" : "Novi ključ za obnovitev gesla",
-    "Repeat New Recovery key password" : "Ponovi novi ključ za obnovitev gesla",
     "Change Password" : "Spremeni geslo",
     "Your private key password no longer matches your log-in password." : "Zasebno geslo ni več skladno s prijavnim geslom.",
     "Set your old private key password to your current log-in password:" : "Nastavite star zasebni ključ na trenutno prijavno geslo:",
diff --git a/apps/encryption/l10n/sr.js b/apps/encryption/l10n/sr.js
index f13fcf18a2e..66753f5f3d4 100644
--- a/apps/encryption/l10n/sr.js
+++ b/apps/encryption/l10n/sr.js
@@ -23,18 +23,13 @@ OC.L10N.register(
     "Private key password successfully updated." : "Лозинка личног кључа је успешно ажурирана.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Неисправан лични кључ за апликацију шифровања. Ажурирајте лозинку личног кључа у личним поставкама да бисте опоравили приступ вашим шифрованим фајловима.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Апликација шифровања је укључена али ваши кључеви нису иницијализовани. Одјавите се и поново се пријавите.",
-    "ownCloud basic encryption module" : "оунКлауд основни шифрарски модул",
-    "Enable recovery key: " : "Омогући кључ за опоравак:",
-    "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" : "Поновите лозинку кључа за опоравак",
     "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" : "Лозинка кључа за опоравак",
     "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." : "Лозинка вашег личног кључа више није иста као ваша лозинка за пријаву.",
     "Set your old private key password to your current log-in password:" : "Поставите стару лозинку личног кључа као тренутну лозинку за пријаву:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
diff --git a/apps/encryption/l10n/sr.json b/apps/encryption/l10n/sr.json
index 8b4fc0f3fc0..ae0437fceda 100644
--- a/apps/encryption/l10n/sr.json
+++ b/apps/encryption/l10n/sr.json
@@ -21,18 +21,13 @@
     "Private key password successfully updated." : "Лозинка личног кључа је успешно ажурирана.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Неисправан лични кључ за апликацију шифровања. Ажурирајте лозинку личног кључа у личним поставкама да бисте опоравили приступ вашим шифрованим фајловима.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Апликација шифровања је укључена али ваши кључеви нису иницијализовани. Одјавите се и поново се пријавите.",
-    "ownCloud basic encryption module" : "оунКлауд основни шифрарски модул",
-    "Enable recovery key: " : "Омогући кључ за опоравак:",
-    "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" : "Поновите лозинку кључа за опоравак",
     "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" : "Лозинка кључа за опоравак",
     "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." : "Лозинка вашег личног кључа више није иста као ваша лозинка за пријаву.",
     "Set your old private key password to your current log-in password:" : "Поставите стару лозинку личног кључа као тренутну лозинку за пријаву:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
diff --git a/apps/encryption/l10n/sv.js b/apps/encryption/l10n/sv.js
index 64998296df9..9ffea2b937f 100644
--- a/apps/encryption/l10n/sv.js
+++ b/apps/encryption/l10n/sv.js
@@ -20,11 +20,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ogiltig privat nyckel i krypteringsprogrammet. Vänligen uppdatera lösenordet till din privata nyckel under dina personliga inställningar för att återfå tillgång till dina krypterade filer.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen",
     "Recovery key password" : "Lösenord för återställningsnyckel",
-    "Repeat Recovery key password" : "Upprepa återställningsnyckelns lösenord",
     "Change recovery key password:" : "Ändra lösenord för återställningsnyckel:",
-    "Old Recovery key password" : "Gammalt lösenord för återställningsnyckel",
-    "New Recovery key password" : "Nytt lösenord för återställningsnyckel",
-    "Repeat New Recovery key password" : "Upprepa lösenord för ny återställningsnyckel",
     "Change Password" : "Byt lösenord",
     "Your private key password no longer matches your log-in password." : "Ditt lösenord för din privata nyckel matchar inte längre ditt inloggningslösenord.",
     "Set your old private key password to your current log-in password:" : "Sätt ditt gamla privatnyckellösenord till ditt aktuella inloggningslösenord:",
diff --git a/apps/encryption/l10n/sv.json b/apps/encryption/l10n/sv.json
index 1b46603a0e3..e977107ba21 100644
--- a/apps/encryption/l10n/sv.json
+++ b/apps/encryption/l10n/sv.json
@@ -18,11 +18,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ogiltig privat nyckel i krypteringsprogrammet. Vänligen uppdatera lösenordet till din privata nyckel under dina personliga inställningar för att återfå tillgång till dina krypterade filer.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen",
     "Recovery key password" : "Lösenord för återställningsnyckel",
-    "Repeat Recovery key password" : "Upprepa återställningsnyckelns lösenord",
     "Change recovery key password:" : "Ändra lösenord för återställningsnyckel:",
-    "Old Recovery key password" : "Gammalt lösenord för återställningsnyckel",
-    "New Recovery key password" : "Nytt lösenord för återställningsnyckel",
-    "Repeat New Recovery key password" : "Upprepa lösenord för ny återställningsnyckel",
     "Change Password" : "Byt lösenord",
     "Your private key password no longer matches your log-in password." : "Ditt lösenord för din privata nyckel matchar inte längre ditt inloggningslösenord.",
     "Set your old private key password to your current log-in password:" : "Sätt ditt gamla privatnyckellösenord till ditt aktuella inloggningslösenord:",
diff --git a/apps/encryption/l10n/tr.js b/apps/encryption/l10n/tr.js
index 315f5a53829..768e29bcb70 100644
--- a/apps/encryption/l10n/tr.js
+++ b/apps/encryption/l10n/tr.js
@@ -23,16 +23,11 @@ OC.L10N.register(
     "Private key password successfully updated." : "Özel anahtar parolası başarıyla güncellendi.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifreleme Uygulaması için geçersiz özel anahtar. Lütfen şifreli dosyalarınıza erişimi tekrar kazanabilmek için kişisel ayarlarınızdan özel anahtar parolanızı güncelleyin.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
-    "Enable recovery key: " : "Kurtarma anahtarını aç:",
-    "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ı",
-    "Repeat Recovery key password" : "Kurtarma anahtarı parolasını yineleyin",
     "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:",
-    "Old Recovery key password" : "Eski Kurtarma anahtarı parolası",
-    "New Recovery key password" : "Yeni Kurtarma anahtarı parolası",
-    "Repeat New Recovery key password" : "Yeni Kurtarma anahtarı parolasını yineleyin",
     "Change Password" : "Parola Değiştir",
     "ownCloud basic encryption module" : "ownCloud basit şifreleme modülü",
     "Your private key password no longer matches your log-in password." : "Özel anahtar parolanız artık oturum açma parolanız ile eşleşmiyor.",
diff --git a/apps/encryption/l10n/tr.json b/apps/encryption/l10n/tr.json
index e90fb1339be..b607177afd7 100644
--- a/apps/encryption/l10n/tr.json
+++ b/apps/encryption/l10n/tr.json
@@ -21,16 +21,11 @@
     "Private key password successfully updated." : "Özel anahtar parolası başarıyla güncellendi.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifreleme Uygulaması için geçersiz özel anahtar. Lütfen şifreli dosyalarınıza erişimi tekrar kazanabilmek için kişisel ayarlarınızdan özel anahtar parolanızı güncelleyin.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
-    "Enable recovery key: " : "Kurtarma anahtarını aç:",
-    "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ı",
-    "Repeat Recovery key password" : "Kurtarma anahtarı parolasını yineleyin",
     "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:",
-    "Old Recovery key password" : "Eski Kurtarma anahtarı parolası",
-    "New Recovery key password" : "Yeni Kurtarma anahtarı parolası",
-    "Repeat New Recovery key password" : "Yeni Kurtarma anahtarı parolasını yineleyin",
     "Change Password" : "Parola Değiştir",
     "ownCloud basic encryption module" : "ownCloud basit şifreleme modülü",
     "Your private key password no longer matches your log-in password." : "Özel anahtar parolanız artık oturum açma parolanız ile eşleşmiyor.",
diff --git a/apps/encryption/l10n/uk.js b/apps/encryption/l10n/uk.js
index faedb5391ba..de044e5a506 100644
--- a/apps/encryption/l10n/uk.js
+++ b/apps/encryption/l10n/uk.js
@@ -21,14 +21,10 @@ OC.L10N.register(
     "Private key password successfully updated." : "Пароль секретного ключа оновлено.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
-    "ownCloud basic encryption module" : "базовий модуль шифрування ownCloud",
     "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" : "базовий модуль шифрування ownCloud",
     "Your private key password no longer matches your log-in password." : "Пароль вашого закритого ключа більше не відповідає паролю від вашого облікового запису.",
     "Set your old private key password to your current log-in password:" : "Замініть старий пароль від закритого ключа на новий пароль входу:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до адміністратора щоб його відновити.",
diff --git a/apps/encryption/l10n/uk.json b/apps/encryption/l10n/uk.json
index 1dfca9a6f6f..f0ac6b8789a 100644
--- a/apps/encryption/l10n/uk.json
+++ b/apps/encryption/l10n/uk.json
@@ -19,14 +19,10 @@
     "Private key password successfully updated." : "Пароль секретного ключа оновлено.",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
-    "ownCloud basic encryption module" : "базовий модуль шифрування ownCloud",
     "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" : "базовий модуль шифрування ownCloud",
     "Your private key password no longer matches your log-in password." : "Пароль вашого закритого ключа більше не відповідає паролю від вашого облікового запису.",
     "Set your old private key password to your current log-in password:" : "Замініть старий пароль від закритого ключа на новий пароль входу:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до адміністратора щоб його відновити.",
diff --git a/apps/encryption/l10n/zh_CN.js b/apps/encryption/l10n/zh_CN.js
index 01db2a8d3a8..05cfcca307c 100644
--- a/apps/encryption/l10n/zh_CN.js
+++ b/apps/encryption/l10n/zh_CN.js
@@ -18,11 +18,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
     "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" : "修改密码",
     " If you don't remember your old password you can ask your administrator to recover your files." : "如果您记不住旧的密码，您可以请求管理员恢复您的文件。",
     "Old log-in password" : "旧登录密码",
diff --git a/apps/encryption/l10n/zh_CN.json b/apps/encryption/l10n/zh_CN.json
index 463c029b554..4106228b0d5 100644
--- a/apps/encryption/l10n/zh_CN.json
+++ b/apps/encryption/l10n/zh_CN.json
@@ -16,11 +16,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
     "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" : "修改密码",
     " If you don't remember your old password you can ask your administrator to recover your files." : "如果您记不住旧的密码，您可以请求管理员恢复您的文件。",
     "Old log-in password" : "旧登录密码",
diff --git a/apps/encryption/l10n/zh_TW.js b/apps/encryption/l10n/zh_TW.js
index ddf2c2e2d8d..946dc001507 100644
--- a/apps/encryption/l10n/zh_TW.js
+++ b/apps/encryption/l10n/zh_TW.js
@@ -11,11 +11,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的檔案加密私鑰，請在個人設定中更新您的私鑰密語以存取加密的檔案。",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
     "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" : "變更密碼",
     " If you don't remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼，可以請求管理員協助取回檔案。",
     "Old log-in password" : "舊登入密碼",
diff --git a/apps/encryption/l10n/zh_TW.json b/apps/encryption/l10n/zh_TW.json
index 49d3b5df0ee..67878ea4bf4 100644
--- a/apps/encryption/l10n/zh_TW.json
+++ b/apps/encryption/l10n/zh_TW.json
@@ -9,11 +9,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的檔案加密私鑰，請在個人設定中更新您的私鑰密語以存取加密的檔案。",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
     "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" : "變更密碼",
     " If you don't remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼，可以請求管理員協助取回檔案。",
     "Old log-in password" : "舊登入密碼",