aboutsummaryrefslogtreecommitdiffstats
path: root/apps/encryption
diff options
context:
space:
mode:
Diffstat (limited to 'apps/encryption')
-rw-r--r--apps/encryption/l10n/ar.js2
-rw-r--r--apps/encryption/l10n/ar.json2
-rw-r--r--apps/encryption/l10n/ast.js29
-rw-r--r--apps/encryption/l10n/ast.json27
-rw-r--r--apps/encryption/l10n/az.js35
-rw-r--r--apps/encryption/l10n/az.json33
-rw-r--r--apps/encryption/l10n/bg.js1
-rw-r--r--apps/encryption/l10n/bg.json1
-rw-r--r--apps/encryption/l10n/bn_BD.js13
-rw-r--r--apps/encryption/l10n/bn_BD.json11
-rw-r--r--apps/encryption/l10n/bs.js11
-rw-r--r--apps/encryption/l10n/bs.json9
-rw-r--r--apps/encryption/l10n/ca.js1
-rw-r--r--apps/encryption/l10n/ca.json1
-rw-r--r--apps/encryption/l10n/cs.js2
-rw-r--r--apps/encryption/l10n/cs.json2
-rw-r--r--apps/encryption/l10n/da.js9
-rw-r--r--apps/encryption/l10n/da.json9
-rw-r--r--apps/encryption/l10n/de.js20
-rw-r--r--apps/encryption/l10n/de.json20
-rw-r--r--apps/encryption/l10n/de_DE.js8
-rw-r--r--apps/encryption/l10n/de_DE.json8
-rw-r--r--apps/encryption/l10n/el.js1
-rw-r--r--apps/encryption/l10n/el.json1
-rw-r--r--apps/encryption/l10n/en_GB.js2
-rw-r--r--apps/encryption/l10n/en_GB.json2
-rw-r--r--apps/encryption/l10n/eo.js1
-rw-r--r--apps/encryption/l10n/eo.json1
-rw-r--r--apps/encryption/l10n/es.js4
-rw-r--r--apps/encryption/l10n/es.json4
-rw-r--r--apps/encryption/l10n/es_419.js1
-rw-r--r--apps/encryption/l10n/es_419.json1
-rw-r--r--apps/encryption/l10n/es_AR.js1
-rw-r--r--apps/encryption/l10n/es_AR.json1
-rw-r--r--apps/encryption/l10n/es_CL.js1
-rw-r--r--apps/encryption/l10n/es_CL.json1
-rw-r--r--apps/encryption/l10n/es_CO.js1
-rw-r--r--apps/encryption/l10n/es_CO.json1
-rw-r--r--apps/encryption/l10n/es_CR.js1
-rw-r--r--apps/encryption/l10n/es_CR.json1
-rw-r--r--apps/encryption/l10n/es_DO.js1
-rw-r--r--apps/encryption/l10n/es_DO.json1
-rw-r--r--apps/encryption/l10n/es_EC.js1
-rw-r--r--apps/encryption/l10n/es_EC.json1
-rw-r--r--apps/encryption/l10n/es_GT.js1
-rw-r--r--apps/encryption/l10n/es_GT.json1
-rw-r--r--apps/encryption/l10n/es_HN.js1
-rw-r--r--apps/encryption/l10n/es_HN.json1
-rw-r--r--apps/encryption/l10n/es_MX.js1
-rw-r--r--apps/encryption/l10n/es_MX.json1
-rw-r--r--apps/encryption/l10n/es_NI.js1
-rw-r--r--apps/encryption/l10n/es_NI.json1
-rw-r--r--apps/encryption/l10n/es_PA.js1
-rw-r--r--apps/encryption/l10n/es_PA.json1
-rw-r--r--apps/encryption/l10n/es_PE.js1
-rw-r--r--apps/encryption/l10n/es_PE.json1
-rw-r--r--apps/encryption/l10n/es_PR.js1
-rw-r--r--apps/encryption/l10n/es_PR.json1
-rw-r--r--apps/encryption/l10n/es_PY.js1
-rw-r--r--apps/encryption/l10n/es_PY.json1
-rw-r--r--apps/encryption/l10n/es_SV.js1
-rw-r--r--apps/encryption/l10n/es_SV.json1
-rw-r--r--apps/encryption/l10n/es_UY.js1
-rw-r--r--apps/encryption/l10n/es_UY.json1
-rw-r--r--apps/encryption/l10n/et_EE.js73
-rw-r--r--apps/encryption/l10n/et_EE.json73
-rw-r--r--apps/encryption/l10n/eu.js1
-rw-r--r--apps/encryption/l10n/eu.json1
-rw-r--r--apps/encryption/l10n/fa.js1
-rw-r--r--apps/encryption/l10n/fa.json1
-rw-r--r--apps/encryption/l10n/fi.js1
-rw-r--r--apps/encryption/l10n/fi.json1
-rw-r--r--apps/encryption/l10n/fr.js2
-rw-r--r--apps/encryption/l10n/fr.json2
-rw-r--r--apps/encryption/l10n/ga.js2
-rw-r--r--apps/encryption/l10n/ga.json2
-rw-r--r--apps/encryption/l10n/gl.js2
-rw-r--r--apps/encryption/l10n/gl.json2
-rw-r--r--apps/encryption/l10n/he.js1
-rw-r--r--apps/encryption/l10n/he.json1
-rw-r--r--apps/encryption/l10n/hr.js1
-rw-r--r--apps/encryption/l10n/hr.json1
-rw-r--r--apps/encryption/l10n/hu.js2
-rw-r--r--apps/encryption/l10n/hu.json2
-rw-r--r--apps/encryption/l10n/ia.js7
-rw-r--r--apps/encryption/l10n/ia.json5
-rw-r--r--apps/encryption/l10n/id.js1
-rw-r--r--apps/encryption/l10n/id.json1
-rw-r--r--apps/encryption/l10n/is.js1
-rw-r--r--apps/encryption/l10n/is.json1
-rw-r--r--apps/encryption/l10n/it.js1
-rw-r--r--apps/encryption/l10n/it.json1
-rw-r--r--apps/encryption/l10n/ja.js2
-rw-r--r--apps/encryption/l10n/ja.json2
-rw-r--r--apps/encryption/l10n/ka.js1
-rw-r--r--apps/encryption/l10n/ka.json1
-rw-r--r--apps/encryption/l10n/ka_GE.js1
-rw-r--r--apps/encryption/l10n/ka_GE.json1
-rw-r--r--apps/encryption/l10n/km.js10
-rw-r--r--apps/encryption/l10n/km.json8
-rw-r--r--apps/encryption/l10n/kn.js8
-rw-r--r--apps/encryption/l10n/kn.json6
-rw-r--r--apps/encryption/l10n/ko.js2
-rw-r--r--apps/encryption/l10n/ko.json2
-rw-r--r--apps/encryption/l10n/lb.js9
-rw-r--r--apps/encryption/l10n/lb.json7
-rw-r--r--apps/encryption/l10n/lt_LT.js1
-rw-r--r--apps/encryption/l10n/lt_LT.json1
-rw-r--r--apps/encryption/l10n/lv.js12
-rw-r--r--apps/encryption/l10n/lv.json12
-rw-r--r--apps/encryption/l10n/mk.js17
-rw-r--r--apps/encryption/l10n/mk.json15
-rw-r--r--apps/encryption/l10n/nb.js1
-rw-r--r--apps/encryption/l10n/nb.json1
-rw-r--r--apps/encryption/l10n/nl.js24
-rw-r--r--apps/encryption/l10n/nl.json24
-rw-r--r--apps/encryption/l10n/oc.js59
-rw-r--r--apps/encryption/l10n/oc.json57
-rw-r--r--apps/encryption/l10n/pl.js1
-rw-r--r--apps/encryption/l10n/pl.json1
-rw-r--r--apps/encryption/l10n/pt_BR.js16
-rw-r--r--apps/encryption/l10n/pt_BR.json16
-rw-r--r--apps/encryption/l10n/pt_PT.js11
-rw-r--r--apps/encryption/l10n/pt_PT.json11
-rw-r--r--apps/encryption/l10n/ru.js1
-rw-r--r--apps/encryption/l10n/ru.json1
-rw-r--r--apps/encryption/l10n/sc.js1
-rw-r--r--apps/encryption/l10n/sc.json1
-rw-r--r--apps/encryption/l10n/sk.js2
-rw-r--r--apps/encryption/l10n/sk.json2
-rw-r--r--apps/encryption/l10n/sl.js1
-rw-r--r--apps/encryption/l10n/sl.json1
-rw-r--r--apps/encryption/l10n/sq.js1
-rw-r--r--apps/encryption/l10n/sq.json1
-rw-r--r--apps/encryption/l10n/sr.js2
-rw-r--r--apps/encryption/l10n/sr.json2
-rw-r--r--apps/encryption/l10n/sr@latin.js10
-rw-r--r--apps/encryption/l10n/sr@latin.json8
-rw-r--r--apps/encryption/l10n/sv.js2
-rw-r--r--apps/encryption/l10n/sv.json2
-rw-r--r--apps/encryption/l10n/sw.js65
-rw-r--r--apps/encryption/l10n/sw.json63
-rw-r--r--apps/encryption/l10n/th.js1
-rw-r--r--apps/encryption/l10n/th.json1
-rw-r--r--apps/encryption/l10n/tr.js48
-rw-r--r--apps/encryption/l10n/tr.json48
-rw-r--r--apps/encryption/l10n/ug.js1
-rw-r--r--apps/encryption/l10n/ug.json1
-rw-r--r--apps/encryption/l10n/uk.js2
-rw-r--r--apps/encryption/l10n/uk.json2
-rw-r--r--apps/encryption/l10n/ur_PK.js6
-rw-r--r--apps/encryption/l10n/ur_PK.json4
-rw-r--r--apps/encryption/l10n/vi.js26
-rw-r--r--apps/encryption/l10n/vi.json24
-rw-r--r--apps/encryption/l10n/zh_CN.js4
-rw-r--r--apps/encryption/l10n/zh_CN.json4
-rw-r--r--apps/encryption/l10n/zh_HK.js6
-rw-r--r--apps/encryption/l10n/zh_HK.json6
-rw-r--r--apps/encryption/l10n/zh_TW.js2
-rw-r--r--apps/encryption/l10n/zh_TW.json2
-rw-r--r--apps/encryption/lib/AppInfo/Application.php32
-rw-r--r--apps/encryption/lib/Command/DisableMasterKey.php1
-rw-r--r--apps/encryption/lib/Command/FixEncryptedVersion.php3
-rw-r--r--apps/encryption/lib/Command/RecoverUser.php1
-rw-r--r--apps/encryption/lib/Crypto/EncryptAll.php49
-rw-r--r--apps/encryption/lib/Crypto/Encryption.php4
-rw-r--r--apps/encryption/lib/KeyManager.php8
-rw-r--r--apps/encryption/lib/Listeners/UserEventsListener.php5
-rw-r--r--apps/encryption/lib/Migration/SetMasterKeyStatus.php1
-rw-r--r--apps/encryption/lib/Services/PassphraseService.php5
-rw-r--r--apps/encryption/lib/Session.php2
-rw-r--r--apps/encryption/lib/Settings/Admin.php1
-rw-r--r--apps/encryption/lib/Settings/Personal.php1
-rw-r--r--apps/encryption/lib/Util.php4
-rw-r--r--apps/encryption/templates/settings-admin.php2
-rw-r--r--apps/encryption/templates/settings-personal.php4
-rw-r--r--apps/encryption/tests/Command/FixEncryptedVersionTest.php39
-rw-r--r--apps/encryption/tests/Command/TestEnableMasterKey.php6
-rw-r--r--apps/encryption/tests/Controller/RecoveryControllerTest.php35
-rw-r--r--apps/encryption/tests/Controller/SettingsControllerTest.php61
-rw-r--r--apps/encryption/tests/Controller/StatusControllerTest.php25
-rw-r--r--apps/encryption/tests/Crypto/CryptTest.php111
-rw-r--r--apps/encryption/tests/Crypto/DecryptAllTest.php30
-rw-r--r--apps/encryption/tests/Crypto/EncryptAllTest.php188
-rw-r--r--apps/encryption/tests/Crypto/EncryptionTest.php59
-rw-r--r--apps/encryption/tests/EncryptedStorageTest.php3
-rw-r--r--apps/encryption/tests/KeyManagerTest.php130
-rw-r--r--apps/encryption/tests/RecoveryTest.php2
-rw-r--r--apps/encryption/tests/SessionTest.php20
-rw-r--r--apps/encryption/tests/Settings/AdminTest.php31
-rw-r--r--apps/encryption/tests/Users/SetupTest.php24
-rw-r--r--apps/encryption/tests/UtilTest.php34
192 files changed, 837 insertions, 1272 deletions
diff --git a/apps/encryption/l10n/ar.js b/apps/encryption/l10n/ar.js
index 336cbc660e8..f8cc148d1a8 100644
--- a/apps/encryption/l10n/ar.js
+++ b/apps/encryption/l10n/ar.js
@@ -53,7 +53,7 @@ OC.L10N.register(
"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." : "اذا كنت لاتتذكر كلمة المرور، تستطيع ان تطلب من المدير أستعادة ملفاتك.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "إذا كنت لا تتذكر كلمة مرورك القديمة، فيمكنك أن تطلب من المشرف استرداد ملفاتك.",
"Old log-in password" : "كلمة المرور القديمة الخاصة بالدخول",
"Current log-in password" : "كلمة المرور الحالية الخاصة بالدخول",
"Update Private Key Password" : "تحديث كلمة المرور لـ المفتاح الخاص",
diff --git a/apps/encryption/l10n/ar.json b/apps/encryption/l10n/ar.json
index e6f3a3054cd..a99cca63d1e 100644
--- a/apps/encryption/l10n/ar.json
+++ b/apps/encryption/l10n/ar.json
@@ -51,7 +51,7 @@
"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." : "اذا كنت لاتتذكر كلمة المرور، تستطيع ان تطلب من المدير أستعادة ملفاتك.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "إذا كنت لا تتذكر كلمة مرورك القديمة، فيمكنك أن تطلب من المشرف استرداد ملفاتك.",
"Old log-in password" : "كلمة المرور القديمة الخاصة بالدخول",
"Current log-in password" : "كلمة المرور الحالية الخاصة بالدخول",
"Update Private Key Password" : "تحديث كلمة المرور لـ المفتاح الخاص",
diff --git a/apps/encryption/l10n/ast.js b/apps/encryption/l10n/ast.js
deleted file mode 100644
index eb732bada56..00000000000
--- a/apps/encryption/l10n/ast.js
+++ /dev/null
@@ -1,29 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Recovery key successfully enabled" : "Habilitóse la recuperación de ficheros",
- "Could not enable recovery key. Please check your recovery key password!" : "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña.",
- "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
- "Could not disable recovery key. Please check your recovery key password!" : "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
- "Password successfully changed." : "Camudóse la contraseña",
- "Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
- "Private key password successfully updated." : "Contraseña de clave privada anovada correchamente.",
- "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",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.",
- "The share will expire on %s." : "La compartición va caducar el %s.",
- "Cheers!" : "¡Salú!",
- "Recovery key password" : "Contraseña de clave de recuperación",
- "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
- "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.",
- "Old log-in password" : "Contraseña d'accesu vieya",
- "Current log-in password" : "Contraseña d'accesu actual",
- "Update Private Key Password" : "Anovar Contraseña de Clave Privada",
- "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña",
- "Enabled" : "Habilitar",
- "Disabled" : "Deshabilitáu"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/ast.json b/apps/encryption/l10n/ast.json
deleted file mode 100644
index 501e4757acf..00000000000
--- a/apps/encryption/l10n/ast.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{ "translations": {
- "Recovery key successfully enabled" : "Habilitóse la recuperación de ficheros",
- "Could not enable recovery key. Please check your recovery key password!" : "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña.",
- "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
- "Could not disable recovery key. Please check your recovery key password!" : "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
- "Password successfully changed." : "Camudóse la contraseña",
- "Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
- "Private key password successfully updated." : "Contraseña de clave privada anovada correchamente.",
- "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",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.",
- "The share will expire on %s." : "La compartición va caducar el %s.",
- "Cheers!" : "¡Salú!",
- "Recovery key password" : "Contraseña de clave de recuperación",
- "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
- "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.",
- "Old log-in password" : "Contraseña d'accesu vieya",
- "Current log-in password" : "Contraseña d'accesu actual",
- "Update Private Key Password" : "Anovar Contraseña de Clave Privada",
- "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña",
- "Enabled" : "Habilitar",
- "Disabled" : "Deshabilitáu"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/az.js b/apps/encryption/l10n/az.js
deleted file mode 100644
index d4190b66aab..00000000000
--- a/apps/encryption/l10n/az.js
+++ /dev/null
@@ -1,35 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Missing recovery key password" : "Bərpa açarının şifrəsi çatışmır",
- "Please repeat the recovery key password" : "Xahiş olunur bərpa açarı şifrəsini təkrarlayasınız",
- "Repeated recovery key password does not match the provided recovery key password" : "Təkrar daxil edilən bərpa açarı şifrəsi, öncə daxil edilən bərpa açarı ilə üst-üstə düşmür ",
- "Recovery key successfully enabled" : "Bərpa açarı uğurla aktivləşdi",
- "Could not enable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarının aktivləşdirilməsi mümkün olmadı. Xahiş olunur geriqaytarılma açarı üçün tələb edilən şifrəni yoxlayasınız.",
- "Recovery key successfully disabled" : "Bərpa açarı uğurla söndürüldü",
- "Could not disable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarını sondürmək olmur. Xahiş edirik geriqaytarılma key açarınızı yoxlayın.",
- "Please provide the old recovery password" : "Xahiş olunur köhnə bərpa açarını daxil edəsiniz",
- "Please provide a new recovery password" : "Xahiş olunur yeni bərpa açarı şifrəsini daxil esəsiniz",
- "Please repeat the new recovery password" : "Xahiş olunur yeni bərpa açarını təkrarlayasınız",
- "Password successfully changed." : "Şifrə uğurla dəyişdirildi.",
- "Could not change the password. Maybe the old password was not correct." : "Şifrəni dəyişmək olmur, ola bilər ki, köhnə şifrə düzgün olmayıb.",
- "Could not update the private key password." : "Gizli açarın şifrəsini yeniləmək mümkün olmadı.",
- "The old password was not correct, please try again." : "Köhnə şifrə düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
- "The current log-in password was not correct, please try again." : "Hal-hazırki istifadəçi şifrəsi düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
- "Private key password successfully updated." : "Gizli aşar şifrəsi uğurla yeniləndi.",
- "Cheers!" : "Şərəfə!",
- "Recovery key password" : "Açar şifrənin bərpa edilməsi",
- "Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
- "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: ",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Əgər siz köhnə şifrənizi xatırlamırsınızsa, öz inzibatçınızdan fayllarınızın bərpasını istəyə bilərsiniz.",
- "Old log-in password" : "Köhnə giriş şifrəsi",
- "Current log-in password" : "Hal-hazırki giriş şifrəsi",
- "Update Private Key Password" : "Gizli açar şifrəsini yenilə",
- "Enable password recovery:" : "Şifrə bərpasını işə sal:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu opsiyanın aktiv edilməsi sizə, şifrənin itdiyi hallarda bütün şifrələnmiş fayllarınıza yetkinin yenidən əldə edilməsinə şərait yaradacaq",
- "Enabled" : "İşə salınıb",
- "Disabled" : "Dayandırılıb"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/az.json b/apps/encryption/l10n/az.json
deleted file mode 100644
index 6e88e1740a7..00000000000
--- a/apps/encryption/l10n/az.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{ "translations": {
- "Missing recovery key password" : "Bərpa açarının şifrəsi çatışmır",
- "Please repeat the recovery key password" : "Xahiş olunur bərpa açarı şifrəsini təkrarlayasınız",
- "Repeated recovery key password does not match the provided recovery key password" : "Təkrar daxil edilən bərpa açarı şifrəsi, öncə daxil edilən bərpa açarı ilə üst-üstə düşmür ",
- "Recovery key successfully enabled" : "Bərpa açarı uğurla aktivləşdi",
- "Could not enable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarının aktivləşdirilməsi mümkün olmadı. Xahiş olunur geriqaytarılma açarı üçün tələb edilən şifrəni yoxlayasınız.",
- "Recovery key successfully disabled" : "Bərpa açarı uğurla söndürüldü",
- "Could not disable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarını sondürmək olmur. Xahiş edirik geriqaytarılma key açarınızı yoxlayın.",
- "Please provide the old recovery password" : "Xahiş olunur köhnə bərpa açarını daxil edəsiniz",
- "Please provide a new recovery password" : "Xahiş olunur yeni bərpa açarı şifrəsini daxil esəsiniz",
- "Please repeat the new recovery password" : "Xahiş olunur yeni bərpa açarını təkrarlayasınız",
- "Password successfully changed." : "Şifrə uğurla dəyişdirildi.",
- "Could not change the password. Maybe the old password was not correct." : "Şifrəni dəyişmək olmur, ola bilər ki, köhnə şifrə düzgün olmayıb.",
- "Could not update the private key password." : "Gizli açarın şifrəsini yeniləmək mümkün olmadı.",
- "The old password was not correct, please try again." : "Köhnə şifrə düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
- "The current log-in password was not correct, please try again." : "Hal-hazırki istifadəçi şifrəsi düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
- "Private key password successfully updated." : "Gizli aşar şifrəsi uğurla yeniləndi.",
- "Cheers!" : "Şərəfə!",
- "Recovery key password" : "Açar şifrənin bərpa edilməsi",
- "Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
- "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: ",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Əgər siz köhnə şifrənizi xatırlamırsınızsa, öz inzibatçınızdan fayllarınızın bərpasını istəyə bilərsiniz.",
- "Old log-in password" : "Köhnə giriş şifrəsi",
- "Current log-in password" : "Hal-hazırki giriş şifrəsi",
- "Update Private Key Password" : "Gizli açar şifrəsini yenilə",
- "Enable password recovery:" : "Şifrə bərpasını işə sal:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu opsiyanın aktiv edilməsi sizə, şifrənin itdiyi hallarda bütün şifrələnmiş fayllarınıza yetkinin yenidən əldə edilməsinə şərait yaradacaq",
- "Enabled" : "İşə salınıb",
- "Disabled" : "Dayandırılıb"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/bg.js b/apps/encryption/l10n/bg.js
index 606c12a97ca..009fb7d9aee 100644
--- a/apps/encryption/l10n/bg.js
+++ b/apps/encryption/l10n/bg.js
@@ -51,7 +51,6 @@ OC.L10N.register(
"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." : "Ако не помниш старата парола помоли администратора да възстанови файловете ти.",
"Old log-in password" : "Стара парола за вписване",
"Current log-in password" : "Текуща парола за вписване",
"Update Private Key Password" : "Промени Тайната Парола за Ключа",
diff --git a/apps/encryption/l10n/bg.json b/apps/encryption/l10n/bg.json
index 8a67abacf35..4a4ed94210e 100644
--- a/apps/encryption/l10n/bg.json
+++ b/apps/encryption/l10n/bg.json
@@ -49,7 +49,6 @@
"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." : "Ако не помниш старата парола помоли администратора да възстанови файловете ти.",
"Old log-in password" : "Стара парола за вписване",
"Current log-in password" : "Текуща парола за вписване",
"Update Private Key Password" : "Промени Тайната Парола за Ключа",
diff --git a/apps/encryption/l10n/bn_BD.js b/apps/encryption/l10n/bn_BD.js
deleted file mode 100644
index 2d20f4caa26..00000000000
--- a/apps/encryption/l10n/bn_BD.js
+++ /dev/null
@@ -1,13 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
- "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
- "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
- "Cheers!" : "শুভেচ্ছা!",
- "Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
- "Change Password" : "কূটশব্দ পরিবর্তন করুন",
- "Enabled" : "কার্যকর",
- "Disabled" : "অকার্যকর"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/bn_BD.json b/apps/encryption/l10n/bn_BD.json
deleted file mode 100644
index 4c2c9c14b95..00000000000
--- a/apps/encryption/l10n/bn_BD.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{ "translations": {
- "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
- "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
- "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
- "Cheers!" : "শুভেচ্ছা!",
- "Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
- "Change Password" : "কূটশব্দ পরিবর্তন করুন",
- "Enabled" : "কার্যকর",
- "Disabled" : "অকার্যকর"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/bs.js b/apps/encryption/l10n/bs.js
deleted file mode 100644
index 41d7074d5a4..00000000000
--- a/apps/encryption/l10n/bs.js
+++ /dev/null
@@ -1,11 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "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. Molim ažurirajte lozinku svoga privatnog ključa u svojim osobnim postavkama 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 uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite",
- "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
- "Cheers!" : "Cheers!",
- "Enabled" : "Aktivirano",
- "Disabled" : "Onemogućeno"
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/encryption/l10n/bs.json b/apps/encryption/l10n/bs.json
deleted file mode 100644
index 0beb35f1558..00000000000
--- a/apps/encryption/l10n/bs.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "translations": {
- "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. Molim ažurirajte lozinku svoga privatnog ključa u svojim osobnim postavkama 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 uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite",
- "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
- "Cheers!" : "Cheers!",
- "Enabled" : "Aktivirano",
- "Disabled" : "Onemogućeno"
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/ca.js b/apps/encryption/l10n/ca.js
index fd7f14ba003..fd531c313ab 100644
--- a/apps/encryption/l10n/ca.js
+++ b/apps/encryption/l10n/ca.js
@@ -47,7 +47,6 @@ OC.L10N.register(
"Basic encryption module" : "Mòdul de xifratge bàsic",
"Your private key password no longer matches your log-in password." : "La clau privada ja no es correspon amb la contrasenya d'inici de sessió:",
"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:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers.",
"Old log-in password" : "Contrasenya antiga d’inici de sessió",
"Current log-in password" : "Contrasenya actual d’inici de sessió",
"Update Private Key Password" : "Actualitza la contrasenya de clau privada",
diff --git a/apps/encryption/l10n/ca.json b/apps/encryption/l10n/ca.json
index 77d3c2c35db..80c09aa0b0d 100644
--- a/apps/encryption/l10n/ca.json
+++ b/apps/encryption/l10n/ca.json
@@ -45,7 +45,6 @@
"Basic encryption module" : "Mòdul de xifratge bàsic",
"Your private key password no longer matches your log-in password." : "La clau privada ja no es correspon amb la contrasenya d'inici de sessió:",
"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:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers.",
"Old log-in password" : "Contrasenya antiga d’inici de sessió",
"Current log-in password" : "Contrasenya actual d’inici de sessió",
"Update Private Key Password" : "Actualitza la contrasenya de clau privada",
diff --git a/apps/encryption/l10n/cs.js b/apps/encryption/l10n/cs.js
index 9efc979b39e..97d6108a17d 100644
--- a/apps/encryption/l10n/cs.js
+++ b/apps/encryption/l10n/cs.js
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Základní šifrovací modul",
"Your private key password no longer matches your log-in password." : "Heslo k vašemu soukromému klíči se už 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ů.",
+ "If you do not 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ů.",
"Old log-in password" : "Původní přihlašovací heslo",
"Current log-in password" : "Stávající přihlašovací heslo",
"Update Private Key Password" : "Změnit heslo k soukromé části klíče",
diff --git a/apps/encryption/l10n/cs.json b/apps/encryption/l10n/cs.json
index a40f200bac1..24b09516608 100644
--- a/apps/encryption/l10n/cs.json
+++ b/apps/encryption/l10n/cs.json
@@ -51,7 +51,7 @@
"Basic encryption module" : "Základní šifrovací modul",
"Your private key password no longer matches your log-in password." : "Heslo k vašemu soukromému klíči se už 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ů.",
+ "If you do not 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ů.",
"Old log-in password" : "Původní přihlašovací heslo",
"Current log-in password" : "Stávající přihlašovací heslo",
"Update Private Key Password" : "Změnit heslo k soukromé části klíče",
diff --git a/apps/encryption/l10n/da.js b/apps/encryption/l10n/da.js
index 0266462bb79..2688722c16c 100644
--- a/apps/encryption/l10n/da.js
+++ b/apps/encryption/l10n/da.js
@@ -27,8 +27,8 @@ OC.L10N.register(
"Encryption app is enabled and ready" : "Krypteringsprogrammet er aktiveret og klar",
"Bad Signature" : "Ugyldig signatur",
"Missing Signature" : "Signatur mangler",
- "one-time password for server-side-encryption" : "Engangs password for kryptering på serverdelen",
- "Encryption password" : "Krypterings password",
+ "one-time password for server-side-encryption" : "Engangs adgangskode for kryptering på serverdelen",
+ "Encryption password" : "Krypterings adgangskode",
"The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Administrationen aktiverede server-side-kryptering. Dine filer blev krypteret med adgangskoden 1%s1.",
"The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Administrationen aktiverede server-side-kryptering. Dine filer blev krypteret med adgangskoden \"%s\".",
"Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Log venligst ind på webgrænsefladen, gå til afsnittet \"Sikkerhed\" i dine personlige indstillinger og opdater din krypteringsadgangskode ved at indtaste denne adgangskode i feltet \"Gammel loginadgangskode\" og din nuværende loginadgangskode.",
@@ -40,8 +40,8 @@ OC.L10N.register(
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret men dine nøgler er ikke indlæst, log venligst ud og ind igen",
"Encrypt the home storage" : "Krypter hjemmelageret",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ved at slå denne valgmulighed til krypteres alle filer i hovedlageret, ellers vil kun filer på eksternt lager blive krypteret",
- "Enable recovery key" : "Aktivér gendannelsesnøgle",
- "Disable recovery key" : "Deaktivér gendannelsesnøgle",
+ "Enable recovery key" : "Aktiver gendannelsesnøgle",
+ "Disable recovery key" : "Deaktiver gendannelsesnøgle",
"The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Det bruges til at gendanne filer fra en konto, hvis adgangskoden er glemt.",
"Recovery key password" : "Gendannelsesnøgle kodeord",
"Repeat recovery key password" : "Gentag adgangskode for gendannelsesnøgle",
@@ -53,7 +53,6 @@ OC.L10N.register(
"Basic encryption module" : "Basis krypterings modul",
"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.",
"Old log-in password" : "Gammel adgangskode",
"Current log-in password" : "Nuværende adgangskode",
"Update Private Key Password" : "Opdater Privat Nøgle Kodeord",
diff --git a/apps/encryption/l10n/da.json b/apps/encryption/l10n/da.json
index 5a32ae7a54e..688adab4704 100644
--- a/apps/encryption/l10n/da.json
+++ b/apps/encryption/l10n/da.json
@@ -25,8 +25,8 @@
"Encryption app is enabled and ready" : "Krypteringsprogrammet er aktiveret og klar",
"Bad Signature" : "Ugyldig signatur",
"Missing Signature" : "Signatur mangler",
- "one-time password for server-side-encryption" : "Engangs password for kryptering på serverdelen",
- "Encryption password" : "Krypterings password",
+ "one-time password for server-side-encryption" : "Engangs adgangskode for kryptering på serverdelen",
+ "Encryption password" : "Krypterings adgangskode",
"The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Administrationen aktiverede server-side-kryptering. Dine filer blev krypteret med adgangskoden 1%s1.",
"The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Administrationen aktiverede server-side-kryptering. Dine filer blev krypteret med adgangskoden \"%s\".",
"Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Log venligst ind på webgrænsefladen, gå til afsnittet \"Sikkerhed\" i dine personlige indstillinger og opdater din krypteringsadgangskode ved at indtaste denne adgangskode i feltet \"Gammel loginadgangskode\" og din nuværende loginadgangskode.",
@@ -38,8 +38,8 @@
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret men dine nøgler er ikke indlæst, log venligst ud og ind igen",
"Encrypt the home storage" : "Krypter hjemmelageret",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ved at slå denne valgmulighed til krypteres alle filer i hovedlageret, ellers vil kun filer på eksternt lager blive krypteret",
- "Enable recovery key" : "Aktivér gendannelsesnøgle",
- "Disable recovery key" : "Deaktivér gendannelsesnøgle",
+ "Enable recovery key" : "Aktiver gendannelsesnøgle",
+ "Disable recovery key" : "Deaktiver gendannelsesnøgle",
"The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Det bruges til at gendanne filer fra en konto, hvis adgangskoden er glemt.",
"Recovery key password" : "Gendannelsesnøgle kodeord",
"Repeat recovery key password" : "Gentag adgangskode for gendannelsesnøgle",
@@ -51,7 +51,6 @@
"Basic encryption module" : "Basis krypterings modul",
"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.",
"Old log-in password" : "Gammel adgangskode",
"Current log-in password" : "Nuværende adgangskode",
"Update Private Key Password" : "Opdater Privat Nøgle Kodeord",
diff --git a/apps/encryption/l10n/de.js b/apps/encryption/l10n/de.js
index 4e5e787441a..d75e6ab3a18 100644
--- a/apps/encryption/l10n/de.js
+++ b/apps/encryption/l10n/de.js
@@ -4,7 +4,7 @@ OC.L10N.register(
"Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
"Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
"Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
- "Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
+ "Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde aktiviert",
"Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfe das Passwort für den Wiederherstellungsschlüssel!",
"Recovery key successfully disabled" : "Wiederherstellungsschlüssel deaktiviert.",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfe das Passwort für den Wiederherstellungsschlüssel!",
@@ -16,28 +16,28 @@ OC.L10N.register(
"Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
"Recovery Key disabled" : "Wiederherstellungsschlüssel deaktiviert",
"Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
- "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuche es noch einmal oder kontaktiere deinen Administrator",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuche es noch einmal oder kontaktiere deine Administration",
"Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
"The old password was not correct, please try again." : "Das alte Passwort war falsch, bitte versuche es erneut.",
"The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuche es noch einmal.",
"Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Falscher privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisiere deinen privaten Schlüssel in deinen persönlichen Einstellungen, um wieder Zugriff auf die verschlüsselten Dateien zu erhalten.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselung-App ist aktiviert, aber deine Schlüssel sind nicht initialisiert. Bitte melde dich ab und wieder an.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktiviere server-seitige Verschlüsselung in den Verwaltungseinstellungen, um das Verschlüsselungsmodul nutzen zu können.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind nicht initialisiert. Bitte ab- und wieder anmelden",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte die serverseitige Verschlüsselung in den Verwaltungseinstellungen aktivieren, um das Verschlüsselungsmodul nutzen zu können.",
"Encryption app is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
"Bad Signature" : "Ungültige Signatur",
"Missing Signature" : "Fehlende Signatur",
"one-time password for server-side-encryption" : "Einmal-Passwort für serverseitige Verschlüsselung",
"Encryption password" : "Verschlüsselungskennwort",
- "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Deine Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.",
- "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Deine Dateien wurden mit dem Passwort \"%s\" verschlüsselt.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort \"%s\" verschlüsselt.",
"Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Bitte melde dich an der Weboberfläche an, gehe zum Abschnitt \"Sicherheit\" deiner persönlichen Einstellungen und aktualisiere dein Verschlüsselungspasswort, indem du dieses Passwort in das Feld \"Altes Login-Passwort\" sowie dein aktuelles Login-Passwort eingibst.",
- "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit dir zu teilen.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte den Eigentümer der Datei kontaktieren und ihn darum bitten, die Datei noch einmal zu teilen.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit dir zu teilen.",
"Default encryption module" : "Standard-Verschlüsselungsmodul",
"Default encryption module for server-side encryption" : "Standard-Verschlüsselungsmodul für serverseitige Verschlüsselung",
"In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Um dieses Verschlüsselungsmodul nutzen zu können, musst du die serverseitige Verschlüsselung in den Verwaltungseinstellungen aktivieren. Sobald das Modul aktiviert ist, verschlüsselt es alle deine Dateien transparent. Die Verschlüsselung basiert auf AES-256-Schlüsseln.\nDas Modul ändert keine vorhandenen Dateien, nur neue Dateien werden verschlüsselt, nachdem die serverseitige Verschlüsselung aktiviert wurde. Es ist nicht möglich, die Verschlüsselung zu deaktivieren und wieder auf ein unverschlüsseltes System umzuschalten.\nBitte lies die Dokumentation, um alle Auswirkungen zu kennen, bevor du dich entscheidest, die serverseitige Verschlüsselung zu aktivieren.",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte melde dich ab und wieder an",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte melde ab- und wieder anmelden",
"Encrypt the home storage" : "Benutzerverzeichnis verschlüsseln",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Die Aktivierung dieser Option verschlüsselt alle Dateien die auf dem Hauptspeicher gespeichert sind, ansonsten werden nur Dateien auf dem externen Speicher verschlüsselt",
"Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
@@ -51,9 +51,9 @@ OC.L10N.register(
"Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change Password" : "Passwort ändern",
"Basic encryption module" : "Basisverschlüsselungsmodul",
- "Your private key password no longer matches your log-in password." : "Das Passwort für deinen privaten Schlüssel stimmt nicht mehr mit deinem Anmelde-Passwort überein.",
+ "Your private key password no longer matches your log-in password." : "Das Passwort für den privaten Schlüssel stimmt nicht mehr mit dem Anmelde-Passwort überein.",
"Set your old private key password to your current log-in password:" : "Dein altes Passwort für den privaten Schlüssel auf dein aktuelles Anmeldepasswort setzen:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Falls du dich nicht an dein altes Passwort erinnern kannst, frage deinen Administrator, um deine Dateien wiederherzustellen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Wenn du dich nicht mehr an dein altes Passwort erinnern kannst, kannst du deine Administration bitten, deine Dateien wiederherzustellen.",
"Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Passwort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json
index 145a3e795dd..a2559fdf4f3 100644
--- a/apps/encryption/l10n/de.json
+++ b/apps/encryption/l10n/de.json
@@ -2,7 +2,7 @@
"Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
"Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
"Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
- "Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
+ "Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde aktiviert",
"Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfe das Passwort für den Wiederherstellungsschlüssel!",
"Recovery key successfully disabled" : "Wiederherstellungsschlüssel deaktiviert.",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfe das Passwort für den Wiederherstellungsschlüssel!",
@@ -14,28 +14,28 @@
"Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
"Recovery Key disabled" : "Wiederherstellungsschlüssel deaktiviert",
"Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
- "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuche es noch einmal oder kontaktiere deinen Administrator",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuche es noch einmal oder kontaktiere deine Administration",
"Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
"The old password was not correct, please try again." : "Das alte Passwort war falsch, bitte versuche es erneut.",
"The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuche es noch einmal.",
"Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Falscher privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisiere deinen privaten Schlüssel in deinen persönlichen Einstellungen, um wieder Zugriff auf die verschlüsselten Dateien zu erhalten.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselung-App ist aktiviert, aber deine Schlüssel sind nicht initialisiert. Bitte melde dich ab und wieder an.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktiviere server-seitige Verschlüsselung in den Verwaltungseinstellungen, um das Verschlüsselungsmodul nutzen zu können.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind nicht initialisiert. Bitte ab- und wieder anmelden",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte die serverseitige Verschlüsselung in den Verwaltungseinstellungen aktivieren, um das Verschlüsselungsmodul nutzen zu können.",
"Encryption app is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
"Bad Signature" : "Ungültige Signatur",
"Missing Signature" : "Fehlende Signatur",
"one-time password for server-side-encryption" : "Einmal-Passwort für serverseitige Verschlüsselung",
"Encryption password" : "Verschlüsselungskennwort",
- "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Deine Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.",
- "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Deine Dateien wurden mit dem Passwort \"%s\" verschlüsselt.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort \"%s\" verschlüsselt.",
"Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Bitte melde dich an der Weboberfläche an, gehe zum Abschnitt \"Sicherheit\" deiner persönlichen Einstellungen und aktualisiere dein Verschlüsselungspasswort, indem du dieses Passwort in das Feld \"Altes Login-Passwort\" sowie dein aktuelles Login-Passwort eingibst.",
- "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit dir zu teilen.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte den Eigentümer der Datei kontaktieren und ihn darum bitten, die Datei noch einmal zu teilen.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit dir zu teilen.",
"Default encryption module" : "Standard-Verschlüsselungsmodul",
"Default encryption module for server-side encryption" : "Standard-Verschlüsselungsmodul für serverseitige Verschlüsselung",
"In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Um dieses Verschlüsselungsmodul nutzen zu können, musst du die serverseitige Verschlüsselung in den Verwaltungseinstellungen aktivieren. Sobald das Modul aktiviert ist, verschlüsselt es alle deine Dateien transparent. Die Verschlüsselung basiert auf AES-256-Schlüsseln.\nDas Modul ändert keine vorhandenen Dateien, nur neue Dateien werden verschlüsselt, nachdem die serverseitige Verschlüsselung aktiviert wurde. Es ist nicht möglich, die Verschlüsselung zu deaktivieren und wieder auf ein unverschlüsseltes System umzuschalten.\nBitte lies die Dokumentation, um alle Auswirkungen zu kennen, bevor du dich entscheidest, die serverseitige Verschlüsselung zu aktivieren.",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte melde dich ab und wieder an",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte melde ab- und wieder anmelden",
"Encrypt the home storage" : "Benutzerverzeichnis verschlüsseln",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Die Aktivierung dieser Option verschlüsselt alle Dateien die auf dem Hauptspeicher gespeichert sind, ansonsten werden nur Dateien auf dem externen Speicher verschlüsselt",
"Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
@@ -49,9 +49,9 @@
"Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change Password" : "Passwort ändern",
"Basic encryption module" : "Basisverschlüsselungsmodul",
- "Your private key password no longer matches your log-in password." : "Das Passwort für deinen privaten Schlüssel stimmt nicht mehr mit deinem Anmelde-Passwort überein.",
+ "Your private key password no longer matches your log-in password." : "Das Passwort für den privaten Schlüssel stimmt nicht mehr mit dem Anmelde-Passwort überein.",
"Set your old private key password to your current log-in password:" : "Dein altes Passwort für den privaten Schlüssel auf dein aktuelles Anmeldepasswort setzen:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Falls du dich nicht an dein altes Passwort erinnern kannst, frage deinen Administrator, um deine Dateien wiederherzustellen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Wenn du dich nicht mehr an dein altes Passwort erinnern kannst, kannst du deine Administration bitten, deine Dateien wiederherzustellen.",
"Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Passwort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js
index bf0c97f7bc3..94d2501a80c 100644
--- a/apps/encryption/l10n/de_DE.js
+++ b/apps/encryption/l10n/de_DE.js
@@ -4,9 +4,9 @@ OC.L10N.register(
"Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
"Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
"Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
- "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+ "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde aktiviert.",
"Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
- "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+ "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde deaktiviert.",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
"Missing parameters" : "Fehlende Parameter",
"Please provide the old recovery password" : "Bitte das alte Wiederherstellungspasswort eingeben",
@@ -23,7 +23,7 @@ OC.L10N.register(
"Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Falscher privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihren privaten Schlüssel in Ihren persönlichen Einstellungen, um wieder Zugriff auf die verschlüsselten Dateien zu erhalten.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden Sie sich ab und wieder an.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktivieren Sie die server-seitige Verschlüsselung in den Administrationseinstellungen, um das Verschlüsselungsmodul nutzen zu können.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktivieren Sie die serverseitige Verschlüsselung in den Administrationseinstellungen, um das Verschlüsselungsmodul nutzen zu können.",
"Encryption app is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
"Bad Signature" : "Falsche Signatur",
"Missing Signature" : "Fehlende Signatur",
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Basisverschlüsselungsmodul",
"Your private key password no longer matches your log-in password." : "Das Passwort für Ihren privaten Schlüssel stimmt nicht mehr mit Ihrem Anmelde-Passwort überein.",
"Set your old private key password to your current log-in password:" : "Ihr altes Passwort für den privaten Schlüssel auf Ihr aktuelles Anmeldepasswort setzen:",
- " 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.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Wenn Sie sich nicht mehr an Ihr altes Passwort erinnern, können Sie Ihre Administration bitten, Ihre Dateien wiederherzustellen.",
"Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Anmeldepasswort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json
index 41356fc8b11..7add3710d66 100644
--- a/apps/encryption/l10n/de_DE.json
+++ b/apps/encryption/l10n/de_DE.json
@@ -2,9 +2,9 @@
"Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
"Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
"Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
- "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+ "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde aktiviert.",
"Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
- "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+ "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde deaktiviert.",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
"Missing parameters" : "Fehlende Parameter",
"Please provide the old recovery password" : "Bitte das alte Wiederherstellungspasswort eingeben",
@@ -21,7 +21,7 @@
"Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Falscher privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihren privaten Schlüssel in Ihren persönlichen Einstellungen, um wieder Zugriff auf die verschlüsselten Dateien zu erhalten.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden Sie sich ab und wieder an.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktivieren Sie die server-seitige Verschlüsselung in den Administrationseinstellungen, um das Verschlüsselungsmodul nutzen zu können.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktivieren Sie die serverseitige Verschlüsselung in den Administrationseinstellungen, um das Verschlüsselungsmodul nutzen zu können.",
"Encryption app is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
"Bad Signature" : "Falsche Signatur",
"Missing Signature" : "Fehlende Signatur",
@@ -51,7 +51,7 @@
"Basic encryption module" : "Basisverschlüsselungsmodul",
"Your private key password no longer matches your log-in password." : "Das Passwort für Ihren privaten Schlüssel stimmt nicht mehr mit Ihrem Anmelde-Passwort überein.",
"Set your old private key password to your current log-in password:" : "Ihr altes Passwort für den privaten Schlüssel auf Ihr aktuelles Anmeldepasswort setzen:",
- " 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.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Wenn Sie sich nicht mehr an Ihr altes Passwort erinnern, können Sie Ihre Administration bitten, Ihre Dateien wiederherzustellen.",
"Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Anmeldepasswort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
diff --git a/apps/encryption/l10n/el.js b/apps/encryption/l10n/el.js
index f1cadc59fe3..6b555d16261 100644
--- a/apps/encryption/l10n/el.js
+++ b/apps/encryption/l10n/el.js
@@ -47,7 +47,6 @@ OC.L10N.register(
"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." : "Εάν δεν θυμάστε τον παλιό σας κωδικό μπορείτε να ζητήσετε από τον διαχειριστή σας να επανακτήσει τα αρχεία σας.",
"Old log-in password" : "Παλαιό συνθηματικό εισόδου",
"Current log-in password" : "Τρέχον συνθηματικό πρόσβασης",
"Update Private Key Password" : "Ενημέρωση Προσωπικού Κλειδού Πρόσβασης",
diff --git a/apps/encryption/l10n/el.json b/apps/encryption/l10n/el.json
index 20dc78abd86..bcf3189a2f7 100644
--- a/apps/encryption/l10n/el.json
+++ b/apps/encryption/l10n/el.json
@@ -45,7 +45,6 @@
"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." : "Εάν δεν θυμάστε τον παλιό σας κωδικό μπορείτε να ζητήσετε από τον διαχειριστή σας να επανακτήσει τα αρχεία σας.",
"Old log-in password" : "Παλαιό συνθηματικό εισόδου",
"Current log-in password" : "Τρέχον συνθηματικό πρόσβασης",
"Update Private Key Password" : "Ενημέρωση Προσωπικού Κλειδού Πρόσβασης",
diff --git a/apps/encryption/l10n/en_GB.js b/apps/encryption/l10n/en_GB.js
index 8f7cc5aa38f..8f3408f59e7 100644
--- a/apps/encryption/l10n/en_GB.js
+++ b/apps/encryption/l10n/en_GB.js
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "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.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "If you do not remember your old password you can ask your administrator to recover your files.",
"Old log-in password" : "Old login password",
"Current log-in password" : "Current login password",
"Update Private Key Password" : "Update Private Key Password",
diff --git a/apps/encryption/l10n/en_GB.json b/apps/encryption/l10n/en_GB.json
index 1f461301630..d66c1bb51ab 100644
--- a/apps/encryption/l10n/en_GB.json
+++ b/apps/encryption/l10n/en_GB.json
@@ -51,7 +51,7 @@
"Basic encryption module" : "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.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "If you do not remember your old password you can ask your administrator to recover your files.",
"Old log-in password" : "Old login password",
"Current log-in password" : "Current login password",
"Update Private Key Password" : "Update Private Key Password",
diff --git a/apps/encryption/l10n/eo.js b/apps/encryption/l10n/eo.js
index bceb28a8041..36ecb37951b 100644
--- a/apps/encryption/l10n/eo.js
+++ b/apps/encryption/l10n/eo.js
@@ -45,7 +45,6 @@ OC.L10N.register(
"Basic encryption module" : "Bazĉifrada modulo",
"Your private key password no longer matches your log-in password." : "La pasvorto de via privata ŝlosilo ne plu kongruas kun via ensaluta pasvorto.",
"Set your old private key password to your current log-in password:" : "Agordi la pasvorton de via antaŭa privata ŝlosilo al via nuna ensaluta pasvorto:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se vi ne memoras vian antaŭan pasvorton, vi povas peti al via administranto restaŭri viajn dosierojn.",
"Old log-in password" : "Malnova ensaluta pasvorto",
"Current log-in password" : "Nuna ensaluta pasvorto",
"Update Private Key Password" : "Ĝisdatigi la pasvorton de la malpublika ŝlosilo",
diff --git a/apps/encryption/l10n/eo.json b/apps/encryption/l10n/eo.json
index 956a965fdf4..ee6bd31b4ab 100644
--- a/apps/encryption/l10n/eo.json
+++ b/apps/encryption/l10n/eo.json
@@ -43,7 +43,6 @@
"Basic encryption module" : "Bazĉifrada modulo",
"Your private key password no longer matches your log-in password." : "La pasvorto de via privata ŝlosilo ne plu kongruas kun via ensaluta pasvorto.",
"Set your old private key password to your current log-in password:" : "Agordi la pasvorton de via antaŭa privata ŝlosilo al via nuna ensaluta pasvorto:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se vi ne memoras vian antaŭan pasvorton, vi povas peti al via administranto restaŭri viajn dosierojn.",
"Old log-in password" : "Malnova ensaluta pasvorto",
"Current log-in password" : "Nuna ensaluta pasvorto",
"Update Private Key Password" : "Ĝisdatigi la pasvorton de la malpublika ŝlosilo",
diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
index e3cc500f87a..114aa02968f 100644
--- a/apps/encryption/l10n/es.js
+++ b/apps/encryption/l10n/es.js
@@ -39,7 +39,7 @@ OC.L10N.register(
"In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "De manera de usar este módulo de cifrado necesita activar el cifrado del lado del servidor en la configuraciones de administrador. Una vez que esté habilitado este módulo cifrará todos tus archivos de manera transparente. El cifrado está basado en llaves AES-256\nEl módulo no tocará los archivos existentes, solo los archivos nuevos serán cifrados una vez que el cifrado del lado del servidor se habilite. Además, no es posible deshabilitar el cifrado de nuevo y cambiar a un sistema sin cifrado.\nPor favor lea la documentación para que entienda todas las implicaciones antes de que decida habilitar el cifrado del lado del servidor.",
"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.",
"Encrypt the home storage" : "Encriptar el almacenamiento personal",
- "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Al activar esta opción se encriptarán todos los archivos almacenados en la memoria principal, de lo contrario serán cifrados sólo los archivos de almacenamiento externo",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Al activar esta opción se encriptarán todos los archivos almacenados en la memoria principal, de lo contrario, serán cifrados sólo los archivos de almacenamiento externo",
"Enable recovery key" : "Activa la clave de recuperación",
"Disable recovery key" : "Desactiva la clave de recuperación",
"The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "La llave de recuperación es una llave de cifrado adicional utilizada para cifrar archivos. Es utilizada para recuperar los archivos de una cuenta si la contraseña fuese olvidada.",
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de cifrado básico",
"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 archivos.",
+ "If you do not 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 recupere sus archivos.",
"Old log-in password" : "Contraseña de acceso antigua",
"Current log-in password" : "Contraseña de acceso actual",
"Update Private Key Password" : "Actualizar contraseña de clave privada",
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
index b1122c04a7b..9ec1c763bba 100644
--- a/apps/encryption/l10n/es.json
+++ b/apps/encryption/l10n/es.json
@@ -37,7 +37,7 @@
"In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "De manera de usar este módulo de cifrado necesita activar el cifrado del lado del servidor en la configuraciones de administrador. Una vez que esté habilitado este módulo cifrará todos tus archivos de manera transparente. El cifrado está basado en llaves AES-256\nEl módulo no tocará los archivos existentes, solo los archivos nuevos serán cifrados una vez que el cifrado del lado del servidor se habilite. Además, no es posible deshabilitar el cifrado de nuevo y cambiar a un sistema sin cifrado.\nPor favor lea la documentación para que entienda todas las implicaciones antes de que decida habilitar el cifrado del lado del servidor.",
"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.",
"Encrypt the home storage" : "Encriptar el almacenamiento personal",
- "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Al activar esta opción se encriptarán todos los archivos almacenados en la memoria principal, de lo contrario serán cifrados sólo los archivos de almacenamiento externo",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Al activar esta opción se encriptarán todos los archivos almacenados en la memoria principal, de lo contrario, serán cifrados sólo los archivos de almacenamiento externo",
"Enable recovery key" : "Activa la clave de recuperación",
"Disable recovery key" : "Desactiva la clave de recuperación",
"The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "La llave de recuperación es una llave de cifrado adicional utilizada para cifrar archivos. Es utilizada para recuperar los archivos de una cuenta si la contraseña fuese olvidada.",
@@ -51,7 +51,7 @@
"Basic encryption module" : "Módulo de cifrado básico",
"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 archivos.",
+ "If you do not 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 recupere sus archivos.",
"Old log-in password" : "Contraseña de acceso antigua",
"Current log-in password" : "Contraseña de acceso actual",
"Update Private Key Password" : "Actualizar contraseña de clave privada",
diff --git a/apps/encryption/l10n/es_419.js b/apps/encryption/l10n/es_419.js
index fba2ab0808c..fa5891cea44 100644
--- a/apps/encryption/l10n/es_419.js
+++ b/apps/encryption/l10n/es_419.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_419.json b/apps/encryption/l10n/es_419.json
index 178c37d1300..d948e14e11e 100644
--- a/apps/encryption/l10n/es_419.json
+++ b/apps/encryption/l10n/es_419.json
@@ -42,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_AR.js b/apps/encryption/l10n/es_AR.js
index 6fdd0d7312d..c7284faff24 100644
--- a/apps/encryption/l10n/es_AR.js
+++ b/apps/encryption/l10n/es_AR.js
@@ -43,7 +43,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Su contraseña de llave privada ya no corresónde con su contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establezca su contraseña de llave privada a su contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su contraseña anterior le puede pedir a su administrador que recupere sus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_AR.json b/apps/encryption/l10n/es_AR.json
index 160c1082e54..3dbbaf32d30 100644
--- a/apps/encryption/l10n/es_AR.json
+++ b/apps/encryption/l10n/es_AR.json
@@ -41,7 +41,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Su contraseña de llave privada ya no corresónde con su contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establezca su contraseña de llave privada a su contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su contraseña anterior le puede pedir a su administrador que recupere sus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_CL.js b/apps/encryption/l10n/es_CL.js
index fba2ab0808c..fa5891cea44 100644
--- a/apps/encryption/l10n/es_CL.js
+++ b/apps/encryption/l10n/es_CL.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_CL.json b/apps/encryption/l10n/es_CL.json
index 178c37d1300..d948e14e11e 100644
--- a/apps/encryption/l10n/es_CL.json
+++ b/apps/encryption/l10n/es_CL.json
@@ -42,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_CO.js b/apps/encryption/l10n/es_CO.js
index fba2ab0808c..fa5891cea44 100644
--- a/apps/encryption/l10n/es_CO.js
+++ b/apps/encryption/l10n/es_CO.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_CO.json b/apps/encryption/l10n/es_CO.json
index 178c37d1300..d948e14e11e 100644
--- a/apps/encryption/l10n/es_CO.json
+++ b/apps/encryption/l10n/es_CO.json
@@ -42,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_CR.js b/apps/encryption/l10n/es_CR.js
index fba2ab0808c..fa5891cea44 100644
--- a/apps/encryption/l10n/es_CR.js
+++ b/apps/encryption/l10n/es_CR.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_CR.json b/apps/encryption/l10n/es_CR.json
index 178c37d1300..d948e14e11e 100644
--- a/apps/encryption/l10n/es_CR.json
+++ b/apps/encryption/l10n/es_CR.json
@@ -42,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_DO.js b/apps/encryption/l10n/es_DO.js
index fba2ab0808c..fa5891cea44 100644
--- a/apps/encryption/l10n/es_DO.js
+++ b/apps/encryption/l10n/es_DO.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_DO.json b/apps/encryption/l10n/es_DO.json
index 178c37d1300..d948e14e11e 100644
--- a/apps/encryption/l10n/es_DO.json
+++ b/apps/encryption/l10n/es_DO.json
@@ -42,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_EC.js b/apps/encryption/l10n/es_EC.js
index f2535127e01..79b263f05c5 100644
--- a/apps/encryption/l10n/es_EC.js
+++ b/apps/encryption/l10n/es_EC.js
@@ -52,7 +52,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_EC.json b/apps/encryption/l10n/es_EC.json
index d11602e924c..d9b037fb088 100644
--- a/apps/encryption/l10n/es_EC.json
+++ b/apps/encryption/l10n/es_EC.json
@@ -50,7 +50,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_GT.js b/apps/encryption/l10n/es_GT.js
index fba2ab0808c..fa5891cea44 100644
--- a/apps/encryption/l10n/es_GT.js
+++ b/apps/encryption/l10n/es_GT.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_GT.json b/apps/encryption/l10n/es_GT.json
index 178c37d1300..d948e14e11e 100644
--- a/apps/encryption/l10n/es_GT.json
+++ b/apps/encryption/l10n/es_GT.json
@@ -42,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_HN.js b/apps/encryption/l10n/es_HN.js
index fba2ab0808c..fa5891cea44 100644
--- a/apps/encryption/l10n/es_HN.js
+++ b/apps/encryption/l10n/es_HN.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_HN.json b/apps/encryption/l10n/es_HN.json
index 178c37d1300..d948e14e11e 100644
--- a/apps/encryption/l10n/es_HN.json
+++ b/apps/encryption/l10n/es_HN.json
@@ -42,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_MX.js b/apps/encryption/l10n/es_MX.js
index 5852cab8fe1..c54e15075df 100644
--- a/apps/encryption/l10n/es_MX.js
+++ b/apps/encryption/l10n/es_MX.js
@@ -46,7 +46,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_MX.json b/apps/encryption/l10n/es_MX.json
index 2f2451d9588..b36dc2523e8 100644
--- a/apps/encryption/l10n/es_MX.json
+++ b/apps/encryption/l10n/es_MX.json
@@ -44,7 +44,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_NI.js b/apps/encryption/l10n/es_NI.js
index fba2ab0808c..fa5891cea44 100644
--- a/apps/encryption/l10n/es_NI.js
+++ b/apps/encryption/l10n/es_NI.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_NI.json b/apps/encryption/l10n/es_NI.json
index 178c37d1300..d948e14e11e 100644
--- a/apps/encryption/l10n/es_NI.json
+++ b/apps/encryption/l10n/es_NI.json
@@ -42,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PA.js b/apps/encryption/l10n/es_PA.js
index fba2ab0808c..fa5891cea44 100644
--- a/apps/encryption/l10n/es_PA.js
+++ b/apps/encryption/l10n/es_PA.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PA.json b/apps/encryption/l10n/es_PA.json
index 178c37d1300..d948e14e11e 100644
--- a/apps/encryption/l10n/es_PA.json
+++ b/apps/encryption/l10n/es_PA.json
@@ -42,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PE.js b/apps/encryption/l10n/es_PE.js
index fba2ab0808c..fa5891cea44 100644
--- a/apps/encryption/l10n/es_PE.js
+++ b/apps/encryption/l10n/es_PE.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PE.json b/apps/encryption/l10n/es_PE.json
index 178c37d1300..d948e14e11e 100644
--- a/apps/encryption/l10n/es_PE.json
+++ b/apps/encryption/l10n/es_PE.json
@@ -42,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PR.js b/apps/encryption/l10n/es_PR.js
index fba2ab0808c..fa5891cea44 100644
--- a/apps/encryption/l10n/es_PR.js
+++ b/apps/encryption/l10n/es_PR.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PR.json b/apps/encryption/l10n/es_PR.json
index 178c37d1300..d948e14e11e 100644
--- a/apps/encryption/l10n/es_PR.json
+++ b/apps/encryption/l10n/es_PR.json
@@ -42,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PY.js b/apps/encryption/l10n/es_PY.js
index fba2ab0808c..fa5891cea44 100644
--- a/apps/encryption/l10n/es_PY.js
+++ b/apps/encryption/l10n/es_PY.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PY.json b/apps/encryption/l10n/es_PY.json
index 178c37d1300..d948e14e11e 100644
--- a/apps/encryption/l10n/es_PY.json
+++ b/apps/encryption/l10n/es_PY.json
@@ -42,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_SV.js b/apps/encryption/l10n/es_SV.js
index fba2ab0808c..fa5891cea44 100644
--- a/apps/encryption/l10n/es_SV.js
+++ b/apps/encryption/l10n/es_SV.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_SV.json b/apps/encryption/l10n/es_SV.json
index 178c37d1300..d948e14e11e 100644
--- a/apps/encryption/l10n/es_SV.json
+++ b/apps/encryption/l10n/es_SV.json
@@ -42,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_UY.js b/apps/encryption/l10n/es_UY.js
index fba2ab0808c..fa5891cea44 100644
--- a/apps/encryption/l10n/es_UY.js
+++ b/apps/encryption/l10n/es_UY.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_UY.json b/apps/encryption/l10n/es_UY.json
index 178c37d1300..d948e14e11e 100644
--- a/apps/encryption/l10n/es_UY.json
+++ b/apps/encryption/l10n/es_UY.json
@@ -42,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/et_EE.js b/apps/encryption/l10n/et_EE.js
index 16f6501b8bd..70de2cc0c46 100644
--- a/apps/encryption/l10n/et_EE.js
+++ b/apps/encryption/l10n/et_EE.js
@@ -1,45 +1,56 @@
OC.L10N.register(
"encryption",
{
- "Missing recovery key password" : "Muuda taastevõtme parool",
- "Please repeat the recovery key password" : "Palun korda uut taastevõtme parooli",
- "Repeated recovery key password does not match the provided recovery key password" : "Lahtritesse sisestatud taastevõtme paroolid ei kattu",
+ "Missing recovery key password" : "Muuda taastevõtme salasõna",
+ "Please repeat the recovery key password" : "Palun korda uut taastevõtme salasõna",
+ "Repeated recovery key password does not match the provided recovery key password" : "Sisestatud taastevõtme salasõna ei kattu",
"Recovery key successfully enabled" : "Taastevõtme lubamine õnnestus",
- "Could not enable recovery key. Please check your recovery key password!" : "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!",
+ "Could not enable recovery key. Please check your recovery key password!" : "Ei suutnud taastevõtit kasutusele võtta. Palun kontrolli oma taastevõtme salasõna!",
"Recovery key successfully disabled" : "Taastevõtme keelamine õnnestus",
- "Could not disable recovery key. Please check your recovery key password!" : "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
- "Missing parameters" : "Paramttrid puuduvad",
- "Please provide the old recovery password" : "Palun sisesta vana taastevõtme parool",
- "Please provide a new recovery password" : "Palun sisesta uus taastevõtme parool",
- "Please repeat the new recovery password" : "Palun korda uut taastevõtme parooli",
- "Password successfully changed." : "Parool edukalt vahetatud.",
- "Could not change the password. Maybe the old password was not correct." : "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
+ "Could not disable recovery key. Please check your recovery key password!" : "Ei suutnud taastevõtme kasutamist lõpetada. Palun kontrolli oma taastevõtme salasõna!",
+ "Missing parameters" : "Parameetrid puuduvad",
+ "Please provide the old recovery password" : "Palun sisesta vana taastevõtme salasõna",
+ "Please provide a new recovery password" : "Palun sisesta uus taastevõtme salasõna",
+ "Please repeat the new recovery password" : "Palun korda uut taastevõtme salasõna",
+ "Password successfully changed." : "Salasõna vahetamine õnnestus.",
+ "Could not change the password. Maybe the old password was not correct." : "Ei suutnud muuta salasõna. Võib-olla on vana salasõna valesti sisestatud.",
"Recovery Key disabled" : "Taastevõti on välja lülitatud",
"Recovery Key enabled" : "Taastevõti on sisse lülitatud",
- "Could not update the private key password." : "Ei suutnud uuendada privaatse võtme parooli.",
- "The old password was not correct, please try again." : "Vana parool polnud õige, palun proovi uuesti.",
- "The current log-in password was not correct, please try again." : "Praeguse sisselogimise parool polnud õige, palun proovi uuesti.",
- "Private key password successfully updated." : "Privaatse võtme parool edukalt uuendatud.",
+ "Could not update the private key password." : "Ei suutnud uuendada privaatvõtme salasõna.",
+ "The old password was not correct, please try again." : "Vana salasõna polnud õige, palun proovi uuesti.",
+ "The current log-in password was not correct, please try again." : "Sisselogimise senine salasõna polnud õige, palun proovi uuesti.",
+ "Private key password successfully updated." : "Privaatvõtme salasõna uuendamine õnnestus.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Krüptimisrakenduse vigane privaatvõti. Taastamaks ligipääsu krüptitud failidele palun uuenda oma isiklikest seadistustest privaatvõtme salasõna.",
"Bad Signature" : "Vigane allkiri",
"Missing Signature" : "Allkiri puudub",
+ "one-time password for server-side-encryption" : "ühekordne salasõna serveripoolse krüptimise jaoks",
+ "Encryption password" : "Krüptimise salasõna",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Serveri peakasutaja lülitas sisse serveripoolse krüptimise. Sinu failid on krüptitud salasõnaga <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Serveri peakasutaja lülitas sisse serveripoolse krüptimise. Sinu failid on krüptitud salasõnaga „%s“.",
+ "Default encryption module" : "Vaikimisi krüptimismoodul",
+ "Default encryption module for server-side encryption" : "Vaikimisi krüptimismoodul serveripoolse krüptimise jaoks",
+ "Encrypt the home storage" : "Krüpti ka sisemine andmeruum",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Selle valiku kasutamisel krüptitakse failid sisemises ja välises andmeruumis. Vastasel juhul vaid välises andmeruumis.",
"Enable recovery key" : "Luba taastevõtme kasutamine",
"Disable recovery key" : "Keela taastevõtme kasutamine",
- "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.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Kui sa ei mäleta oma vana parooli, siis palu oma süsteemihalduril taastada ligipääs failidele.",
- "Old log-in password" : "Vana sisselogimise parool",
- "Current log-in password" : "Praegune sisselogimise parool",
- "Update Private Key Password" : "Uuenda privaatse võtme parooli",
- "Enable password recovery:" : "Luba parooli taaste:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Taastevõti on täiendav krüptovõti, mida kasutatakse failide krüptimisel. Kui peaksid põhilise salasõna unustama, siis saad seda failide taastamisel kasutada. Salvesta ta turvaliselt digitaalsesse salasõnalaekasse või vana kooli seifi.",
+ "Recovery key password" : "Taastevõtme salasõna",
+ "Repeat recovery key password" : "Korda taastevõtme salasõna",
+ "Change recovery key password:" : "Muuda taastevõtme salasõna:",
+ "Old recovery key password" : "Vana taastevõtme salasõna",
+ "New recovery key password" : "Uus taastevõtme salasõna",
+ "Repeat new recovery key password" : "Korda uut taastevõtme salasõna",
+ "Change Password" : "Muuda salasõna",
+ "Basic encryption module" : "Lihtkrüptimise moodul",
+ "Your private key password no longer matches your log-in password." : "Sinu privaatvõtme salasõna ei kattu enam sinu sisselogimise salasõna.",
+ "Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme salasõnaks oma praegune sisselogimise salasõna.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Kui sa ei mäleta oma vana salasõna, siis palu oma süsteemihalduril taastada ligipääs failidele.",
+ "Old log-in password" : "Sisselogimise vana salasõna",
+ "Current log-in password" : "Sisselogimise praegune salasõna",
+ "Update Private Key Password" : "Uuenda privaatvõtme salasõna",
+ "Enable password recovery:" : "Luba salasõna taastamine:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab salasõna kaotamise korral taastada ligipääsu krüptitud failidele",
"Enabled" : "Sisse lülitatud",
- "Disabled" : "Väljalülitatud"
+ "Disabled" : "Välja lülitatud"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/et_EE.json b/apps/encryption/l10n/et_EE.json
index 343ae6a9693..bd7a9d32858 100644
--- a/apps/encryption/l10n/et_EE.json
+++ b/apps/encryption/l10n/et_EE.json
@@ -1,43 +1,54 @@
{ "translations": {
- "Missing recovery key password" : "Muuda taastevõtme parool",
- "Please repeat the recovery key password" : "Palun korda uut taastevõtme parooli",
- "Repeated recovery key password does not match the provided recovery key password" : "Lahtritesse sisestatud taastevõtme paroolid ei kattu",
+ "Missing recovery key password" : "Muuda taastevõtme salasõna",
+ "Please repeat the recovery key password" : "Palun korda uut taastevõtme salasõna",
+ "Repeated recovery key password does not match the provided recovery key password" : "Sisestatud taastevõtme salasõna ei kattu",
"Recovery key successfully enabled" : "Taastevõtme lubamine õnnestus",
- "Could not enable recovery key. Please check your recovery key password!" : "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!",
+ "Could not enable recovery key. Please check your recovery key password!" : "Ei suutnud taastevõtit kasutusele võtta. Palun kontrolli oma taastevõtme salasõna!",
"Recovery key successfully disabled" : "Taastevõtme keelamine õnnestus",
- "Could not disable recovery key. Please check your recovery key password!" : "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
- "Missing parameters" : "Paramttrid puuduvad",
- "Please provide the old recovery password" : "Palun sisesta vana taastevõtme parool",
- "Please provide a new recovery password" : "Palun sisesta uus taastevõtme parool",
- "Please repeat the new recovery password" : "Palun korda uut taastevõtme parooli",
- "Password successfully changed." : "Parool edukalt vahetatud.",
- "Could not change the password. Maybe the old password was not correct." : "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
+ "Could not disable recovery key. Please check your recovery key password!" : "Ei suutnud taastevõtme kasutamist lõpetada. Palun kontrolli oma taastevõtme salasõna!",
+ "Missing parameters" : "Parameetrid puuduvad",
+ "Please provide the old recovery password" : "Palun sisesta vana taastevõtme salasõna",
+ "Please provide a new recovery password" : "Palun sisesta uus taastevõtme salasõna",
+ "Please repeat the new recovery password" : "Palun korda uut taastevõtme salasõna",
+ "Password successfully changed." : "Salasõna vahetamine õnnestus.",
+ "Could not change the password. Maybe the old password was not correct." : "Ei suutnud muuta salasõna. Võib-olla on vana salasõna valesti sisestatud.",
"Recovery Key disabled" : "Taastevõti on välja lülitatud",
"Recovery Key enabled" : "Taastevõti on sisse lülitatud",
- "Could not update the private key password." : "Ei suutnud uuendada privaatse võtme parooli.",
- "The old password was not correct, please try again." : "Vana parool polnud õige, palun proovi uuesti.",
- "The current log-in password was not correct, please try again." : "Praeguse sisselogimise parool polnud õige, palun proovi uuesti.",
- "Private key password successfully updated." : "Privaatse võtme parool edukalt uuendatud.",
+ "Could not update the private key password." : "Ei suutnud uuendada privaatvõtme salasõna.",
+ "The old password was not correct, please try again." : "Vana salasõna polnud õige, palun proovi uuesti.",
+ "The current log-in password was not correct, please try again." : "Sisselogimise senine salasõna polnud õige, palun proovi uuesti.",
+ "Private key password successfully updated." : "Privaatvõtme salasõna uuendamine õnnestus.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Krüptimisrakenduse vigane privaatvõti. Taastamaks ligipääsu krüptitud failidele palun uuenda oma isiklikest seadistustest privaatvõtme salasõna.",
"Bad Signature" : "Vigane allkiri",
"Missing Signature" : "Allkiri puudub",
+ "one-time password for server-side-encryption" : "ühekordne salasõna serveripoolse krüptimise jaoks",
+ "Encryption password" : "Krüptimise salasõna",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Serveri peakasutaja lülitas sisse serveripoolse krüptimise. Sinu failid on krüptitud salasõnaga <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Serveri peakasutaja lülitas sisse serveripoolse krüptimise. Sinu failid on krüptitud salasõnaga „%s“.",
+ "Default encryption module" : "Vaikimisi krüptimismoodul",
+ "Default encryption module for server-side encryption" : "Vaikimisi krüptimismoodul serveripoolse krüptimise jaoks",
+ "Encrypt the home storage" : "Krüpti ka sisemine andmeruum",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Selle valiku kasutamisel krüptitakse failid sisemises ja välises andmeruumis. Vastasel juhul vaid välises andmeruumis.",
"Enable recovery key" : "Luba taastevõtme kasutamine",
"Disable recovery key" : "Keela taastevõtme kasutamine",
- "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.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Kui sa ei mäleta oma vana parooli, siis palu oma süsteemihalduril taastada ligipääs failidele.",
- "Old log-in password" : "Vana sisselogimise parool",
- "Current log-in password" : "Praegune sisselogimise parool",
- "Update Private Key Password" : "Uuenda privaatse võtme parooli",
- "Enable password recovery:" : "Luba parooli taaste:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Taastevõti on täiendav krüptovõti, mida kasutatakse failide krüptimisel. Kui peaksid põhilise salasõna unustama, siis saad seda failide taastamisel kasutada. Salvesta ta turvaliselt digitaalsesse salasõnalaekasse või vana kooli seifi.",
+ "Recovery key password" : "Taastevõtme salasõna",
+ "Repeat recovery key password" : "Korda taastevõtme salasõna",
+ "Change recovery key password:" : "Muuda taastevõtme salasõna:",
+ "Old recovery key password" : "Vana taastevõtme salasõna",
+ "New recovery key password" : "Uus taastevõtme salasõna",
+ "Repeat new recovery key password" : "Korda uut taastevõtme salasõna",
+ "Change Password" : "Muuda salasõna",
+ "Basic encryption module" : "Lihtkrüptimise moodul",
+ "Your private key password no longer matches your log-in password." : "Sinu privaatvõtme salasõna ei kattu enam sinu sisselogimise salasõna.",
+ "Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme salasõnaks oma praegune sisselogimise salasõna.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Kui sa ei mäleta oma vana salasõna, siis palu oma süsteemihalduril taastada ligipääs failidele.",
+ "Old log-in password" : "Sisselogimise vana salasõna",
+ "Current log-in password" : "Sisselogimise praegune salasõna",
+ "Update Private Key Password" : "Uuenda privaatvõtme salasõna",
+ "Enable password recovery:" : "Luba salasõna taastamine:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab salasõna kaotamise korral taastada ligipääsu krüptitud failidele",
"Enabled" : "Sisse lülitatud",
- "Disabled" : "Väljalülitatud"
+ "Disabled" : "Välja lülitatud"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/eu.js b/apps/encryption/l10n/eu.js
index d2346c4279c..366077168f1 100644
--- a/apps/encryption/l10n/eu.js
+++ b/apps/encryption/l10n/eu.js
@@ -53,7 +53,6 @@ OC.L10N.register(
"Basic encryption module" : "Oinarrizko zifratze-modulua",
"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:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko.",
"Old log-in password" : "Sartzeko pasahitz zaharra",
"Current log-in password" : "Sartzeko oraingo pasahitza",
"Update Private Key Password" : "Eguneratu gako pasahitza pribatua",
diff --git a/apps/encryption/l10n/eu.json b/apps/encryption/l10n/eu.json
index 492c11f0ea9..7cb7dca9b59 100644
--- a/apps/encryption/l10n/eu.json
+++ b/apps/encryption/l10n/eu.json
@@ -51,7 +51,6 @@
"Basic encryption module" : "Oinarrizko zifratze-modulua",
"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:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko.",
"Old log-in password" : "Sartzeko pasahitz zaharra",
"Current log-in password" : "Sartzeko oraingo pasahitza",
"Update Private Key Password" : "Eguneratu gako pasahitza pribatua",
diff --git a/apps/encryption/l10n/fa.js b/apps/encryption/l10n/fa.js
index 8815b5206d8..4bb30c0b93f 100644
--- a/apps/encryption/l10n/fa.js
+++ b/apps/encryption/l10n/fa.js
@@ -52,7 +52,6 @@ OC.L10N.register(
"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." : "اگر رمزعبور قدیمی را فراموش کرده اید میتوانید از مدیر خود برای بازیابی فایل هایتان درخواست نمایید.",
"Old log-in password" : "رمزعبور قدیمی",
"Current log-in password" : "رمزعبور فعلی",
"Update Private Key Password" : "به روز رسانی رمزعبور کلید خصوصی",
diff --git a/apps/encryption/l10n/fa.json b/apps/encryption/l10n/fa.json
index 43f43083de1..8e22154c859 100644
--- a/apps/encryption/l10n/fa.json
+++ b/apps/encryption/l10n/fa.json
@@ -50,7 +50,6 @@
"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." : "اگر رمزعبور قدیمی را فراموش کرده اید میتوانید از مدیر خود برای بازیابی فایل هایتان درخواست نمایید.",
"Old log-in password" : "رمزعبور قدیمی",
"Current log-in password" : "رمزعبور فعلی",
"Update Private Key Password" : "به روز رسانی رمزعبور کلید خصوصی",
diff --git a/apps/encryption/l10n/fi.js b/apps/encryption/l10n/fi.js
index 97933fb988d..65eca4819a0 100644
--- a/apps/encryption/l10n/fi.js
+++ b/apps/encryption/l10n/fi.js
@@ -46,7 +46,6 @@ OC.L10N.register(
"Basic encryption module" : "Perus salausmoduuli",
"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.",
"Old log-in password" : "Vanha kirjautumissalasana",
"Current log-in password" : "Nykyinen kirjautumissalasana",
"Update Private Key Password" : "Päivitä yksityisen avaimen salasana",
diff --git a/apps/encryption/l10n/fi.json b/apps/encryption/l10n/fi.json
index 49ec0b924ae..cad9ed01b1b 100644
--- a/apps/encryption/l10n/fi.json
+++ b/apps/encryption/l10n/fi.json
@@ -44,7 +44,6 @@
"Basic encryption module" : "Perus salausmoduuli",
"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.",
"Old log-in password" : "Vanha kirjautumissalasana",
"Current log-in password" : "Nykyinen kirjautumissalasana",
"Update Private Key Password" : "Päivitä yksityisen avaimen salasana",
diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js
index d170c78ab56..f24147117cf 100644
--- a/apps/encryption/l10n/fr.js
+++ b/apps/encryption/l10n/fr.js
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Module de chiffrement basique",
"Your private key password no longer matches your log-in password." : "Le mot de passe de votre clé privée ne correspond plus à votre mot de passe de connexion.",
"Set your old private key password to your current log-in password:" : "Remplacez l'ancien mot de passe de votre clé privée par votre mot de passe de connexion actuel :",
- " 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.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez pas de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
"Old log-in password" : "Ancien mot de passe de connexion",
"Current log-in password" : "Actuel mot de passe de connexion",
"Update Private Key Password" : "Mettre à jour le mot de passe de votre clé privée",
diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json
index a0f242083bb..99936241dd5 100644
--- a/apps/encryption/l10n/fr.json
+++ b/apps/encryption/l10n/fr.json
@@ -51,7 +51,7 @@
"Basic encryption module" : "Module de chiffrement basique",
"Your private key password no longer matches your log-in password." : "Le mot de passe de votre clé privée ne correspond plus à votre mot de passe de connexion.",
"Set your old private key password to your current log-in password:" : "Remplacez l'ancien mot de passe de votre clé privée par votre mot de passe de connexion actuel :",
- " 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.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez pas de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
"Old log-in password" : "Ancien mot de passe de connexion",
"Current log-in password" : "Actuel mot de passe de connexion",
"Update Private Key Password" : "Mettre à jour le mot de passe de votre clé privée",
diff --git a/apps/encryption/l10n/ga.js b/apps/encryption/l10n/ga.js
index 3d2abe28130..557f6319ccd 100644
--- a/apps/encryption/l10n/ga.js
+++ b/apps/encryption/l10n/ga.js
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Bun-mhodúl criptithe",
"Your private key password no longer matches your log-in password." : "Ní mheaitseálann do phasfhocal eochrach príobháidí do phasfhocal logáil-isteach a thuilleadh.",
"Set your old private key password to your current log-in password:" : "Socraigh do shean phasfhocal eochair phríobháideach le do phasfhocal logáil-isteach reatha:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Mura cuimhin leat do shean phasfhocal is féidir leat iarraidh ar do riarthóir do chuid comhad a athshlánú.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Mura cuimhin leat do sheanphasfhocal is féidir leat iarraidh ar do riarthóir do chuid comhad a athshlánú.",
"Old log-in password" : "Sean phasfhocal logáil isteach",
"Current log-in password" : "Pasfhocal logáil isteach reatha",
"Update Private Key Password" : "Nuashonraigh Pasfhocal Eochair Phríobháideach",
diff --git a/apps/encryption/l10n/ga.json b/apps/encryption/l10n/ga.json
index 0ff0fa4cfca..c2313b11540 100644
--- a/apps/encryption/l10n/ga.json
+++ b/apps/encryption/l10n/ga.json
@@ -51,7 +51,7 @@
"Basic encryption module" : "Bun-mhodúl criptithe",
"Your private key password no longer matches your log-in password." : "Ní mheaitseálann do phasfhocal eochrach príobháidí do phasfhocal logáil-isteach a thuilleadh.",
"Set your old private key password to your current log-in password:" : "Socraigh do shean phasfhocal eochair phríobháideach le do phasfhocal logáil-isteach reatha:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Mura cuimhin leat do shean phasfhocal is féidir leat iarraidh ar do riarthóir do chuid comhad a athshlánú.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Mura cuimhin leat do sheanphasfhocal is féidir leat iarraidh ar do riarthóir do chuid comhad a athshlánú.",
"Old log-in password" : "Sean phasfhocal logáil isteach",
"Current log-in password" : "Pasfhocal logáil isteach reatha",
"Update Private Key Password" : "Nuashonraigh Pasfhocal Eochair Phríobháideach",
diff --git a/apps/encryption/l10n/gl.js b/apps/encryption/l10n/gl.js
index c654889650b..52b453360c0 100644
--- a/apps/encryption/l10n/gl.js
+++ b/apps/encryption/l10n/gl.js
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de cifrado básico",
"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 privada 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 pedirllo á administración desta instancia. para recuperar os seus ficheiros.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu contrasinal antigo pode pedirllo á administración desta instancia. para recuperar os seus ficheiros.",
"Old log-in password" : "Contrasinal antigo de acceso",
"Current log-in password" : "Contrasinal actual de acceso",
"Update Private Key Password" : "Actualizar o contrasinal da chave privada",
diff --git a/apps/encryption/l10n/gl.json b/apps/encryption/l10n/gl.json
index 7758fe7a546..916b92af67a 100644
--- a/apps/encryption/l10n/gl.json
+++ b/apps/encryption/l10n/gl.json
@@ -51,7 +51,7 @@
"Basic encryption module" : "Módulo de cifrado básico",
"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 privada 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 pedirllo á administración desta instancia. para recuperar os seus ficheiros.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu contrasinal antigo pode pedirllo á administración desta instancia. para recuperar os seus ficheiros.",
"Old log-in password" : "Contrasinal antigo de acceso",
"Current log-in password" : "Contrasinal actual de acceso",
"Update Private Key Password" : "Actualizar o contrasinal da chave privada",
diff --git a/apps/encryption/l10n/he.js b/apps/encryption/l10n/he.js
index afd1bee8f01..90acc921c73 100644
--- a/apps/encryption/l10n/he.js
+++ b/apps/encryption/l10n/he.js
@@ -45,7 +45,6 @@ OC.L10N.register(
"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." : "אם הסיסמא הישנה נשכחה ניתן לפנות למנהל על מנת שישחזר את הקבצים שלך.",
"Old log-in password" : "סיסמת התחברות ישנה",
"Current log-in password" : "סיסמת התחברות נוכחית",
"Update Private Key Password" : "עדכון סיסמת המפתח האישי",
diff --git a/apps/encryption/l10n/he.json b/apps/encryption/l10n/he.json
index 73c4d4d3b78..551cd192cdf 100644
--- a/apps/encryption/l10n/he.json
+++ b/apps/encryption/l10n/he.json
@@ -43,7 +43,6 @@
"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." : "אם הסיסמא הישנה נשכחה ניתן לפנות למנהל על מנת שישחזר את הקבצים שלך.",
"Old log-in password" : "סיסמת התחברות ישנה",
"Current log-in password" : "סיסמת התחברות נוכחית",
"Update Private Key Password" : "עדכון סיסמת המפתח האישי",
diff --git a/apps/encryption/l10n/hr.js b/apps/encryption/l10n/hr.js
index 87445279b96..8a209bfb650 100644
--- a/apps/encryption/l10n/hr.js
+++ b/apps/encryption/l10n/hr.js
@@ -47,7 +47,6 @@ OC.L10N.register(
"Basic encryption module" : "Osnovni modul za šifriranje",
"Your private key password no longer matches your log-in password." : "Zaporka vašeg privatnog ključa više se ne podudara s vašom zaporkom za prijavu.",
"Set your old private key password to your current log-in password:" : "Promijenite svoju staru zaporku privatnog ključa u postojeću zaporku za prijavu:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ako se ne sjećate svoje stare zaporke, zatražite od administratora da oporavi vaše datoteke.",
"Old log-in password" : "Stara zaporka za prijavu",
"Current log-in password" : "Aktualna zaporka za prijavu",
"Update Private Key Password" : "Ažuriraj zaporku privatnog ključa",
diff --git a/apps/encryption/l10n/hr.json b/apps/encryption/l10n/hr.json
index fa711e3f0dd..ee122cb881b 100644
--- a/apps/encryption/l10n/hr.json
+++ b/apps/encryption/l10n/hr.json
@@ -45,7 +45,6 @@
"Basic encryption module" : "Osnovni modul za šifriranje",
"Your private key password no longer matches your log-in password." : "Zaporka vašeg privatnog ključa više se ne podudara s vašom zaporkom za prijavu.",
"Set your old private key password to your current log-in password:" : "Promijenite svoju staru zaporku privatnog ključa u postojeću zaporku za prijavu:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ako se ne sjećate svoje stare zaporke, zatražite od administratora da oporavi vaše datoteke.",
"Old log-in password" : "Stara zaporka za prijavu",
"Current log-in password" : "Aktualna zaporka za prijavu",
"Update Private Key Password" : "Ažuriraj zaporku privatnog ključa",
diff --git a/apps/encryption/l10n/hu.js b/apps/encryption/l10n/hu.js
index 63610c2c413..cb8f07952a4 100644
--- a/apps/encryption/l10n/hu.js
+++ b/apps/encryption/l10n/hu.js
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Alapvető titkosítási modul",
"Your private key password no longer matches your log-in password." : "A titkos kulcsa jelszava már nem egyezik meg a bejelentkezési jelszavával. ",
"Set your old private key password to your current log-in password:" : "A régi privát kulcsának jelszavának beállítása a jelenlegi bejelentkezési jelszavára:",
- " 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 helyre a fájljait.",
+ "If you do not 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 helyre a fájljait.",
"Old log-in password" : "Régi bejelentkezési jelszó",
"Current log-in password" : "Jelenlegi bejelentkezési jelszó",
"Update Private Key Password" : "Titkos kulcs jelszavának frissítése",
diff --git a/apps/encryption/l10n/hu.json b/apps/encryption/l10n/hu.json
index 0a5ca5a35ac..cd394f8fad1 100644
--- a/apps/encryption/l10n/hu.json
+++ b/apps/encryption/l10n/hu.json
@@ -51,7 +51,7 @@
"Basic encryption module" : "Alapvető titkosítási modul",
"Your private key password no longer matches your log-in password." : "A titkos kulcsa jelszava már nem egyezik meg a bejelentkezési jelszavával. ",
"Set your old private key password to your current log-in password:" : "A régi privát kulcsának jelszavának beállítása a jelenlegi bejelentkezési jelszavára:",
- " 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 helyre a fájljait.",
+ "If you do not 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 helyre a fájljait.",
"Old log-in password" : "Régi bejelentkezési jelszó",
"Current log-in password" : "Jelenlegi bejelentkezési jelszó",
"Update Private Key Password" : "Titkos kulcs jelszavának frissítése",
diff --git a/apps/encryption/l10n/ia.js b/apps/encryption/l10n/ia.js
deleted file mode 100644
index 27932deb15e..00000000000
--- a/apps/encryption/l10n/ia.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "The share will expire on %s." : "Le compartir expirara le %s.",
- "Cheers!" : "Acclamationes!"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/ia.json b/apps/encryption/l10n/ia.json
deleted file mode 100644
index a935ab07c57..00000000000
--- a/apps/encryption/l10n/ia.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
- "The share will expire on %s." : "Le compartir expirara le %s.",
- "Cheers!" : "Acclamationes!"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/id.js b/apps/encryption/l10n/id.js
index 403b7fb1784..fbd5fb3818d 100644
--- a/apps/encryption/l10n/id.js
+++ b/apps/encryption/l10n/id.js
@@ -48,7 +48,6 @@ OC.L10N.register(
"Basic encryption module" : "Modul enkripsi dasar",
"Your private key password no longer matches your log-in password." : "Kata sandi kunci private Anda tidak lagi cocok dengan kata sandi masuk Anda.",
"Set your old private key password to your current log-in password:" : "Setel kata sandi kunci private Anda untuk kata sandi masuk Anda saat ini:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat kata sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
"Old log-in password" : "Kata sandi masuk yang lama",
"Current log-in password" : "Kata sandi masuk saat ini",
"Update Private Key Password" : "Perbarui Kata Sandi Kunci Private",
diff --git a/apps/encryption/l10n/id.json b/apps/encryption/l10n/id.json
index 57e8ff16e66..5135c20a39c 100644
--- a/apps/encryption/l10n/id.json
+++ b/apps/encryption/l10n/id.json
@@ -46,7 +46,6 @@
"Basic encryption module" : "Modul enkripsi dasar",
"Your private key password no longer matches your log-in password." : "Kata sandi kunci private Anda tidak lagi cocok dengan kata sandi masuk Anda.",
"Set your old private key password to your current log-in password:" : "Setel kata sandi kunci private Anda untuk kata sandi masuk Anda saat ini:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat kata sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
"Old log-in password" : "Kata sandi masuk yang lama",
"Current log-in password" : "Kata sandi masuk saat ini",
"Update Private Key Password" : "Perbarui Kata Sandi Kunci Private",
diff --git a/apps/encryption/l10n/is.js b/apps/encryption/l10n/is.js
index 859b9667791..202d478d6e8 100644
--- a/apps/encryption/l10n/is.js
+++ b/apps/encryption/l10n/is.js
@@ -45,7 +45,6 @@ OC.L10N.register(
"Basic encryption module" : "Grunn-dulritunareining",
"Your private key password no longer matches your log-in password." : "Lykilorð einkalykilsins þíns samsvarar ekki lengur innskráningarlykilorðinu þínu.",
"Set your old private key password to your current log-in password:" : "Settu eldra lykilorð einkalykilsins þíns á að vera það sama og núgildandi innskráningarlykilorðið þitt:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " Ef þú manst ekki gamla lykilorðið þitt geturðu beðið kerfisstjórann þinn um að endurheimta skrárnar þínar.",
"Old log-in password" : "Gamla innskráningarlykilorðið",
"Current log-in password" : "Núgildandi innskráningarlykilorð",
"Update Private Key Password" : "Uppfæra lykilorð einkalykils:",
diff --git a/apps/encryption/l10n/is.json b/apps/encryption/l10n/is.json
index ccf9af6cea8..05e0faff580 100644
--- a/apps/encryption/l10n/is.json
+++ b/apps/encryption/l10n/is.json
@@ -43,7 +43,6 @@
"Basic encryption module" : "Grunn-dulritunareining",
"Your private key password no longer matches your log-in password." : "Lykilorð einkalykilsins þíns samsvarar ekki lengur innskráningarlykilorðinu þínu.",
"Set your old private key password to your current log-in password:" : "Settu eldra lykilorð einkalykilsins þíns á að vera það sama og núgildandi innskráningarlykilorðið þitt:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " Ef þú manst ekki gamla lykilorðið þitt geturðu beðið kerfisstjórann þinn um að endurheimta skrárnar þínar.",
"Old log-in password" : "Gamla innskráningarlykilorðið",
"Current log-in password" : "Núgildandi innskráningarlykilorð",
"Update Private Key Password" : "Uppfæra lykilorð einkalykils:",
diff --git a/apps/encryption/l10n/it.js b/apps/encryption/l10n/it.js
index b5f8dc97263..fbf0c59569d 100644
--- a/apps/encryption/l10n/it.js
+++ b/apps/encryption/l10n/it.js
@@ -48,7 +48,6 @@ OC.L10N.register(
"Basic encryption module" : "Modulo di cifratura base",
"Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
"Set your old private key password to your current log-in password:" : "Imposta la vecchia password della chiave privata sull'attuale password di accesso:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
"Old log-in password" : "Vecchia password di accesso",
"Current log-in password" : "Password di accesso attuale",
"Update Private Key Password" : "Aggiorna la password della chiave privata",
diff --git a/apps/encryption/l10n/it.json b/apps/encryption/l10n/it.json
index dbe5f2e3627..c94c84cac0f 100644
--- a/apps/encryption/l10n/it.json
+++ b/apps/encryption/l10n/it.json
@@ -46,7 +46,6 @@
"Basic encryption module" : "Modulo di cifratura base",
"Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
"Set your old private key password to your current log-in password:" : "Imposta la vecchia password della chiave privata sull'attuale password di accesso:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
"Old log-in password" : "Vecchia password di accesso",
"Current log-in password" : "Password di accesso attuale",
"Update Private Key Password" : "Aggiorna la password della chiave privata",
diff --git a/apps/encryption/l10n/ja.js b/apps/encryption/l10n/ja.js
index f036fb436f8..c5ab178a44c 100644
--- a/apps/encryption/l10n/ja.js
+++ b/apps/encryption/l10n/ja.js
@@ -53,7 +53,7 @@ OC.L10N.register(
"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." : "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合は、管理者にファイルの復元を依頼することができます。",
"Old log-in password" : "古いログインパスワード",
"Current log-in password" : "現在のログインパスワード",
"Update Private Key Password" : "秘密鍵のパスワードを更新",
diff --git a/apps/encryption/l10n/ja.json b/apps/encryption/l10n/ja.json
index bded76a4ad5..9ec6e00da5a 100644
--- a/apps/encryption/l10n/ja.json
+++ b/apps/encryption/l10n/ja.json
@@ -51,7 +51,7 @@
"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." : "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合は、管理者にファイルの復元を依頼することができます。",
"Old log-in password" : "古いログインパスワード",
"Current log-in password" : "現在のログインパスワード",
"Update Private Key Password" : "秘密鍵のパスワードを更新",
diff --git a/apps/encryption/l10n/ka.js b/apps/encryption/l10n/ka.js
index 3134243095d..e3d3c92883b 100644
--- a/apps/encryption/l10n/ka.js
+++ b/apps/encryption/l10n/ka.js
@@ -52,7 +52,6 @@ OC.L10N.register(
"Basic encryption module" : "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.",
"Old log-in password" : "Old log-in password",
"Current log-in password" : "Current log-in password",
"Update Private Key Password" : "Update Private Key Password",
diff --git a/apps/encryption/l10n/ka.json b/apps/encryption/l10n/ka.json
index 41c02f8690d..24ce10a4037 100644
--- a/apps/encryption/l10n/ka.json
+++ b/apps/encryption/l10n/ka.json
@@ -50,7 +50,6 @@
"Basic encryption module" : "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.",
"Old log-in password" : "Old log-in password",
"Current log-in password" : "Current log-in password",
"Update Private Key Password" : "Update Private Key Password",
diff --git a/apps/encryption/l10n/ka_GE.js b/apps/encryption/l10n/ka_GE.js
index 64322dfdb1c..19c98a14d27 100644
--- a/apps/encryption/l10n/ka_GE.js
+++ b/apps/encryption/l10n/ka_GE.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"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." : "თუ არ გახსოვთ თქვენი ძველი პაროლი, შეგიძლიათ მისი აღდგენა სთხოვოთ ადმინისტრატორს.",
"Old log-in password" : "ძველი ლოგინის პაროლი",
"Current log-in password" : "ამჟამინდელი ლოგინის პაროლი",
"Update Private Key Password" : "განაახლეთ პირადი გასაღების პაროლი",
diff --git a/apps/encryption/l10n/ka_GE.json b/apps/encryption/l10n/ka_GE.json
index c78a039dd27..4cb120325ce 100644
--- a/apps/encryption/l10n/ka_GE.json
+++ b/apps/encryption/l10n/ka_GE.json
@@ -42,7 +42,6 @@
"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." : "თუ არ გახსოვთ თქვენი ძველი პაროლი, შეგიძლიათ მისი აღდგენა სთხოვოთ ადმინისტრატორს.",
"Old log-in password" : "ძველი ლოგინის პაროლი",
"Current log-in password" : "ამჟამინდელი ლოგინის პაროლი",
"Update Private Key Password" : "განაახლეთ პირადი გასაღების პაროლი",
diff --git a/apps/encryption/l10n/km.js b/apps/encryption/l10n/km.js
deleted file mode 100644
index 2d925c91819..00000000000
--- a/apps/encryption/l10n/km.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Password successfully changed." : "បាន​ប្ដូរ​ពាក្យ​សម្ងាត់​ដោយ​ជោគជ័យ។",
- "Could not change the password. Maybe the old password was not correct." : "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​បាន​ទេ។ ប្រហែល​ពាក្យ​សម្ងាត់​ចាស់​មិន​ត្រឹម​ត្រូវ។",
- "Change Password" : "ប្ដូរ​ពាក្យ​សម្ងាត់",
- "Enabled" : "បាន​បើក",
- "Disabled" : "បាន​បិទ"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/km.json b/apps/encryption/l10n/km.json
deleted file mode 100644
index 0beaa6b8a2f..00000000000
--- a/apps/encryption/l10n/km.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
- "Password successfully changed." : "បាន​ប្ដូរ​ពាក្យ​សម្ងាត់​ដោយ​ជោគជ័យ។",
- "Could not change the password. Maybe the old password was not correct." : "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​បាន​ទេ។ ប្រហែល​ពាក្យ​សម្ងាត់​ចាស់​មិន​ត្រឹម​ត្រូវ។",
- "Change Password" : "ប្ដូរ​ពាក្យ​សម្ងាត់",
- "Enabled" : "បាន​បើក",
- "Disabled" : "បាន​បិទ"
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/kn.js b/apps/encryption/l10n/kn.js
deleted file mode 100644
index 3f0108db173..00000000000
--- a/apps/encryption/l10n/kn.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Cheers!" : "ಆನಂದಿಸಿ !",
- "Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ",
- "Disabled" : "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/kn.json b/apps/encryption/l10n/kn.json
deleted file mode 100644
index 3b78ba1f13e..00000000000
--- a/apps/encryption/l10n/kn.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
- "Cheers!" : "ಆನಂದಿಸಿ !",
- "Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ",
- "Disabled" : "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/ko.js b/apps/encryption/l10n/ko.js
index 5fd774b43d7..11e9d88466f 100644
--- a/apps/encryption/l10n/ko.js
+++ b/apps/encryption/l10n/ko.js
@@ -53,7 +53,7 @@ OC.L10N.register(
"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." : " 이전 암호가 기억나지 않으면 시스템 관리자에게 파일 복구를 요청하십시오.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "기존 암호가 기억나지 않는다면 관리자에게 파일을 복구하도록 요청할 수 있습니다.",
"Old log-in password" : "이전 로그인 암호",
"Current log-in password" : "현재 로그인 암호",
"Update Private Key Password" : "개인 키 암호 업데이트",
diff --git a/apps/encryption/l10n/ko.json b/apps/encryption/l10n/ko.json
index d8e7047a12e..108dac6c6f6 100644
--- a/apps/encryption/l10n/ko.json
+++ b/apps/encryption/l10n/ko.json
@@ -51,7 +51,7 @@
"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." : " 이전 암호가 기억나지 않으면 시스템 관리자에게 파일 복구를 요청하십시오.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "기존 암호가 기억나지 않는다면 관리자에게 파일을 복구하도록 요청할 수 있습니다.",
"Old log-in password" : "이전 로그인 암호",
"Current log-in password" : "현재 로그인 암호",
"Update Private Key Password" : "개인 키 암호 업데이트",
diff --git a/apps/encryption/l10n/lb.js b/apps/encryption/l10n/lb.js
deleted file mode 100644
index 478426b6a1c..00000000000
--- a/apps/encryption/l10n/lb.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Cheers!" : "Prost!",
- "Change Password" : "Passwuert änneren",
- "Enabled" : "Aktivéiert",
- "Disabled" : "Deaktivéiert"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/lb.json b/apps/encryption/l10n/lb.json
deleted file mode 100644
index 53692b969e1..00000000000
--- a/apps/encryption/l10n/lb.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "Cheers!" : "Prost!",
- "Change Password" : "Passwuert änneren",
- "Enabled" : "Aktivéiert",
- "Disabled" : "Deaktivéiert"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/lt_LT.js b/apps/encryption/l10n/lt_LT.js
index bbe7d017912..cb32f15eb44 100644
--- a/apps/encryption/l10n/lt_LT.js
+++ b/apps/encryption/l10n/lt_LT.js
@@ -47,7 +47,6 @@ OC.L10N.register(
"Basic encryption module" : "Pagrindinis šifravimo modulis",
"Your private key password no longer matches your log-in password." : "Jūsų privačiojo rakto slaptažodis daugiau nebeatitinka jūsų prisijungimo slaptažodžio.",
"Set your old private key password to your current log-in password:" : "Nustatykite savo senąjį privačiojo rakto slaptažodį į savo dabartinį prisijungimo 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 sistemos administratoriaus atkurti jūsų duomenis.",
"Old log-in password" : "Senas prisijungimo slaptažodis",
"Current log-in password" : "Dabartinis prisijungimo slaptažodis",
"Update Private Key Password" : "Atnaujinti privačiojo rakto slaptažodį",
diff --git a/apps/encryption/l10n/lt_LT.json b/apps/encryption/l10n/lt_LT.json
index 62ee9cc3d90..776583e9428 100644
--- a/apps/encryption/l10n/lt_LT.json
+++ b/apps/encryption/l10n/lt_LT.json
@@ -45,7 +45,6 @@
"Basic encryption module" : "Pagrindinis šifravimo modulis",
"Your private key password no longer matches your log-in password." : "Jūsų privačiojo rakto slaptažodis daugiau nebeatitinka jūsų prisijungimo slaptažodžio.",
"Set your old private key password to your current log-in password:" : "Nustatykite savo senąjį privačiojo rakto slaptažodį į savo dabartinį prisijungimo 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 sistemos administratoriaus atkurti jūsų duomenis.",
"Old log-in password" : "Senas prisijungimo slaptažodis",
"Current log-in password" : "Dabartinis prisijungimo slaptažodis",
"Update Private Key Password" : "Atnaujinti privačiojo rakto slaptažodį",
diff --git a/apps/encryption/l10n/lv.js b/apps/encryption/l10n/lv.js
index 3955cfd63e0..b44cc20db29 100644
--- a/apps/encryption/l10n/lv.js
+++ b/apps/encryption/l10n/lv.js
@@ -2,16 +2,16 @@ OC.L10N.register(
"encryption",
{
"Missing recovery key password" : "Pazudusi atkopšanas atslēgas parole",
- "Please repeat the recovery key password" : "Lūdzu atkārtot atgūšanas atslēgas paroli",
+ "Please repeat the recovery key password" : "Lūgums atkārtot atkopes atslēgas paroli",
"Repeated recovery key password does not match the provided recovery key password" : "Atkārtota atkopšanas atslēgas parole nesakrīt ar izsniegto atkopšanas atslēgu paroli",
"Recovery key successfully enabled" : "Atkopšanas atslēga ir veiksmīgi iespējota",
- "Could not enable recovery key. Please check your recovery key password!" : "Atkopšanas atslēgu nevarēja iespējot. Lūdzu, pārbaudiet atkopšanas atslēgas paroli!",
+ "Could not enable recovery key. Please check your recovery key password!" : "Atkopes atslēgu nevarēja iespējot. Lūgums pārbaudīt atkopes atslēgas paroli.",
"Recovery key successfully disabled" : "Atkopšanas atslēga ir veiksmīgi deaktivizēta",
- "Could not disable recovery key. Please check your recovery key password!" : "Atkopšanas atslēgu nevarēja atspējot. Lūdzu, pārbaudiet atkopšanas atslēgas paroli!",
+ "Could not disable recovery key. Please check your recovery key password!" : "Atkopes atslēgu nevarēja atspējot. Lūgums pārbaudīt atkopes atslēgas paroli.",
"Missing parameters" : "Trūkstošos parametrs",
- "Please provide the old recovery password" : "Lūdzu, norādiet iepriekšējo atkopšanas paroli",
- "Please provide a new recovery password" : "Lūdzu, ievadiet jaunu paroli",
- "Please repeat the new recovery password" : "Lūdzu, atkārtojiet jauno atkopšanas paroli",
+ "Please provide the old recovery password" : "Lūgums norādīt iepriekšējo atkopes paroli",
+ "Please provide a new recovery password" : "Lūgums norādīt jaunu atkopes paroli",
+ "Please repeat the new recovery password" : "Lūgums atkārtot jauno atkopes paroli",
"Password successfully changed." : "Parole veiksmīgi nomainīta.",
"Could not change the password. Maybe the old password was not correct." : "Nevarēja mainīt paroli. Varbūt vecā parole nav pareiza.",
"Recovery Key disabled" : "Atkopšanas atslēga deaktivizēta",
diff --git a/apps/encryption/l10n/lv.json b/apps/encryption/l10n/lv.json
index 41a2ee46a54..42787888d86 100644
--- a/apps/encryption/l10n/lv.json
+++ b/apps/encryption/l10n/lv.json
@@ -1,15 +1,15 @@
{ "translations": {
"Missing recovery key password" : "Pazudusi atkopšanas atslēgas parole",
- "Please repeat the recovery key password" : "Lūdzu atkārtot atgūšanas atslēgas paroli",
+ "Please repeat the recovery key password" : "Lūgums atkārtot atkopes atslēgas paroli",
"Repeated recovery key password does not match the provided recovery key password" : "Atkārtota atkopšanas atslēgas parole nesakrīt ar izsniegto atkopšanas atslēgu paroli",
"Recovery key successfully enabled" : "Atkopšanas atslēga ir veiksmīgi iespējota",
- "Could not enable recovery key. Please check your recovery key password!" : "Atkopšanas atslēgu nevarēja iespējot. Lūdzu, pārbaudiet atkopšanas atslēgas paroli!",
+ "Could not enable recovery key. Please check your recovery key password!" : "Atkopes atslēgu nevarēja iespējot. Lūgums pārbaudīt atkopes atslēgas paroli.",
"Recovery key successfully disabled" : "Atkopšanas atslēga ir veiksmīgi deaktivizēta",
- "Could not disable recovery key. Please check your recovery key password!" : "Atkopšanas atslēgu nevarēja atspējot. Lūdzu, pārbaudiet atkopšanas atslēgas paroli!",
+ "Could not disable recovery key. Please check your recovery key password!" : "Atkopes atslēgu nevarēja atspējot. Lūgums pārbaudīt atkopes atslēgas paroli.",
"Missing parameters" : "Trūkstošos parametrs",
- "Please provide the old recovery password" : "Lūdzu, norādiet iepriekšējo atkopšanas paroli",
- "Please provide a new recovery password" : "Lūdzu, ievadiet jaunu paroli",
- "Please repeat the new recovery password" : "Lūdzu, atkārtojiet jauno atkopšanas paroli",
+ "Please provide the old recovery password" : "Lūgums norādīt iepriekšējo atkopes paroli",
+ "Please provide a new recovery password" : "Lūgums norādīt jaunu atkopes paroli",
+ "Please repeat the new recovery password" : "Lūgums atkārtot jauno atkopes paroli",
"Password successfully changed." : "Parole veiksmīgi nomainīta.",
"Could not change the password. Maybe the old password was not correct." : "Nevarēja mainīt paroli. Varbūt vecā parole nav pareiza.",
"Recovery Key disabled" : "Atkopšanas atslēga deaktivizēta",
diff --git a/apps/encryption/l10n/mk.js b/apps/encryption/l10n/mk.js
deleted file mode 100644
index 0de345e5c1e..00000000000
--- a/apps/encryption/l10n/mk.js
+++ /dev/null
@@ -1,17 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Missing recovery key password" : "Недостасува лозинката за клучевите за обновување",
- "Password successfully changed." : "Лозинката е успешно променета.",
- "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
- "Bad Signature" : "Лош потпис",
- "Missing Signature" : "Недостасува потписот",
- "Cheers!" : "Поздрав!",
- "Change Password" : "Смени лозинка",
- "Old log-in password" : "Старата лозинка за најавување",
- "Current log-in password" : "Тековната лозинка за најавување",
- "Enable password recovery:" : "Овозможи го обновувањето на лозинката:",
- "Enabled" : "Овозможен",
- "Disabled" : "Оневозможен"
-},
-"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/apps/encryption/l10n/mk.json b/apps/encryption/l10n/mk.json
deleted file mode 100644
index 537815b7aa3..00000000000
--- a/apps/encryption/l10n/mk.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{ "translations": {
- "Missing recovery key password" : "Недостасува лозинката за клучевите за обновување",
- "Password successfully changed." : "Лозинката е успешно променета.",
- "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
- "Bad Signature" : "Лош потпис",
- "Missing Signature" : "Недостасува потписот",
- "Cheers!" : "Поздрав!",
- "Change Password" : "Смени лозинка",
- "Old log-in password" : "Старата лозинка за најавување",
- "Current log-in password" : "Тековната лозинка за најавување",
- "Enable password recovery:" : "Овозможи го обновувањето на лозинката:",
- "Enabled" : "Овозможен",
- "Disabled" : "Оневозможен"
-},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/nb.js b/apps/encryption/l10n/nb.js
index 14b725c569e..65206e9e3a6 100644
--- a/apps/encryption/l10n/nb.js
+++ b/apps/encryption/l10n/nb.js
@@ -53,7 +53,6 @@ OC.L10N.register(
"Basic encryption module" : "Grunnleggende krypteringsmodul",
"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:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine.",
"Old log-in password" : "Gammelt påloggingspassord",
"Current log-in password" : "Nåværende påloggingspassord",
"Update Private Key Password" : "Oppdater passord for privat nøkkel",
diff --git a/apps/encryption/l10n/nb.json b/apps/encryption/l10n/nb.json
index 613718b5ac0..9f15088cc14 100644
--- a/apps/encryption/l10n/nb.json
+++ b/apps/encryption/l10n/nb.json
@@ -51,7 +51,6 @@
"Basic encryption module" : "Grunnleggende krypteringsmodul",
"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:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine.",
"Old log-in password" : "Gammelt påloggingspassord",
"Current log-in password" : "Nåværende påloggingspassord",
"Update Private Key Password" : "Oppdater passord for privat nøkkel",
diff --git a/apps/encryption/l10n/nl.js b/apps/encryption/l10n/nl.js
index a429948a4de..967ff31dc12 100644
--- a/apps/encryption/l10n/nl.js
+++ b/apps/encryption/l10n/nl.js
@@ -21,22 +21,28 @@ OC.L10N.register(
"The old password was not correct, please try again." : "Het oude wachtwoord was onjuist, probeer het opnieuw.",
"The current log-in password was not correct, please try again." : "Het huidige inlogwachtwoord was niet juist, probeer het opnieuw.",
"Private key password successfully updated." : "Privésleutel succesvol bijgewerkt.",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige privésleutel voor de crypto app. Werk het privésleutel wachtwoord bij in je persoonlijke instellingen om opnieuw toegang te krijgen tot je versleutelde bestanden.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Crypto app is ingeschakeld, maar je sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Activeer de server-encryptie in de beheerdersinstellingen om de encryptiemodule te kunnen gebruiken.",
- "Encryption app is enabled and ready" : "Encryptie app is ingeschakeld en gereed",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige persoonlijke sleutel voor de versleutelingsapp. Werk de persoonlijke wachtwoordsleutel bij in je persoonlijke instellingen om opnieuw toegang te krijgen tot je versleutelde bestanden.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Versleutelingsapp is ingeschakeld, maar je sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Schakel versleuteling aan de serverzijde in de beheerdersinstellingen in om de versleutelingsmodule te gebruiken.",
+ "Encryption app is enabled and ready" : "Versleutelingsapp is ingeschakeld en gereed",
"Bad Signature" : "Verkeerde handtekening",
"Missing Signature" : "Missende ondertekening",
- "one-time password for server-side-encryption" : "eenmalig wachtwoord voor server-side versleuteling",
+ "one-time password for server-side-encryption" : "eenmalig wachtwoord voor versleuteling aan de serverzijde",
+ "Encryption password" : "Versleutelingswachtwoord",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "De beheerder heeft versleuteling aan de serverzijde mogelijk gemaakt. Je bestanden zijn gecodeerd met behulp van het wachtwoord <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "De beheerder heeft versleuteling aan de serverzijde mogelijk gemaakt. Je bestanden zijn gecodeerd met behulp van het wachtwoord \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Log in op de webinterface, ga naar het gedeelte 'Beveiliging' van je persoonlijke instellingen en update je coderingswachtwoord door dit wachtwoord in te voeren in het veld 'Oud inlogwachtwoord' en je huidige inlogwachtwoord.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met je te delen.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet lezen, waarschijnlijk is het een gedeeld bestand. Vraag de eigenaar om het bestand opnieuw met je te delen.",
- "Default encryption module" : "Standaard cryptomodule",
- "Default encryption module for server-side encryption" : "Standaard cryptomodule voor server-side versleuteling",
+ "Default encryption module" : "Standaard versleutelingsmodule",
+ "Default encryption module for server-side encryption" : "Standaard module voor versleuteling aan de serverzijde",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Om deze versleutelingsmodule te kunnen gebruiken, moet je versleuteling aan de serverzijde inschakelen in de beheerdersinstellingen. Eenmaal ingeschakeld zal deze module al je bestanden transparant versleutelen. De versleuteling is gebaseerd op AES 256-sleutels.\nDe module doet niets met bestaande bestanden, alleen nieuwe bestanden worden gecodeerd nadat versleuteling aan de serverzijde is ingeschakeld. Het is ook niet mogelijk om de codering weer uit te schakelen en terug te schakelen naar een niet-gecodeerd systeem.\nLees de documentatie om alle implicaties te kennen voordat je besluit versleuteling aan de serverzijde in te schakelen.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is ingeschakeld, maar je sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
"Encrypt the home storage" : "Versleutel de eigen serveropslag",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Het inschakelen van deze optie zorgt voor versleutelen van alle bestanden op de hoofdopslag, anders worden alleen bestanden op externe opslag versleuteld",
"Enable recovery key" : "Activeer herstelsleutel",
"Disable recovery key" : "Deactiveer herstelsleutel",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "De herstelsleutel is een extra coderingssleutel die wordt gebruikt om bestanden te versleutelen. Het wordt gebruikt om bestanden van een account te herstellen als het wachtwoord wordt vergeten.",
"Recovery key password" : "Wachtwoord herstelsleulel",
"Repeat recovery key password" : "Herhaal wachtwoord herstelsleutel",
"Change recovery key password:" : "Wijzig wachtwoord herstelsleutel:",
@@ -44,10 +50,10 @@ OC.L10N.register(
"New recovery key password" : "Nieuwe wachtwoord herstelsleutel",
"Repeat new recovery key password" : "Herhaal nieuwe wachtwoord herstelsleutel",
"Change Password" : "Wijzigen wachtwoord",
- "Basic encryption module" : "Basis versleutelingsmodule",
+ "Basic encryption module" : "Basis-versleutelingsmodule",
"Your private key password no longer matches your log-in password." : "Het wachtwoord van je privésleutel komt niet meer overeen met je inlogwachtwoord.",
"Set your old private key password to your current log-in password:" : "Stel het wachtwoord van je oude privésleutel in op je huidige inlogwachtwoord.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Als je je oude wachtwoord niet meer weet, kun je de beheerder vragen je bestanden terug te halen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Als je je oude wachtwoord niet meer weet, kun je de beheerder vragen je bestanden te herstellen.",
"Old log-in password" : "Oude wachtwoord",
"Current log-in password" : "Huidige wachtwoord",
"Update Private Key Password" : "Bijwerken wachtwoord Privésleutel",
diff --git a/apps/encryption/l10n/nl.json b/apps/encryption/l10n/nl.json
index 06a52775b06..b1b5e0f9d31 100644
--- a/apps/encryption/l10n/nl.json
+++ b/apps/encryption/l10n/nl.json
@@ -19,22 +19,28 @@
"The old password was not correct, please try again." : "Het oude wachtwoord was onjuist, probeer het opnieuw.",
"The current log-in password was not correct, please try again." : "Het huidige inlogwachtwoord was niet juist, probeer het opnieuw.",
"Private key password successfully updated." : "Privésleutel succesvol bijgewerkt.",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige privésleutel voor de crypto app. Werk het privésleutel wachtwoord bij in je persoonlijke instellingen om opnieuw toegang te krijgen tot je versleutelde bestanden.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Crypto app is ingeschakeld, maar je sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Activeer de server-encryptie in de beheerdersinstellingen om de encryptiemodule te kunnen gebruiken.",
- "Encryption app is enabled and ready" : "Encryptie app is ingeschakeld en gereed",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige persoonlijke sleutel voor de versleutelingsapp. Werk de persoonlijke wachtwoordsleutel bij in je persoonlijke instellingen om opnieuw toegang te krijgen tot je versleutelde bestanden.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Versleutelingsapp is ingeschakeld, maar je sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Schakel versleuteling aan de serverzijde in de beheerdersinstellingen in om de versleutelingsmodule te gebruiken.",
+ "Encryption app is enabled and ready" : "Versleutelingsapp is ingeschakeld en gereed",
"Bad Signature" : "Verkeerde handtekening",
"Missing Signature" : "Missende ondertekening",
- "one-time password for server-side-encryption" : "eenmalig wachtwoord voor server-side versleuteling",
+ "one-time password for server-side-encryption" : "eenmalig wachtwoord voor versleuteling aan de serverzijde",
+ "Encryption password" : "Versleutelingswachtwoord",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "De beheerder heeft versleuteling aan de serverzijde mogelijk gemaakt. Je bestanden zijn gecodeerd met behulp van het wachtwoord <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "De beheerder heeft versleuteling aan de serverzijde mogelijk gemaakt. Je bestanden zijn gecodeerd met behulp van het wachtwoord \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Log in op de webinterface, ga naar het gedeelte 'Beveiliging' van je persoonlijke instellingen en update je coderingswachtwoord door dit wachtwoord in te voeren in het veld 'Oud inlogwachtwoord' en je huidige inlogwachtwoord.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met je te delen.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet lezen, waarschijnlijk is het een gedeeld bestand. Vraag de eigenaar om het bestand opnieuw met je te delen.",
- "Default encryption module" : "Standaard cryptomodule",
- "Default encryption module for server-side encryption" : "Standaard cryptomodule voor server-side versleuteling",
+ "Default encryption module" : "Standaard versleutelingsmodule",
+ "Default encryption module for server-side encryption" : "Standaard module voor versleuteling aan de serverzijde",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Om deze versleutelingsmodule te kunnen gebruiken, moet je versleuteling aan de serverzijde inschakelen in de beheerdersinstellingen. Eenmaal ingeschakeld zal deze module al je bestanden transparant versleutelen. De versleuteling is gebaseerd op AES 256-sleutels.\nDe module doet niets met bestaande bestanden, alleen nieuwe bestanden worden gecodeerd nadat versleuteling aan de serverzijde is ingeschakeld. Het is ook niet mogelijk om de codering weer uit te schakelen en terug te schakelen naar een niet-gecodeerd systeem.\nLees de documentatie om alle implicaties te kennen voordat je besluit versleuteling aan de serverzijde in te schakelen.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is ingeschakeld, maar je sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
"Encrypt the home storage" : "Versleutel de eigen serveropslag",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Het inschakelen van deze optie zorgt voor versleutelen van alle bestanden op de hoofdopslag, anders worden alleen bestanden op externe opslag versleuteld",
"Enable recovery key" : "Activeer herstelsleutel",
"Disable recovery key" : "Deactiveer herstelsleutel",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "De herstelsleutel is een extra coderingssleutel die wordt gebruikt om bestanden te versleutelen. Het wordt gebruikt om bestanden van een account te herstellen als het wachtwoord wordt vergeten.",
"Recovery key password" : "Wachtwoord herstelsleulel",
"Repeat recovery key password" : "Herhaal wachtwoord herstelsleutel",
"Change recovery key password:" : "Wijzig wachtwoord herstelsleutel:",
@@ -42,10 +48,10 @@
"New recovery key password" : "Nieuwe wachtwoord herstelsleutel",
"Repeat new recovery key password" : "Herhaal nieuwe wachtwoord herstelsleutel",
"Change Password" : "Wijzigen wachtwoord",
- "Basic encryption module" : "Basis versleutelingsmodule",
+ "Basic encryption module" : "Basis-versleutelingsmodule",
"Your private key password no longer matches your log-in password." : "Het wachtwoord van je privésleutel komt niet meer overeen met je inlogwachtwoord.",
"Set your old private key password to your current log-in password:" : "Stel het wachtwoord van je oude privésleutel in op je huidige inlogwachtwoord.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Als je je oude wachtwoord niet meer weet, kun je de beheerder vragen je bestanden terug te halen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Als je je oude wachtwoord niet meer weet, kun je de beheerder vragen je bestanden te herstellen.",
"Old log-in password" : "Oude wachtwoord",
"Current log-in password" : "Huidige wachtwoord",
"Update Private Key Password" : "Bijwerken wachtwoord Privésleutel",
diff --git a/apps/encryption/l10n/oc.js b/apps/encryption/l10n/oc.js
deleted file mode 100644
index 30cae245932..00000000000
--- a/apps/encryption/l10n/oc.js
+++ /dev/null
@@ -1,59 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Missing recovery key password" : "Senhal de la clau de recuperacion mancant",
- "Please repeat the recovery key password" : "Repetètz lo senhal de la clau de recuperacion",
- "Repeated recovery key password does not match the provided recovery key password" : "Lo senhal de la clau de recuperacion e sa repeticion son pas identics.",
- "Recovery key successfully enabled" : "Clau de recuperacion activada amb succès",
- "Could not enable recovery key. Please check your recovery key password!" : "Impossible d'activar la clau de recuperacion. Verificatz lo senhal de vòstra clau de recuperacion !",
- "Recovery key successfully disabled" : "Clau de recuperacion desactivada amb succès",
- "Could not disable recovery key. Please check your recovery key password!" : "Impossible de desactivar la clau de recuperacion. Verificatz lo senhal de vòstra clau de recuperacion !",
- "Missing parameters" : "Paramètres mancants",
- "Please provide the old recovery password" : "Entratz l'ancian senhal de recuperacion",
- "Please provide a new recovery password" : "Entratz un novèl senhal de recuperacion",
- "Please repeat the new recovery password" : "Repetissètz lo novèl senhal de recuperacion",
- "Password successfully changed." : "Senhal cambiat amb succès.",
- "Could not change the password. Maybe the old password was not correct." : "Error al moment del cambiament de senhal. Benlèu que l'ancian senhal es incorrècte.",
- "Recovery Key disabled" : "Clau de recuperacion desactivada",
- "Recovery Key enabled" : "Clau de recuperacion activada",
- "Could not enable the recovery key, please try again or contact your administrator" : "Impossible d'activar la clau de recuperacion. Ensajatz tornamai o contactatz vòstre administrator",
- "Could not update the private key password." : "Impossible de metre a jorn lo senhal de la clau privada.",
- "The old password was not correct, please try again." : "L'ancian senhal es incorrècte. Ensajatz tornamai.",
- "The current log-in password was not correct, please try again." : "Lo senhal de connexion actual es pas corrècte, ensajatz tornamai.",
- "Private key password successfully updated." : "Senhal de la clau privada mes a jorn amb succès.",
- "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Vos cal migrar vòstras claus de chiframent de l'anciana version (ownCloud <= 8.0) cap a la novèla. Executatz 'occ encryption:migrate' o contactatz vòstre administrator",
- "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Vòstra clau privada pel chiframent es pas valida ! Metètz a jorn lo senhal de vòstra clau privada dins vòstres paramètres personals per recuperar l'accès a vòstres fichièrs chifrats.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicacion de chiframent es activada mas vòstras claus son pas inicializadas. Desconnectatz-vos e puèi reconnectatz-vos.",
- "Encryption App is enabled and ready" : "L'aplicacion de chiframent es activada e prèsta",
- "one-time password for server-side-encryption" : "Senhal d'usatge unic pel chiframent costat servidor",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de deschifrar aqueste fichièr : s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo partejar tornamai amb vos.",
- "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de legir aqueste fichièr, s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo repartejar amb vos. ",
- "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Bonjorn,\n\nL'administrator a activat lo chiframent sul servidor. Vòstres fichièrs son estats chifrats amb lo senhal seguent :\n\n%s\n\nSeguissètz aquelas instruccions :\n\n1. Connectatz-vos a l'interfàcia web e trobatz la seccion \"Modul de chiframent de basa d'\" dins vòstres paramètres personals ;\n\n2. Entratz lo senhal provesit çaisús dins lo camp \"Ancian senhal de connexion\";\n\n3. Entratz lo senhal qu'utilizatz actualament per vos connectar dins lo camp \"Senhal de connexion actual\" ;\n\n4. Validatz en clicant sul boton \"Metre a jorn lo senhal de vòstra clau privada\".\n",
- "The share will expire on %s." : "Lo partiment expirarà lo %s.",
- "Cheers!" : "A lèu !",
- "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Bonjorn,\n<br><br>\nL'administrator a activat lo chiframent sul servidor. Vòstres fichièrs son estats chifrats amb lo senhal seguent :\n\n<p style=\"font-family: monospace;\"><b>%s</b></p>\n\n<p>\nSeguissètz aquelas instruccions :\n<ol>\n<li>Connectatz-vos a l'interfàcia web e trobatz la seccion <em>\"Modul de chiframent de basa d'\"</em> dins vòstres paramètres personals;</li>\n<li>Entratz lo senhal provesit çaisús dins lo camp <em>\"Ancian senhal de connexion\"</em>;</li>\n<li>Entratz lo senhal qu'utilizatz actualament per vos connectar dins lo camp <em>\"Senhal de connexion actual\"</em>;</li>\n<li>Validatz en clicant sul boton <em>\"Metre a jorn lo senhal de vòstra clau privada\"</em>.</li>\n</ol>\n</p>",
- "Encrypt the home storage" : "Chifrar l'espaci d'emmagazinatge principal",
- "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "L'activacion d'aquesta opcion chifra totes los fichièrs de l'emmagazinatge principal, siquenon sols los espacis d'emmagazinatge extèrnes seràn chifrats",
- "Enable recovery key" : "Activar la clau de recuperacion",
- "Disable recovery key" : "Desactivar la clau de recuperacion",
- "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clau de recuperacion es una clau suplementària utilizada per chifrar los fichièrs. Permet de recuperar los fichièrs dels utilizaires se doblidan lor senhal.",
- "Recovery key password" : "Senhal de la clau de recuperacion",
- "Repeat recovery key password" : "Repetissètz lo senhal de la clau de recuperacion",
- "Change recovery key password:" : "Modificar lo senhal de la clau de recuperacion :",
- "Old recovery key password" : "Ancian senhal de la clau de recuperacion",
- "New recovery key password" : "Novèl senhal de la clau de recuperacion",
- "Repeat new recovery key password" : "Repetissètz lo novèl senhal de la clau de recuperacion",
- "Change Password" : "Cambiar de senhal",
- "basic encryption module" : "Modul de chiframent de basa d'",
- "Your private key password no longer matches your log-in password." : "Lo senhal de vòstra clau privada correspond pas mai a vòstre senhal de connexion.",
- "Set your old private key password to your current log-in password:" : "Fasètz de vòstre senhal de connexion lo senhal de vòstra clau privada :",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se vos remembratz pas mai de vòstre ancian senhal, podètz demandar a vòstre administrator de recuperar vòstres fichièrs.",
- "Old log-in password" : "Ancian senhal de connexion",
- "Current log-in password" : "Actual senhal de connexion",
- "Update Private Key Password" : "Metre a jorn lo senhal de vòstra clau privada",
- "Enable password recovery:" : "Activar la recuperacion del senhal :",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activar aquesta opcion vos permetrà d'obténer tornamai l'accès a vòstres fichièrs chifrats en cas de pèrda de senhal",
- "Enabled" : "Activat",
- "Disabled" : "Desactivat"
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/encryption/l10n/oc.json b/apps/encryption/l10n/oc.json
deleted file mode 100644
index 1773e6b7ef1..00000000000
--- a/apps/encryption/l10n/oc.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{ "translations": {
- "Missing recovery key password" : "Senhal de la clau de recuperacion mancant",
- "Please repeat the recovery key password" : "Repetètz lo senhal de la clau de recuperacion",
- "Repeated recovery key password does not match the provided recovery key password" : "Lo senhal de la clau de recuperacion e sa repeticion son pas identics.",
- "Recovery key successfully enabled" : "Clau de recuperacion activada amb succès",
- "Could not enable recovery key. Please check your recovery key password!" : "Impossible d'activar la clau de recuperacion. Verificatz lo senhal de vòstra clau de recuperacion !",
- "Recovery key successfully disabled" : "Clau de recuperacion desactivada amb succès",
- "Could not disable recovery key. Please check your recovery key password!" : "Impossible de desactivar la clau de recuperacion. Verificatz lo senhal de vòstra clau de recuperacion !",
- "Missing parameters" : "Paramètres mancants",
- "Please provide the old recovery password" : "Entratz l'ancian senhal de recuperacion",
- "Please provide a new recovery password" : "Entratz un novèl senhal de recuperacion",
- "Please repeat the new recovery password" : "Repetissètz lo novèl senhal de recuperacion",
- "Password successfully changed." : "Senhal cambiat amb succès.",
- "Could not change the password. Maybe the old password was not correct." : "Error al moment del cambiament de senhal. Benlèu que l'ancian senhal es incorrècte.",
- "Recovery Key disabled" : "Clau de recuperacion desactivada",
- "Recovery Key enabled" : "Clau de recuperacion activada",
- "Could not enable the recovery key, please try again or contact your administrator" : "Impossible d'activar la clau de recuperacion. Ensajatz tornamai o contactatz vòstre administrator",
- "Could not update the private key password." : "Impossible de metre a jorn lo senhal de la clau privada.",
- "The old password was not correct, please try again." : "L'ancian senhal es incorrècte. Ensajatz tornamai.",
- "The current log-in password was not correct, please try again." : "Lo senhal de connexion actual es pas corrècte, ensajatz tornamai.",
- "Private key password successfully updated." : "Senhal de la clau privada mes a jorn amb succès.",
- "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Vos cal migrar vòstras claus de chiframent de l'anciana version (ownCloud <= 8.0) cap a la novèla. Executatz 'occ encryption:migrate' o contactatz vòstre administrator",
- "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Vòstra clau privada pel chiframent es pas valida ! Metètz a jorn lo senhal de vòstra clau privada dins vòstres paramètres personals per recuperar l'accès a vòstres fichièrs chifrats.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicacion de chiframent es activada mas vòstras claus son pas inicializadas. Desconnectatz-vos e puèi reconnectatz-vos.",
- "Encryption App is enabled and ready" : "L'aplicacion de chiframent es activada e prèsta",
- "one-time password for server-side-encryption" : "Senhal d'usatge unic pel chiframent costat servidor",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de deschifrar aqueste fichièr : s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo partejar tornamai amb vos.",
- "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de legir aqueste fichièr, s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo repartejar amb vos. ",
- "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Bonjorn,\n\nL'administrator a activat lo chiframent sul servidor. Vòstres fichièrs son estats chifrats amb lo senhal seguent :\n\n%s\n\nSeguissètz aquelas instruccions :\n\n1. Connectatz-vos a l'interfàcia web e trobatz la seccion \"Modul de chiframent de basa d'\" dins vòstres paramètres personals ;\n\n2. Entratz lo senhal provesit çaisús dins lo camp \"Ancian senhal de connexion\";\n\n3. Entratz lo senhal qu'utilizatz actualament per vos connectar dins lo camp \"Senhal de connexion actual\" ;\n\n4. Validatz en clicant sul boton \"Metre a jorn lo senhal de vòstra clau privada\".\n",
- "The share will expire on %s." : "Lo partiment expirarà lo %s.",
- "Cheers!" : "A lèu !",
- "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Bonjorn,\n<br><br>\nL'administrator a activat lo chiframent sul servidor. Vòstres fichièrs son estats chifrats amb lo senhal seguent :\n\n<p style=\"font-family: monospace;\"><b>%s</b></p>\n\n<p>\nSeguissètz aquelas instruccions :\n<ol>\n<li>Connectatz-vos a l'interfàcia web e trobatz la seccion <em>\"Modul de chiframent de basa d'\"</em> dins vòstres paramètres personals;</li>\n<li>Entratz lo senhal provesit çaisús dins lo camp <em>\"Ancian senhal de connexion\"</em>;</li>\n<li>Entratz lo senhal qu'utilizatz actualament per vos connectar dins lo camp <em>\"Senhal de connexion actual\"</em>;</li>\n<li>Validatz en clicant sul boton <em>\"Metre a jorn lo senhal de vòstra clau privada\"</em>.</li>\n</ol>\n</p>",
- "Encrypt the home storage" : "Chifrar l'espaci d'emmagazinatge principal",
- "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "L'activacion d'aquesta opcion chifra totes los fichièrs de l'emmagazinatge principal, siquenon sols los espacis d'emmagazinatge extèrnes seràn chifrats",
- "Enable recovery key" : "Activar la clau de recuperacion",
- "Disable recovery key" : "Desactivar la clau de recuperacion",
- "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clau de recuperacion es una clau suplementària utilizada per chifrar los fichièrs. Permet de recuperar los fichièrs dels utilizaires se doblidan lor senhal.",
- "Recovery key password" : "Senhal de la clau de recuperacion",
- "Repeat recovery key password" : "Repetissètz lo senhal de la clau de recuperacion",
- "Change recovery key password:" : "Modificar lo senhal de la clau de recuperacion :",
- "Old recovery key password" : "Ancian senhal de la clau de recuperacion",
- "New recovery key password" : "Novèl senhal de la clau de recuperacion",
- "Repeat new recovery key password" : "Repetissètz lo novèl senhal de la clau de recuperacion",
- "Change Password" : "Cambiar de senhal",
- "basic encryption module" : "Modul de chiframent de basa d'",
- "Your private key password no longer matches your log-in password." : "Lo senhal de vòstra clau privada correspond pas mai a vòstre senhal de connexion.",
- "Set your old private key password to your current log-in password:" : "Fasètz de vòstre senhal de connexion lo senhal de vòstra clau privada :",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se vos remembratz pas mai de vòstre ancian senhal, podètz demandar a vòstre administrator de recuperar vòstres fichièrs.",
- "Old log-in password" : "Ancian senhal de connexion",
- "Current log-in password" : "Actual senhal de connexion",
- "Update Private Key Password" : "Metre a jorn lo senhal de vòstra clau privada",
- "Enable password recovery:" : "Activar la recuperacion del senhal :",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activar aquesta opcion vos permetrà d'obténer tornamai l'accès a vòstres fichièrs chifrats en cas de pèrda de senhal",
- "Enabled" : "Activat",
- "Disabled" : "Desactivat"
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/pl.js b/apps/encryption/l10n/pl.js
index 6b9a7de31b2..67e73e93630 100644
--- a/apps/encryption/l10n/pl.js
+++ b/apps/encryption/l10n/pl.js
@@ -53,7 +53,6 @@ OC.L10N.register(
"Basic encryption module" : "Podstawowy moduł szyfrowania",
"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:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki.",
"Old log-in password" : "Stare hasło logowania",
"Current log-in password" : "Bieżące hasło logowania",
"Update Private Key Password" : "Aktualizacja hasła klucza prywatnego",
diff --git a/apps/encryption/l10n/pl.json b/apps/encryption/l10n/pl.json
index 8094f160bb0..07ade8d5052 100644
--- a/apps/encryption/l10n/pl.json
+++ b/apps/encryption/l10n/pl.json
@@ -51,7 +51,6 @@
"Basic encryption module" : "Podstawowy moduł szyfrowania",
"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:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki.",
"Old log-in password" : "Stare hasło logowania",
"Current log-in password" : "Bieżące hasło logowania",
"Update Private Key Password" : "Aktualizacja hasła klucza prywatnego",
diff --git a/apps/encryption/l10n/pt_BR.js b/apps/encryption/l10n/pt_BR.js
index 7fdfc711bad..889683d62a3 100644
--- a/apps/encryption/l10n/pt_BR.js
+++ b/apps/encryption/l10n/pt_BR.js
@@ -29,20 +29,20 @@ OC.L10N.register(
"Missing Signature" : "Assinatura faltante",
"one-time password for server-side-encryption" : "senha de uso único para criptografia do lado do servidor",
"Encryption password" : "Senha de criptografia",
- "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "A administração habilitou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha <strong>%s</strong>.",
- "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "A administração habilitou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha \"%s\".",
- "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Faça login na interface da web, vá para a seção \"Segurança\" de suas configurações pessoais e atualize sua senha de criptografia inserindo esta senha no campo \"Senha de login antiga\" e sua senha de login atual.",
- "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível descriptografar este arquivo, provavelmente é um arquivo compartilhado. Por favor solicite ao dono do arquivo para recompartilhá-lo com você.",
- "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível ler este arquivo pois provavelmente é um arquivo compartilhado. Por favor, peça ao dono do arquivo para recompartilhá-lo com você.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "A administração ativou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "A administração ativou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Por favor, faça login na interface web, vá para a seção \"Segurança\" de suas configurações pessoais e atualize sua senha de criptografia inserindo esta senha no campo \"Senha de login antiga\" e sua senha de login atual.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível descriptografar este arquivo, provavelmente é um arquivo compartilhado. Por favor, solicite ao proprietário do arquivo para recompartilhá-lo com você.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível ler este arquivo, provavelmente é um arquivo compartilhado. Por favor, solicite ao proprietário do arquivo para recompartilhá-lo com você.",
"Default encryption module" : "Módulo de criptografia padrão",
"Default encryption module for server-side encryption" : "Módulo de criptografia padrão para criptografia do lado do servidor",
- "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Para usar este módulo de criptografia, você precisa habilitar a criptografia do lado do servidor nas configurações de administração. Uma vez ativado, este módulo criptografará todos os seus arquivos de forma transparente. A criptografia é baseada em chaves AES 256.\nO módulo não tocará nos arquivos existentes, apenas novos arquivos serão criptografados após a criptografia do lado do servidor ser habilitada. Também não é possível desabilitar a criptografia novamente e voltar para um sistema não criptografado.\nLeia a documentação para saber todas as implicações antes de decidir habilitar a criptografia do lado do servidor.",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Para usar este módulo de criptografia, você precisa ativar a criptografia do lado do servidor nas configurações de administração. Quando ativado, este módulo criptografará todos os seus arquivos de forma transparente. A criptografia é baseada em chaves AES 256.\nO módulo não tocará nos arquivos existentes, apenas novos arquivos serão criptografados após a criptografia do lado do servidor for ativada. Também não é possível desabilitar a criptografia novamente e voltar para um sistema não criptografado.\nLeia a documentação para conhecer todas as implicações antes de decidir ativar a criptografia do lado do servidor.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "O aplicativo de criptografia está habilitado, mas suas chaves não foram inicializadas. Por favor, saia e entre novamente.",
"Encrypt the home storage" : "Criptografar a pasta de armazenamento home",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ativar essa opção irá criptografar todos os arquivos do armazenamento principal, caso contrário, apenas arquivos no armazenamento externo serão criptografados",
"Enable recovery key" : "Ativar chave de recuperação",
"Disable recovery key" : "Dasabilitar chave de recuperação",
- "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "A chave de recuperação é uma chave de criptografia adicional usada para criptografar arquivos. É usado para recuperar arquivos de uma conta caso a senha seja esquecida.",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "A chave de recuperação é uma chave de criptografia adicional usada para criptografar arquivos. É usado para recuperar arquivos de uma conta se a senha for esquecida.",
"Recovery key password" : "Senha da chave de recuperação",
"Repeat recovery key password" : "Repita a senha da chave de recuperação",
"Change recovery key password:" : "Mudar a senha da chave de recuperação:",
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de criptografia básico",
"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 senha antiga 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 senha antiga você pode pedir ao administrador que recupere seus arquivos.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Se não se lembrar da senha antiga, peça ao administrador para recuperar seus arquivos.",
"Old log-in password" : "Senha antiga de login",
"Current log-in password" : "Senha atual de login",
"Update Private Key Password" : "Atualizar senha da chave privada",
diff --git a/apps/encryption/l10n/pt_BR.json b/apps/encryption/l10n/pt_BR.json
index 4a78dbf1cf1..202915f2284 100644
--- a/apps/encryption/l10n/pt_BR.json
+++ b/apps/encryption/l10n/pt_BR.json
@@ -27,20 +27,20 @@
"Missing Signature" : "Assinatura faltante",
"one-time password for server-side-encryption" : "senha de uso único para criptografia do lado do servidor",
"Encryption password" : "Senha de criptografia",
- "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "A administração habilitou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha <strong>%s</strong>.",
- "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "A administração habilitou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha \"%s\".",
- "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Faça login na interface da web, vá para a seção \"Segurança\" de suas configurações pessoais e atualize sua senha de criptografia inserindo esta senha no campo \"Senha de login antiga\" e sua senha de login atual.",
- "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível descriptografar este arquivo, provavelmente é um arquivo compartilhado. Por favor solicite ao dono do arquivo para recompartilhá-lo com você.",
- "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível ler este arquivo pois provavelmente é um arquivo compartilhado. Por favor, peça ao dono do arquivo para recompartilhá-lo com você.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "A administração ativou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "A administração ativou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Por favor, faça login na interface web, vá para a seção \"Segurança\" de suas configurações pessoais e atualize sua senha de criptografia inserindo esta senha no campo \"Senha de login antiga\" e sua senha de login atual.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível descriptografar este arquivo, provavelmente é um arquivo compartilhado. Por favor, solicite ao proprietário do arquivo para recompartilhá-lo com você.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível ler este arquivo, provavelmente é um arquivo compartilhado. Por favor, solicite ao proprietário do arquivo para recompartilhá-lo com você.",
"Default encryption module" : "Módulo de criptografia padrão",
"Default encryption module for server-side encryption" : "Módulo de criptografia padrão para criptografia do lado do servidor",
- "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Para usar este módulo de criptografia, você precisa habilitar a criptografia do lado do servidor nas configurações de administração. Uma vez ativado, este módulo criptografará todos os seus arquivos de forma transparente. A criptografia é baseada em chaves AES 256.\nO módulo não tocará nos arquivos existentes, apenas novos arquivos serão criptografados após a criptografia do lado do servidor ser habilitada. Também não é possível desabilitar a criptografia novamente e voltar para um sistema não criptografado.\nLeia a documentação para saber todas as implicações antes de decidir habilitar a criptografia do lado do servidor.",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Para usar este módulo de criptografia, você precisa ativar a criptografia do lado do servidor nas configurações de administração. Quando ativado, este módulo criptografará todos os seus arquivos de forma transparente. A criptografia é baseada em chaves AES 256.\nO módulo não tocará nos arquivos existentes, apenas novos arquivos serão criptografados após a criptografia do lado do servidor for ativada. Também não é possível desabilitar a criptografia novamente e voltar para um sistema não criptografado.\nLeia a documentação para conhecer todas as implicações antes de decidir ativar a criptografia do lado do servidor.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "O aplicativo de criptografia está habilitado, mas suas chaves não foram inicializadas. Por favor, saia e entre novamente.",
"Encrypt the home storage" : "Criptografar a pasta de armazenamento home",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ativar essa opção irá criptografar todos os arquivos do armazenamento principal, caso contrário, apenas arquivos no armazenamento externo serão criptografados",
"Enable recovery key" : "Ativar chave de recuperação",
"Disable recovery key" : "Dasabilitar chave de recuperação",
- "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "A chave de recuperação é uma chave de criptografia adicional usada para criptografar arquivos. É usado para recuperar arquivos de uma conta caso a senha seja esquecida.",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "A chave de recuperação é uma chave de criptografia adicional usada para criptografar arquivos. É usado para recuperar arquivos de uma conta se a senha for esquecida.",
"Recovery key password" : "Senha da chave de recuperação",
"Repeat recovery key password" : "Repita a senha da chave de recuperação",
"Change recovery key password:" : "Mudar a senha da chave de recuperação:",
@@ -51,7 +51,7 @@
"Basic encryption module" : "Módulo de criptografia básico",
"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 senha antiga 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 senha antiga você pode pedir ao administrador que recupere seus arquivos.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Se não se lembrar da senha antiga, peça ao administrador para recuperar seus arquivos.",
"Old log-in password" : "Senha antiga de login",
"Current log-in password" : "Senha atual de login",
"Update Private Key Password" : "Atualizar senha da chave privada",
diff --git a/apps/encryption/l10n/pt_PT.js b/apps/encryption/l10n/pt_PT.js
index 5a45c32bed6..0e5e9c6811a 100644
--- a/apps/encryption/l10n/pt_PT.js
+++ b/apps/encryption/l10n/pt_PT.js
@@ -21,16 +21,16 @@ OC.L10N.register(
"The old password was not correct, please try again." : "A palavra-passe antiga não estava correta, por favor, tente de novo.",
"The current log-in password was not correct, please try again." : "A palavra-passe de iniciar a sessão atual não estava correta, por favor, tente de novo.",
"Private key password successfully updated." : "A palavra-passe 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 para a aplicação de cifra. Por favor actualize a sua chave privada nas definições pessoais para recuperar acesso aos seus ficheiros cifrados.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Aplicação de cifra está activa, mas as suas chaves não estão inicializaras. Por favor, faça logout e autentique-se novamente.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Por favor active cifragem no servidor nas definições de administrador para usar o módulo de cifra.",
- "Encryption app is enabled and ready" : "Aplicação de cifra activa e pronta a usar",
+ "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 para a aplicação de cifra. Por favor atualize a sua chave privada nas definições pessoais para recuperar acesso aos seus ficheiros cifrados.",
+ "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 foram inicializadas. Termine a sessão e inicie sessão novamente.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Para poder utilizar o módulo de encriptação, ative a encriptação do lado do servidor nas definições de administração.",
+ "Encryption app is enabled and ready" : "A aplicação de encriptação está ativada e pronta",
"Bad Signature" : "Má Assinatura",
"Missing Signature" : "Assinatura em Falta",
"one-time password for server-side-encryption" : "palavra-passe de utilização única para a encriptação do lado do servidor",
"Default encryption module" : "Módulo de cifra padrão",
"Default encryption module for server-side encryption" : "Módulo de encriptação predefinido para encriptação do lado do servidor",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicação de cifra está activa, mas as suas chaves não estão inicializaras. Por favor, faça logout e autentique-se novamente.",
+ "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 foram inicializadas, termine a sessão e inicie sessão novamente",
"Encrypt the home storage" : "Encriptar o armazenamento do início",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ativando esta opção todos os ficheiros armazenados no armazenamento principal serão encriptados, senão serão encriptados todos os ficheiros no armazenamento externo",
"Enable recovery key" : "Ativar a chave de recuperação",
@@ -45,7 +45,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de cifra básica",
"Your private key password no longer matches your log-in password." : "A palavra-passe da sua chave privada já não coincide com a palavra-passe da sua sessão.",
"Set your old private key password to your current log-in password:" : "Defina a sua palavra-passe antiga da chave privada para a sua palavra-passe atual da sessão:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se não se lembra da palavra-passe antiga pode pedir ao seu administrador para recuperar os seus ficheiros. ",
"Old log-in password" : "Palavra-passe antiga da sessão",
"Current log-in password" : "Palavra-passe atual da sessão",
"Update Private Key Password" : "Atualizar Palavra-passe da Chave Privada ",
diff --git a/apps/encryption/l10n/pt_PT.json b/apps/encryption/l10n/pt_PT.json
index f970f7541f9..fac953c91b1 100644
--- a/apps/encryption/l10n/pt_PT.json
+++ b/apps/encryption/l10n/pt_PT.json
@@ -19,16 +19,16 @@
"The old password was not correct, please try again." : "A palavra-passe antiga não estava correta, por favor, tente de novo.",
"The current log-in password was not correct, please try again." : "A palavra-passe de iniciar a sessão atual não estava correta, por favor, tente de novo.",
"Private key password successfully updated." : "A palavra-passe 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 para a aplicação de cifra. Por favor actualize a sua chave privada nas definições pessoais para recuperar acesso aos seus ficheiros cifrados.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Aplicação de cifra está activa, mas as suas chaves não estão inicializaras. Por favor, faça logout e autentique-se novamente.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Por favor active cifragem no servidor nas definições de administrador para usar o módulo de cifra.",
- "Encryption app is enabled and ready" : "Aplicação de cifra activa e pronta a usar",
+ "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 para a aplicação de cifra. Por favor atualize a sua chave privada nas definições pessoais para recuperar acesso aos seus ficheiros cifrados.",
+ "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 foram inicializadas. Termine a sessão e inicie sessão novamente.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Para poder utilizar o módulo de encriptação, ative a encriptação do lado do servidor nas definições de administração.",
+ "Encryption app is enabled and ready" : "A aplicação de encriptação está ativada e pronta",
"Bad Signature" : "Má Assinatura",
"Missing Signature" : "Assinatura em Falta",
"one-time password for server-side-encryption" : "palavra-passe de utilização única para a encriptação do lado do servidor",
"Default encryption module" : "Módulo de cifra padrão",
"Default encryption module for server-side encryption" : "Módulo de encriptação predefinido para encriptação do lado do servidor",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicação de cifra está activa, mas as suas chaves não estão inicializaras. Por favor, faça logout e autentique-se novamente.",
+ "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 foram inicializadas, termine a sessão e inicie sessão novamente",
"Encrypt the home storage" : "Encriptar o armazenamento do início",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ativando esta opção todos os ficheiros armazenados no armazenamento principal serão encriptados, senão serão encriptados todos os ficheiros no armazenamento externo",
"Enable recovery key" : "Ativar a chave de recuperação",
@@ -43,7 +43,6 @@
"Basic encryption module" : "Módulo de cifra básica",
"Your private key password no longer matches your log-in password." : "A palavra-passe da sua chave privada já não coincide com a palavra-passe da sua sessão.",
"Set your old private key password to your current log-in password:" : "Defina a sua palavra-passe antiga da chave privada para a sua palavra-passe atual da sessão:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se não se lembra da palavra-passe antiga pode pedir ao seu administrador para recuperar os seus ficheiros. ",
"Old log-in password" : "Palavra-passe antiga da sessão",
"Current log-in password" : "Palavra-passe atual da sessão",
"Update Private Key Password" : "Atualizar Palavra-passe da Chave Privada ",
diff --git a/apps/encryption/l10n/ru.js b/apps/encryption/l10n/ru.js
index b4c7e1b0780..0dfc75febf7 100644
--- a/apps/encryption/l10n/ru.js
+++ b/apps/encryption/l10n/ru.js
@@ -53,7 +53,6 @@ OC.L10N.register(
"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." : "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы",
"Old log-in password" : "Старый пароль учётной записи",
"Current log-in password" : "Текущий пароль учётной записи",
"Update Private Key Password" : "Обновить пароль закрытого ключа",
diff --git a/apps/encryption/l10n/ru.json b/apps/encryption/l10n/ru.json
index b2a52e74d8b..8fd6a52d1b6 100644
--- a/apps/encryption/l10n/ru.json
+++ b/apps/encryption/l10n/ru.json
@@ -51,7 +51,6 @@
"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." : "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы",
"Old log-in password" : "Старый пароль учётной записи",
"Current log-in password" : "Текущий пароль учётной записи",
"Update Private Key Password" : "Обновить пароль закрытого ключа",
diff --git a/apps/encryption/l10n/sc.js b/apps/encryption/l10n/sc.js
index 79128b3e737..3e304bf9b75 100644
--- a/apps/encryption/l10n/sc.js
+++ b/apps/encryption/l10n/sc.js
@@ -47,7 +47,6 @@ OC.L10N.register(
"Basic encryption module" : "Mòdulu de tzifradura base",
"Your private key password no longer matches your log-in password." : " Sa crae privada non currispondet prus cun sa crae de intrada.",
"Set your old private key password to your current log-in password:" : "Cunfigura sa crae privada betza comente crae de intrada atuale:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si non t'ammentas sa crae betza ddi podes pedire a s'amministradore tuo de ti recuperare is archìvios.",
"Old log-in password" : "Crae betza de intrada",
"Current log-in password" : " Crae de intrada atuale",
"Update Private Key Password" : " Agiorna sa crae de sa crae privada",
diff --git a/apps/encryption/l10n/sc.json b/apps/encryption/l10n/sc.json
index 50783fadad5..8e92fa18aa2 100644
--- a/apps/encryption/l10n/sc.json
+++ b/apps/encryption/l10n/sc.json
@@ -45,7 +45,6 @@
"Basic encryption module" : "Mòdulu de tzifradura base",
"Your private key password no longer matches your log-in password." : " Sa crae privada non currispondet prus cun sa crae de intrada.",
"Set your old private key password to your current log-in password:" : "Cunfigura sa crae privada betza comente crae de intrada atuale:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si non t'ammentas sa crae betza ddi podes pedire a s'amministradore tuo de ti recuperare is archìvios.",
"Old log-in password" : "Crae betza de intrada",
"Current log-in password" : " Crae de intrada atuale",
"Update Private Key Password" : " Agiorna sa crae de sa crae privada",
diff --git a/apps/encryption/l10n/sk.js b/apps/encryption/l10n/sk.js
index 22867508d0c..768183a8057 100644
--- a/apps/encryption/l10n/sk.js
+++ b/apps/encryption/l10n/sk.js
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Základný šifrovací modul",
"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:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie svojich súborov.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie vašich súborov.",
"Old log-in password" : "Staré prihlasovacie heslo",
"Current log-in password" : "Súčasné prihlasovacie heslo",
"Update Private Key Password" : "Aktualizovať heslo súkromného kľúča",
diff --git a/apps/encryption/l10n/sk.json b/apps/encryption/l10n/sk.json
index 2512e706adf..03b35bd517a 100644
--- a/apps/encryption/l10n/sk.json
+++ b/apps/encryption/l10n/sk.json
@@ -51,7 +51,7 @@
"Basic encryption module" : "Základný šifrovací modul",
"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:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie svojich súborov.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie vašich súborov.",
"Old log-in password" : "Staré prihlasovacie heslo",
"Current log-in password" : "Súčasné prihlasovacie heslo",
"Update Private Key Password" : "Aktualizovať heslo súkromného kľúča",
diff --git a/apps/encryption/l10n/sl.js b/apps/encryption/l10n/sl.js
index 2b8b3b184a0..c80afd08937 100644
--- a/apps/encryption/l10n/sl.js
+++ b/apps/encryption/l10n/sl.js
@@ -47,7 +47,6 @@ OC.L10N.register(
"Basic encryption module" : "Osnovni modul za šifriranje",
"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:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "V kolikor se gesla ne spomnite več, lahko vaše datoteke obnovi le skrbnik sistema.",
"Old log-in password" : "Staro geslo",
"Current log-in password" : "Trenutno geslo",
"Update Private Key Password" : "Posodobi geslo zasebnega ključa",
diff --git a/apps/encryption/l10n/sl.json b/apps/encryption/l10n/sl.json
index 6a45adfd6f5..8e45a8d2cab 100644
--- a/apps/encryption/l10n/sl.json
+++ b/apps/encryption/l10n/sl.json
@@ -45,7 +45,6 @@
"Basic encryption module" : "Osnovni modul za šifriranje",
"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:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "V kolikor se gesla ne spomnite več, lahko vaše datoteke obnovi le skrbnik sistema.",
"Old log-in password" : "Staro geslo",
"Current log-in password" : "Trenutno geslo",
"Update Private Key Password" : "Posodobi geslo zasebnega ključa",
diff --git a/apps/encryption/l10n/sq.js b/apps/encryption/l10n/sq.js
index 363feab3ad4..9cf72f1c61f 100644
--- a/apps/encryption/l10n/sq.js
+++ b/apps/encryption/l10n/sq.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Modul i thjeshtë fshehtëzimesh",
"Your private key password no longer matches your log-in password." : "Fjalëkalimi juaj për kyçe privatë s’përputhet më me fjalëkalimin për hyrjet.",
"Set your old private key password to your current log-in password:" : "Fjalëkalimit të vjetër të kyçit privat jepini vlerën e fjalëkalimit tuaj të tanishëm për hyrjet:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " Nëse s’e mbani mend fjalëkalimin tuaj të vjetër, mund t’i kërkoni përgjegjësit tuaj të rimarrë kartelat tuaja.",
"Old log-in password" : "Fjalëkalimi i vjetër për hyrjet",
"Current log-in password" : "Fjalëkalimi i tanishëm për hyrjet",
"Update Private Key Password" : "Përditësoni Fjalëkalim Kyçi Privat",
diff --git a/apps/encryption/l10n/sq.json b/apps/encryption/l10n/sq.json
index 1d8f48585e9..5e3473173e6 100644
--- a/apps/encryption/l10n/sq.json
+++ b/apps/encryption/l10n/sq.json
@@ -42,7 +42,6 @@
"Basic encryption module" : "Modul i thjeshtë fshehtëzimesh",
"Your private key password no longer matches your log-in password." : "Fjalëkalimi juaj për kyçe privatë s’përputhet më me fjalëkalimin për hyrjet.",
"Set your old private key password to your current log-in password:" : "Fjalëkalimit të vjetër të kyçit privat jepini vlerën e fjalëkalimit tuaj të tanishëm për hyrjet:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " Nëse s’e mbani mend fjalëkalimin tuaj të vjetër, mund t’i kërkoni përgjegjësit tuaj të rimarrë kartelat tuaja.",
"Old log-in password" : "Fjalëkalimi i vjetër për hyrjet",
"Current log-in password" : "Fjalëkalimi i tanishëm për hyrjet",
"Update Private Key Password" : "Përditësoni Fjalëkalim Kyçi Privat",
diff --git a/apps/encryption/l10n/sr.js b/apps/encryption/l10n/sr.js
index 68c30a8c9f0..702c5973a34 100644
--- a/apps/encryption/l10n/sr.js
+++ b/apps/encryption/l10n/sr.js
@@ -53,7 +53,7 @@ OC.L10N.register(
"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." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
"Old log-in password" : "Стара лозинка за пријаву",
"Current log-in password" : "Тренутна лозинка за пријаву",
"Update Private Key Password" : "Ажурирај лозинку личног кључа",
diff --git a/apps/encryption/l10n/sr.json b/apps/encryption/l10n/sr.json
index 21d1cbf089d..a3002397263 100644
--- a/apps/encryption/l10n/sr.json
+++ b/apps/encryption/l10n/sr.json
@@ -51,7 +51,7 @@
"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." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
"Old log-in password" : "Стара лозинка за пријаву",
"Current log-in password" : "Тренутна лозинка за пријаву",
"Update Private Key Password" : "Ажурирај лозинку личног кључа",
diff --git a/apps/encryption/l10n/sr@latin.js b/apps/encryption/l10n/sr@latin.js
deleted file mode 100644
index d784912394c..00000000000
--- a/apps/encryption/l10n/sr@latin.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "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 Aplikaciju za šifrovanje. Molimo da osvežite vašu lozinku privatnog ključa u ličnim podešavanjima kako bi dobili pristup šifrovanim fajlovima.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.",
- "The share will expire on %s." : "Deljeni sadržaj će isteći: %s",
- "Cheers!" : "U zdravlje!",
- "Disabled" : "Onemogućeno"
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/encryption/l10n/sr@latin.json b/apps/encryption/l10n/sr@latin.json
deleted file mode 100644
index cb3a38ecf72..00000000000
--- a/apps/encryption/l10n/sr@latin.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
- "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 Aplikaciju za šifrovanje. Molimo da osvežite vašu lozinku privatnog ključa u ličnim podešavanjima kako bi dobili pristup šifrovanim fajlovima.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.",
- "The share will expire on %s." : "Deljeni sadržaj će isteći: %s",
- "Cheers!" : "U zdravlje!",
- "Disabled" : "Onemogućeno"
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/sv.js b/apps/encryption/l10n/sv.js
index 248a91e7089..0804e976a48 100644
--- a/apps/encryption/l10n/sv.js
+++ b/apps/encryption/l10n/sv.js
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Kryptering",
"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:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
"Old log-in password" : "Gammalt inloggningslösenord",
"Current log-in password" : "Nuvarande inloggningslösenord",
"Update Private Key Password" : "Uppdatera lösenordet för din privata nyckel",
diff --git a/apps/encryption/l10n/sv.json b/apps/encryption/l10n/sv.json
index 000d5cbdf35..2715863250b 100644
--- a/apps/encryption/l10n/sv.json
+++ b/apps/encryption/l10n/sv.json
@@ -51,7 +51,7 @@
"Basic encryption module" : "Kryptering",
"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:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
"Old log-in password" : "Gammalt inloggningslösenord",
"Current log-in password" : "Nuvarande inloggningslösenord",
"Update Private Key Password" : "Uppdatera lösenordet för din privata nyckel",
diff --git a/apps/encryption/l10n/sw.js b/apps/encryption/l10n/sw.js
new file mode 100644
index 00000000000..47dd00c5388
--- /dev/null
+++ b/apps/encryption/l10n/sw.js
@@ -0,0 +1,65 @@
+OC.L10N.register(
+ "encryption",
+ {
+ "Missing recovery key password" : "Nenosiri la ufunguo wa kurejesha halipo",
+ "Please repeat the recovery key password" : "Tafadhali rudia nenosiri la ufunguo wa kurejesha",
+ "Repeated recovery key password does not match the provided recovery key password" : "Nenosiri linalorudiwa la ufunguo wa kurejesha halilingani na nenosiri ulilopewa la ufunguo wa urejeshaji",
+ "Recovery key successfully enabled" : "Ufunguo wa kurejesha umewezeshwa",
+ "Could not enable recovery key. Please check your recovery key password!" : "Haikuweza kuwasha ufunguo wa kurejesha akaunti. Tafadhali angalia nenosiri lako la ufunguo wa kurejesha akaunti!",
+ "Recovery key successfully disabled" : "Ufunguo wa kurejesha umezimwa",
+ "Could not disable recovery key. Please check your recovery key password!" : "Haikuweza kuzima ufunguo wa kurejesha. Tafadhali angalia nenosiri lako la ufunguo wa kurejesha akaunti!",
+ "Missing parameters" : "Vigezo vinavyokosekana",
+ "Please provide the old recovery password" : "Tafadhali toa nenosiri la zamani la urejeshi",
+ "Please provide a new recovery password" : " Tafadhali toa nenosiri jipya la kurejesha akaunti",
+ "Please repeat the new recovery password" : "Tafadhali rudia nenosiri jipya la kurejesha akaunti",
+ "Password successfully changed." : "Nenosiri limebadilishwa kikamilifu",
+ "Could not change the password. Maybe the old password was not correct." : "Haikuweza kubadilisha nenosiri. Labda nenosiri la zamani halikuwa sahihi.",
+ "Recovery Key disabled" : "Ufunguo wa Urejeshaji umezimwa",
+ "Recovery Key enabled" : "Ufunguo wa Urejeshaji umewashwa",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Haikuweza kuwasha ufunguo wa kurejesha ufikiaji wa akaunti, tafadhali jaribu tena au wasiliana na msimamizi wako",
+ "Could not update the private key password." : "Haikuweza kusasisha nenosiri la ufunguo wa faragha.",
+ "The old password was not correct, please try again." : "Nenosiri la zamani halikuwa sahihi, tafadhali jaribu tena.",
+ "The current log-in password was not correct, please try again." : "Nenosiri la sasa la kuingia halikuwa sahihi, tafadhali jaribu tena.",
+ "Private key password successfully updated." : "Nenosiri la ufunguo wa faragha limesasishwa.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ufunguo wa faragha si sahihi kwa programu ya usimbaji fiche. Tafadhali sasisha nenosiri lako la ufunguo wa faragha katika mipangilio yako ya kibinafsi ili kurejesha ufikiaji wa faili zako zilizosimbwa.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Programu ya Usimbaji fiche imewashwa, lakini funguo zako hazijaanzishwa. Tafadhali ondoka na uingie tena.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Tafadhali wezesha usimbaji fiche wa upande wa seva katika mipangilio ya msimamizi ili kutumia sehemu ya usimbaji.",
+ "Encryption app is enabled and ready" : "Programu ya usimbaji fiche imewashwa na iko tayari",
+ "Bad Signature" : "Sahihi mbaya",
+ "Missing Signature" : "Inakosa Sahihi",
+ "one-time password for server-side-encryption" : "nenosiri la wakati mmoja la usimbaji fiche wa upande wa seva",
+ "Encryption password" : "Nenosiri la usimbaji fiche",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Utawala uliwezesha usimbaji fiche wa upande wa seva. Faili zako zilisimbwa kwa njia fiche kwa kutumia nenosiri <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Utawala uliwezesha usimbaji fiche wa upande wa seva. Faili zako zilisimbwa kwa njia fiche kwa kutumia nenosiri \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Tafadhali ingia kwenye kiolesura cha wavuti, nenda kwenye sehemu ya \"Usalama\" ya mipangilio yako ya kibinafsi na usasishe nenosiri lako la usimbaji kwa kuingiza nenosiri hili kwenye sehemu ya \"Nenosiri la zamani la kuingia\" na nenosiri lako la sasa la kuingia.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Haiwezi kusimbua faili hii, pengine hii ni faili iliyoshirikiwa. Tafadhali mwombe mwenye faili kushiriki upya faili nawe.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Haiwezi kusoma faili hii, labda hii ni faili iliyoshirikiwa. Tafadhali mwombe mwenye faili kushiriki upya faili nawe.",
+ "Default encryption module" : " Moduli chaguo-msingi ya usimbaji fiche",
+ "Default encryption module for server-side encryption" : "Sehemu chaguo-msingi ya usimbaji fiche kwa usimbaji wa upande wa seva",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Ili kutumia sehemu hii ya usimbaji fiche unahitaji kuwezesha usimbaji fiche wa upande wa seva katika mipangilio ya msimamizi. Mara baada ya kuwezeshwa sehemu hii itasimba kwa njia fiche faili zako zote kwa uwazi. Usimbaji fiche unategemea funguo za AES 256.\nSehemu hii haitagusa faili zilizopo, ni faili mpya pekee zitakazosimbwa kwa njia fiche baada ya usimbaji fiche wa upande wa seva kuwashwa. Pia haiwezekani kuzima usimbaji fiche tena na kurudi kwenye mfumo ambao haujasimbwa.\nTafadhali soma hati ili kujua athari zote kabla ya kuamua kuwezesha usimbaji fiche wa upande wa seva.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Programu ya usimbaji fiche imewashwa lakini funguo zako hazijaanzishwa, tafadhali toka na uingie tena",
+ "Encrypt the home storage" : "Simba hifadhi ya nyumbani kwa njia fiche",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Kuwasha chaguo hili husimba kwa njia fiche faili zote zilizohifadhiwa kwenye hifadhi kuu, vinginevyo faili zilizo kwenye hifadhi ya nje pekee ndizo zitasimbwa kwa njia fiche",
+ "Enable recovery key" : "Washa ufunguo wa kurejesha",
+ "Disable recovery key" : "Zima ufunguo wa kurejesha",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Ufunguo wa kurejesha ni ufunguo wa ziada wa usimbaji fiche unaotumiwa kusimba faili kwa njia fiche. Inatumika kurejesha faili kutoka kwa akaunti ikiwa nenosiri limesahau.",
+ "Recovery key password" : "Nenosiri la ufunguo wa kurejesha",
+ "Repeat recovery key password" : "Rudia nenosiri la ufunguo wa kurejesha",
+ "Change recovery key password:" : "Badilisha nenosiri la ufunguo wa kurejesha:",
+ "Old recovery key password" : " Nenosiri la zamani la ufunguo wa kurejesha",
+ "New recovery key password" : "Nenosiri mpya la ufunguo wa kurejesha akaunti",
+ "Repeat new recovery key password" : "Rudia ufunguo mpya wa uokoaji",
+ "Change Password" : "Badili nenosiri",
+ "Basic encryption module" : "Moduli ya msingi ya usimbaji fiche",
+ "Your private key password no longer matches your log-in password." : "Nenosiri lako la ufunguo wa faragha halilingani tena na nenosiri lako la kuingia.",
+ "Set your old private key password to your current log-in password:" : "Weka nenosiri lako la zamani la ufunguo wa kibinafsi kwa nenosiri lako la sasa la kuingia:",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ikiwa hukumbuki nenosiri lako la zamani unaweza kumwomba msimamizi wako kurejesha faili zako.",
+ "Old log-in password" : "Nenosiri la zamani la kuingia",
+ "Current log-in password" : "Nenosiri la sasa la kuingia",
+ "Update Private Key Password" : "Sasisha Nenosiri la Ufunguo wa Kibinafsi",
+ "Enable password recovery:" : "Washa urejeshaji wa nenosiri:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Kuwasha chaguo hili kutakuruhusu kupata tena ufikiaji wa faili zako zilizosimbwa ikiwa utapoteza nenosiri",
+ "Enabled" : "Washwa",
+ "Disabled" : "Zimwa"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/sw.json b/apps/encryption/l10n/sw.json
new file mode 100644
index 00000000000..0e19c9cb3f2
--- /dev/null
+++ b/apps/encryption/l10n/sw.json
@@ -0,0 +1,63 @@
+{ "translations": {
+ "Missing recovery key password" : "Nenosiri la ufunguo wa kurejesha halipo",
+ "Please repeat the recovery key password" : "Tafadhali rudia nenosiri la ufunguo wa kurejesha",
+ "Repeated recovery key password does not match the provided recovery key password" : "Nenosiri linalorudiwa la ufunguo wa kurejesha halilingani na nenosiri ulilopewa la ufunguo wa urejeshaji",
+ "Recovery key successfully enabled" : "Ufunguo wa kurejesha umewezeshwa",
+ "Could not enable recovery key. Please check your recovery key password!" : "Haikuweza kuwasha ufunguo wa kurejesha akaunti. Tafadhali angalia nenosiri lako la ufunguo wa kurejesha akaunti!",
+ "Recovery key successfully disabled" : "Ufunguo wa kurejesha umezimwa",
+ "Could not disable recovery key. Please check your recovery key password!" : "Haikuweza kuzima ufunguo wa kurejesha. Tafadhali angalia nenosiri lako la ufunguo wa kurejesha akaunti!",
+ "Missing parameters" : "Vigezo vinavyokosekana",
+ "Please provide the old recovery password" : "Tafadhali toa nenosiri la zamani la urejeshi",
+ "Please provide a new recovery password" : " Tafadhali toa nenosiri jipya la kurejesha akaunti",
+ "Please repeat the new recovery password" : "Tafadhali rudia nenosiri jipya la kurejesha akaunti",
+ "Password successfully changed." : "Nenosiri limebadilishwa kikamilifu",
+ "Could not change the password. Maybe the old password was not correct." : "Haikuweza kubadilisha nenosiri. Labda nenosiri la zamani halikuwa sahihi.",
+ "Recovery Key disabled" : "Ufunguo wa Urejeshaji umezimwa",
+ "Recovery Key enabled" : "Ufunguo wa Urejeshaji umewashwa",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Haikuweza kuwasha ufunguo wa kurejesha ufikiaji wa akaunti, tafadhali jaribu tena au wasiliana na msimamizi wako",
+ "Could not update the private key password." : "Haikuweza kusasisha nenosiri la ufunguo wa faragha.",
+ "The old password was not correct, please try again." : "Nenosiri la zamani halikuwa sahihi, tafadhali jaribu tena.",
+ "The current log-in password was not correct, please try again." : "Nenosiri la sasa la kuingia halikuwa sahihi, tafadhali jaribu tena.",
+ "Private key password successfully updated." : "Nenosiri la ufunguo wa faragha limesasishwa.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ufunguo wa faragha si sahihi kwa programu ya usimbaji fiche. Tafadhali sasisha nenosiri lako la ufunguo wa faragha katika mipangilio yako ya kibinafsi ili kurejesha ufikiaji wa faili zako zilizosimbwa.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Programu ya Usimbaji fiche imewashwa, lakini funguo zako hazijaanzishwa. Tafadhali ondoka na uingie tena.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Tafadhali wezesha usimbaji fiche wa upande wa seva katika mipangilio ya msimamizi ili kutumia sehemu ya usimbaji.",
+ "Encryption app is enabled and ready" : "Programu ya usimbaji fiche imewashwa na iko tayari",
+ "Bad Signature" : "Sahihi mbaya",
+ "Missing Signature" : "Inakosa Sahihi",
+ "one-time password for server-side-encryption" : "nenosiri la wakati mmoja la usimbaji fiche wa upande wa seva",
+ "Encryption password" : "Nenosiri la usimbaji fiche",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Utawala uliwezesha usimbaji fiche wa upande wa seva. Faili zako zilisimbwa kwa njia fiche kwa kutumia nenosiri <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Utawala uliwezesha usimbaji fiche wa upande wa seva. Faili zako zilisimbwa kwa njia fiche kwa kutumia nenosiri \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Tafadhali ingia kwenye kiolesura cha wavuti, nenda kwenye sehemu ya \"Usalama\" ya mipangilio yako ya kibinafsi na usasishe nenosiri lako la usimbaji kwa kuingiza nenosiri hili kwenye sehemu ya \"Nenosiri la zamani la kuingia\" na nenosiri lako la sasa la kuingia.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Haiwezi kusimbua faili hii, pengine hii ni faili iliyoshirikiwa. Tafadhali mwombe mwenye faili kushiriki upya faili nawe.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Haiwezi kusoma faili hii, labda hii ni faili iliyoshirikiwa. Tafadhali mwombe mwenye faili kushiriki upya faili nawe.",
+ "Default encryption module" : " Moduli chaguo-msingi ya usimbaji fiche",
+ "Default encryption module for server-side encryption" : "Sehemu chaguo-msingi ya usimbaji fiche kwa usimbaji wa upande wa seva",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Ili kutumia sehemu hii ya usimbaji fiche unahitaji kuwezesha usimbaji fiche wa upande wa seva katika mipangilio ya msimamizi. Mara baada ya kuwezeshwa sehemu hii itasimba kwa njia fiche faili zako zote kwa uwazi. Usimbaji fiche unategemea funguo za AES 256.\nSehemu hii haitagusa faili zilizopo, ni faili mpya pekee zitakazosimbwa kwa njia fiche baada ya usimbaji fiche wa upande wa seva kuwashwa. Pia haiwezekani kuzima usimbaji fiche tena na kurudi kwenye mfumo ambao haujasimbwa.\nTafadhali soma hati ili kujua athari zote kabla ya kuamua kuwezesha usimbaji fiche wa upande wa seva.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Programu ya usimbaji fiche imewashwa lakini funguo zako hazijaanzishwa, tafadhali toka na uingie tena",
+ "Encrypt the home storage" : "Simba hifadhi ya nyumbani kwa njia fiche",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Kuwasha chaguo hili husimba kwa njia fiche faili zote zilizohifadhiwa kwenye hifadhi kuu, vinginevyo faili zilizo kwenye hifadhi ya nje pekee ndizo zitasimbwa kwa njia fiche",
+ "Enable recovery key" : "Washa ufunguo wa kurejesha",
+ "Disable recovery key" : "Zima ufunguo wa kurejesha",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Ufunguo wa kurejesha ni ufunguo wa ziada wa usimbaji fiche unaotumiwa kusimba faili kwa njia fiche. Inatumika kurejesha faili kutoka kwa akaunti ikiwa nenosiri limesahau.",
+ "Recovery key password" : "Nenosiri la ufunguo wa kurejesha",
+ "Repeat recovery key password" : "Rudia nenosiri la ufunguo wa kurejesha",
+ "Change recovery key password:" : "Badilisha nenosiri la ufunguo wa kurejesha:",
+ "Old recovery key password" : " Nenosiri la zamani la ufunguo wa kurejesha",
+ "New recovery key password" : "Nenosiri mpya la ufunguo wa kurejesha akaunti",
+ "Repeat new recovery key password" : "Rudia ufunguo mpya wa uokoaji",
+ "Change Password" : "Badili nenosiri",
+ "Basic encryption module" : "Moduli ya msingi ya usimbaji fiche",
+ "Your private key password no longer matches your log-in password." : "Nenosiri lako la ufunguo wa faragha halilingani tena na nenosiri lako la kuingia.",
+ "Set your old private key password to your current log-in password:" : "Weka nenosiri lako la zamani la ufunguo wa kibinafsi kwa nenosiri lako la sasa la kuingia:",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ikiwa hukumbuki nenosiri lako la zamani unaweza kumwomba msimamizi wako kurejesha faili zako.",
+ "Old log-in password" : "Nenosiri la zamani la kuingia",
+ "Current log-in password" : "Nenosiri la sasa la kuingia",
+ "Update Private Key Password" : "Sasisha Nenosiri la Ufunguo wa Kibinafsi",
+ "Enable password recovery:" : "Washa urejeshaji wa nenosiri:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Kuwasha chaguo hili kutakuruhusu kupata tena ufikiaji wa faili zako zilizosimbwa ikiwa utapoteza nenosiri",
+ "Enabled" : "Washwa",
+ "Disabled" : "Zimwa"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+} \ No newline at end of file
diff --git a/apps/encryption/l10n/th.js b/apps/encryption/l10n/th.js
index e6f175a8f59..a735f1bff1f 100644
--- a/apps/encryption/l10n/th.js
+++ b/apps/encryption/l10n/th.js
@@ -37,7 +37,6 @@ OC.L10N.register(
"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:" : "ตั้งรหัสผ่านคีย์ส่วนตัวเก่าของคุณเป็นรหัสผ่านเข้าสู่ระบบปัจจุบันของคุณ:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "ถ้าคุณลืมรหัสผ่านเก่าของคุณ คุณสามารถขอให้ผู้ดูแลระบบกู้คืนไฟล์ของคุณ",
"Old log-in password" : "รหัสผ่านเข้าสู่ระบบเดิม",
"Current log-in password" : "รหัสผ่านเข้าสู่ระบบปัจจุบัน",
"Update Private Key Password" : "อัปเดตรหัสผ่านคีย์ส่วนตัว",
diff --git a/apps/encryption/l10n/th.json b/apps/encryption/l10n/th.json
index 80c6943d7b2..017602e4584 100644
--- a/apps/encryption/l10n/th.json
+++ b/apps/encryption/l10n/th.json
@@ -35,7 +35,6 @@
"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:" : "ตั้งรหัสผ่านคีย์ส่วนตัวเก่าของคุณเป็นรหัสผ่านเข้าสู่ระบบปัจจุบันของคุณ:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "ถ้าคุณลืมรหัสผ่านเก่าของคุณ คุณสามารถขอให้ผู้ดูแลระบบกู้คืนไฟล์ของคุณ",
"Old log-in password" : "รหัสผ่านเข้าสู่ระบบเดิม",
"Current log-in password" : "รหัสผ่านเข้าสู่ระบบปัจจุบัน",
"Update Private Key Password" : "อัปเดตรหัสผ่านคีย์ส่วนตัว",
diff --git a/apps/encryption/l10n/tr.js b/apps/encryption/l10n/tr.js
index 6e0b4ce519a..dad06799b7e 100644
--- a/apps/encryption/l10n/tr.js
+++ b/apps/encryption/l10n/tr.js
@@ -1,36 +1,36 @@
OC.L10N.register(
"encryption",
{
- "Missing recovery key password" : "Geri yükleme anahtarı parolası eksik",
- "Please repeat the recovery key password" : "Geri yükleme anahtarı parolasını yeniden yazın",
- "Repeated recovery key password does not match the provided recovery key password" : "Geri yükleme anahtarı parolası ile onayı aynı değil",
- "Recovery key successfully enabled" : "Geri yükleme anahtarı kullanıma alındı",
- "Could not enable recovery key. Please check your recovery key password!" : "Geri yükleme anahtarı kullanıma alınamadı. Lütfen geri yükleme anahtarı parolanızı denetleyin!",
- "Recovery key successfully disabled" : "Geri yükleme anahtarı kullanımdan kaldırıldı",
- "Could not disable recovery key. Please check your recovery key password!" : "Geri yükleme anahtarı kullanımdan kaldırılamadı. Lütfen geri yükleme anahtarı parolanızı denetleyin!",
+ "Missing recovery key password" : "Kurtarma anahtarı parolası eksik",
+ "Please repeat the recovery key password" : "Kurtarma anahtarı parolasını yeniden yazın",
+ "Repeated recovery key password does not match the provided recovery key password" : "Kurtarma anahtarı parolası ile onayı aynı değil",
+ "Recovery key successfully enabled" : "Kurtarma anahtarı kullanıma alındı",
+ "Could not enable recovery key. Please check your recovery key password!" : "Kurtarma anahtarı kullanıma alınamadı. Lütfen kurtarma anahtarı parolanızı denetleyin!",
+ "Recovery key successfully disabled" : "Kurtarma anahtarı kullanımdan kaldırıldı",
+ "Could not disable recovery key. Please check your recovery key password!" : "Kurtarma anahtarı kullanımdan kaldırılamadı. Lütfen kurtarma anahtarı parolanızı denetleyin!",
"Missing parameters" : "Parametreler eksik",
- "Please provide the old recovery password" : "Lütfen eski geri yükleme parolasını yazın",
- "Please provide a new recovery password" : "Lütfen yeni geri yükleme parolasını yazın",
- "Please repeat the new recovery password" : "Lütfen yeni geri yükleme parolasını yeniden yazın",
+ "Please provide the old recovery password" : "Lütfen eski kurtarma parolasını yazın",
+ "Please provide a new recovery password" : "Lütfen yeni kurtarma parolasını yazın",
+ "Please repeat the new recovery password" : "Lütfen yeni kurtarma parolasını yeniden yazın",
"Password successfully changed." : "Parola değiştirildi.",
"Could not change the password. Maybe the old password was not correct." : "Parola değiştirilemedi. Eski parolanızı doğru yazmamış olabilirsiniz.",
- "Recovery Key disabled" : "Geri yükleme anahtarı kullanımdan kaldırılmış",
- "Recovery Key enabled" : "Geri yükleme anahtarı kullanıma alındı",
- "Could not enable the recovery key, please try again or contact your administrator" : "Geri yükleme anahtarı kullanıma alınamadı, yeniden deneyin ya da BT yöneticisi ile görüşün",
+ "Recovery Key disabled" : "Kurtarma anahtarı kullanımdan kaldırıldı",
+ "Recovery Key enabled" : "Kurtarma anahtarı kullanıma alındı",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Kurtarma anahtarı kullanıma alınamadı. Yeniden deneyin ya da BT yöneticisi ile görüşün",
"Could not update the private key password." : "Kişisel anahtar parolası güncellenemedi",
"The old password was not correct, please try again." : "Eski parola doğru değil, lütfen yeniden deneyin.",
"The current log-in password was not correct, please try again." : "Geçerli oturum açma parolası doğru değil, lütfen yeniden deneyin.",
"Private key password successfully updated." : "Kişisel anahtar parolası 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ı kişisel anahtarı geçersiz. Şifrelenmiş dosyalarınıza erişebilmek için kişisel ayarlarınızdaki kişisel anahtar parolanızı güncelleyin.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Şifreleme uygulaması kullanıma alınmış ancak anahtarlarınız hazırlanmamış. Lütfen oturumunuzu kapatıp yeniden açın",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Şifreleme modülünü kullanabilmek için yönetici ayarlarından sunucu tarafında şifreleme seçeneğini kullanıma alın.",
- "Encryption app is enabled and ready" : "Şifreleme uygulaması kullanıma alınmış ve hazır",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Şifreleme uygulaması kullanıma alınmış ancak anahtarlarınız hazırlanmamış. Lütfen oturumunuzu kapatıp yeniden açın.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Şifreleme modülünü kullanabilmek için yönetici ayarlarından sunucu tarafında şifreleme seçeneğini açın.",
+ "Encryption app is enabled and ready" : "Şifreleme uygulaması kullanıma alındı ve hazır",
"Bad Signature" : "İmza bozuk",
"Missing Signature" : "İmza eksik",
"one-time password for server-side-encryption" : "sunucu tarafında şifreleme için tek kullanımlık parola",
"Encryption password" : "Şifreleme parolası",
- "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Yönetici, sunucu tarafında şifrelemeyi kullanıma almış. Dosyalarınız <strong>%s</strong> parolası ile şifrelendi.",
- "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Yönetici, sunucu tarafında şifrelemeyi kullanıma almış. Dosyalarınız \"<strong>%s</strong>\" parolası ile şifrelendi.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Yönetici, sunucu tarafında şifreleme özelliğini açmış. Dosyalarınız <strong>%s</strong> parolası ile şifrelendi.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Yönetici, sunucu tarafında şifreleme özelliğini açmış. Dosyalarınız \"%s\" parolası ile şifrelendi.",
"Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Lütfen yönetim bölümünden oturum açarak kişisel ayarlarınızdaki \"Güvenlik\" bölümüne gidin ve \"Eski oturum açma parolası\" alanına bu parolayı ve geçerli oturum açma parolanızı yazarak şifreleme parolanızı güncelleyin.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosyanın şifresi çözülemedi ve büyük olasılıkla paylaşılan bir dosya. Lütfen dosya sahibi ile görüşerek sizinle yeniden paylaşmasını isteyin.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya okunamadı ve büyük olasılıkla paylaşılan bir dosya. Lütfen dosya sahibi ile görüşerek sizinle yeniden paylaşmasını isteyin.",
@@ -39,7 +39,7 @@ OC.L10N.register(
"In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Bu şifreleme modülünün kullanılması için sunucu tarafında yönetim bölümünden şifreleme seçeneği açılmalıdır. Bu modül kullanıma alındıktan sonra tüm dosyalarınızı size farkettirmeden şifreler. Şifreleme AES 256 anahtarları ile yapılır. \nModül var olan dosyaları değiştirmez, yalnızca sunucu tarafında şifreleme açıldıktan sonra eklenen yeni dosyalar şifrelenir. Şifreleme açıldıktan sonra kapatılamaz ve şifreleme olmayan sisteme geri dönülemez.\nLütfen sunucu tarafı şifrelemeyi açmadan önce belgeleri okuyun ve uygulamadan doğacak tüm sonuçlarını öğrenin.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme uygulaması kullanıma alınmış ancak anahtarlarınız hazırlanmamış. Lütfen oturumunuzu kapatıp yeniden açın.",
"Encrypt the home storage" : "Ana depolama şifrelensin",
- "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Bu seçenek kullanıma alındığında, ana depolama alanındaki tüm dosyalar şifrelenir. Kullanımdan kaldırıldığında yalnızca dış depolama alanındaki dosyalar şifrelenir",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Bu seçenek açıldığında, ana depolama alanındaki tüm dosyalar şifrelenir. Kapatıldığında, yalnızca dış depolama alanındaki dosyalar şifrelenir",
"Enable recovery key" : "Kurtarma anahtarını kullanıma al",
"Disable recovery key" : "Kurtarma anahtarını kullanımdan kaldır",
"The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Kurtarma anahtarı, dosyaları şifrelemek için kullanılan ek bir şifreleme anahtarıdır. Parolanın unutulması durumunda hesaptaki dosyaları kurtarmak için kullanılır.",
@@ -53,13 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "Temel şifreleme modülü",
"Your private key password no longer matches your log-in password." : "Kişisel anahtar parolanız artık oturum açma parolanız ile eşleşmiyor.",
"Set your old private key password to your current log-in password:" : "Eski kişisel anahtar parolanızı, geçerli oturum açma parolanız olarak ayarlayın:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Eski parolanızı hatırlamıyorsanız, BT yöneticinizden dosyalarınızı kurtarmasını isteyebilirsiniz.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Eski parolanızı hatırlamıyorsanız, BT yöneticinizden dosyalarınızı kurtarmasını isteyebilirsiniz.",
"Old log-in password" : "Eski oturum açma parolası",
"Current log-in password" : "Geçerli oturum açma parolası",
"Update Private Key Password" : "Kişisel anahtar parolasını güncelle",
- "Enable password recovery:" : "Parola kurtarma özelliğini kullanıma al:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu seçenek kullanıma alındığında, parolayı unutursanız şifrelenmiş dosyalarınıza yeniden erişim izni elde edebilirsiniz",
- "Enabled" : "Kullanıma alınmış",
- "Disabled" : "Kullanımdan kaldırılmış"
+ "Enable password recovery:" : "Parola kurtarma özelliğini aç:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu seçenek açıldığında, parolayı unutursanız şifrelenmiş dosyalarınıza yeniden erişim izni elde edebilirsiniz",
+ "Enabled" : "Açık",
+ "Disabled" : "Kapalı"
},
"nplurals=2; plural=(n > 1);");
diff --git a/apps/encryption/l10n/tr.json b/apps/encryption/l10n/tr.json
index 796c412241c..4f3ff388ad1 100644
--- a/apps/encryption/l10n/tr.json
+++ b/apps/encryption/l10n/tr.json
@@ -1,34 +1,34 @@
{ "translations": {
- "Missing recovery key password" : "Geri yükleme anahtarı parolası eksik",
- "Please repeat the recovery key password" : "Geri yükleme anahtarı parolasını yeniden yazın",
- "Repeated recovery key password does not match the provided recovery key password" : "Geri yükleme anahtarı parolası ile onayı aynı değil",
- "Recovery key successfully enabled" : "Geri yükleme anahtarı kullanıma alındı",
- "Could not enable recovery key. Please check your recovery key password!" : "Geri yükleme anahtarı kullanıma alınamadı. Lütfen geri yükleme anahtarı parolanızı denetleyin!",
- "Recovery key successfully disabled" : "Geri yükleme anahtarı kullanımdan kaldırıldı",
- "Could not disable recovery key. Please check your recovery key password!" : "Geri yükleme anahtarı kullanımdan kaldırılamadı. Lütfen geri yükleme anahtarı parolanızı denetleyin!",
+ "Missing recovery key password" : "Kurtarma anahtarı parolası eksik",
+ "Please repeat the recovery key password" : "Kurtarma anahtarı parolasını yeniden yazın",
+ "Repeated recovery key password does not match the provided recovery key password" : "Kurtarma anahtarı parolası ile onayı aynı değil",
+ "Recovery key successfully enabled" : "Kurtarma anahtarı kullanıma alındı",
+ "Could not enable recovery key. Please check your recovery key password!" : "Kurtarma anahtarı kullanıma alınamadı. Lütfen kurtarma anahtarı parolanızı denetleyin!",
+ "Recovery key successfully disabled" : "Kurtarma anahtarı kullanımdan kaldırıldı",
+ "Could not disable recovery key. Please check your recovery key password!" : "Kurtarma anahtarı kullanımdan kaldırılamadı. Lütfen kurtarma anahtarı parolanızı denetleyin!",
"Missing parameters" : "Parametreler eksik",
- "Please provide the old recovery password" : "Lütfen eski geri yükleme parolasını yazın",
- "Please provide a new recovery password" : "Lütfen yeni geri yükleme parolasını yazın",
- "Please repeat the new recovery password" : "Lütfen yeni geri yükleme parolasını yeniden yazın",
+ "Please provide the old recovery password" : "Lütfen eski kurtarma parolasını yazın",
+ "Please provide a new recovery password" : "Lütfen yeni kurtarma parolasını yazın",
+ "Please repeat the new recovery password" : "Lütfen yeni kurtarma parolasını yeniden yazın",
"Password successfully changed." : "Parola değiştirildi.",
"Could not change the password. Maybe the old password was not correct." : "Parola değiştirilemedi. Eski parolanızı doğru yazmamış olabilirsiniz.",
- "Recovery Key disabled" : "Geri yükleme anahtarı kullanımdan kaldırılmış",
- "Recovery Key enabled" : "Geri yükleme anahtarı kullanıma alındı",
- "Could not enable the recovery key, please try again or contact your administrator" : "Geri yükleme anahtarı kullanıma alınamadı, yeniden deneyin ya da BT yöneticisi ile görüşün",
+ "Recovery Key disabled" : "Kurtarma anahtarı kullanımdan kaldırıldı",
+ "Recovery Key enabled" : "Kurtarma anahtarı kullanıma alındı",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Kurtarma anahtarı kullanıma alınamadı. Yeniden deneyin ya da BT yöneticisi ile görüşün",
"Could not update the private key password." : "Kişisel anahtar parolası güncellenemedi",
"The old password was not correct, please try again." : "Eski parola doğru değil, lütfen yeniden deneyin.",
"The current log-in password was not correct, please try again." : "Geçerli oturum açma parolası doğru değil, lütfen yeniden deneyin.",
"Private key password successfully updated." : "Kişisel anahtar parolası 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ı kişisel anahtarı geçersiz. Şifrelenmiş dosyalarınıza erişebilmek için kişisel ayarlarınızdaki kişisel anahtar parolanızı güncelleyin.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Şifreleme uygulaması kullanıma alınmış ancak anahtarlarınız hazırlanmamış. Lütfen oturumunuzu kapatıp yeniden açın",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Şifreleme modülünü kullanabilmek için yönetici ayarlarından sunucu tarafında şifreleme seçeneğini kullanıma alın.",
- "Encryption app is enabled and ready" : "Şifreleme uygulaması kullanıma alınmış ve hazır",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Şifreleme uygulaması kullanıma alınmış ancak anahtarlarınız hazırlanmamış. Lütfen oturumunuzu kapatıp yeniden açın.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Şifreleme modülünü kullanabilmek için yönetici ayarlarından sunucu tarafında şifreleme seçeneğini açın.",
+ "Encryption app is enabled and ready" : "Şifreleme uygulaması kullanıma alındı ve hazır",
"Bad Signature" : "İmza bozuk",
"Missing Signature" : "İmza eksik",
"one-time password for server-side-encryption" : "sunucu tarafında şifreleme için tek kullanımlık parola",
"Encryption password" : "Şifreleme parolası",
- "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Yönetici, sunucu tarafında şifrelemeyi kullanıma almış. Dosyalarınız <strong>%s</strong> parolası ile şifrelendi.",
- "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Yönetici, sunucu tarafında şifrelemeyi kullanıma almış. Dosyalarınız \"<strong>%s</strong>\" parolası ile şifrelendi.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Yönetici, sunucu tarafında şifreleme özelliğini açmış. Dosyalarınız <strong>%s</strong> parolası ile şifrelendi.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Yönetici, sunucu tarafında şifreleme özelliğini açmış. Dosyalarınız \"%s\" parolası ile şifrelendi.",
"Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Lütfen yönetim bölümünden oturum açarak kişisel ayarlarınızdaki \"Güvenlik\" bölümüne gidin ve \"Eski oturum açma parolası\" alanına bu parolayı ve geçerli oturum açma parolanızı yazarak şifreleme parolanızı güncelleyin.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosyanın şifresi çözülemedi ve büyük olasılıkla paylaşılan bir dosya. Lütfen dosya sahibi ile görüşerek sizinle yeniden paylaşmasını isteyin.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya okunamadı ve büyük olasılıkla paylaşılan bir dosya. Lütfen dosya sahibi ile görüşerek sizinle yeniden paylaşmasını isteyin.",
@@ -37,7 +37,7 @@
"In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Bu şifreleme modülünün kullanılması için sunucu tarafında yönetim bölümünden şifreleme seçeneği açılmalıdır. Bu modül kullanıma alındıktan sonra tüm dosyalarınızı size farkettirmeden şifreler. Şifreleme AES 256 anahtarları ile yapılır. \nModül var olan dosyaları değiştirmez, yalnızca sunucu tarafında şifreleme açıldıktan sonra eklenen yeni dosyalar şifrelenir. Şifreleme açıldıktan sonra kapatılamaz ve şifreleme olmayan sisteme geri dönülemez.\nLütfen sunucu tarafı şifrelemeyi açmadan önce belgeleri okuyun ve uygulamadan doğacak tüm sonuçlarını öğrenin.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme uygulaması kullanıma alınmış ancak anahtarlarınız hazırlanmamış. Lütfen oturumunuzu kapatıp yeniden açın.",
"Encrypt the home storage" : "Ana depolama şifrelensin",
- "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Bu seçenek kullanıma alındığında, ana depolama alanındaki tüm dosyalar şifrelenir. Kullanımdan kaldırıldığında yalnızca dış depolama alanındaki dosyalar şifrelenir",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Bu seçenek açıldığında, ana depolama alanındaki tüm dosyalar şifrelenir. Kapatıldığında, yalnızca dış depolama alanındaki dosyalar şifrelenir",
"Enable recovery key" : "Kurtarma anahtarını kullanıma al",
"Disable recovery key" : "Kurtarma anahtarını kullanımdan kaldır",
"The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Kurtarma anahtarı, dosyaları şifrelemek için kullanılan ek bir şifreleme anahtarıdır. Parolanın unutulması durumunda hesaptaki dosyaları kurtarmak için kullanılır.",
@@ -51,13 +51,13 @@
"Basic encryption module" : "Temel şifreleme modülü",
"Your private key password no longer matches your log-in password." : "Kişisel anahtar parolanız artık oturum açma parolanız ile eşleşmiyor.",
"Set your old private key password to your current log-in password:" : "Eski kişisel anahtar parolanızı, geçerli oturum açma parolanız olarak ayarlayın:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Eski parolanızı hatırlamıyorsanız, BT yöneticinizden dosyalarınızı kurtarmasını isteyebilirsiniz.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Eski parolanızı hatırlamıyorsanız, BT yöneticinizden dosyalarınızı kurtarmasını isteyebilirsiniz.",
"Old log-in password" : "Eski oturum açma parolası",
"Current log-in password" : "Geçerli oturum açma parolası",
"Update Private Key Password" : "Kişisel anahtar parolasını güncelle",
- "Enable password recovery:" : "Parola kurtarma özelliğini kullanıma al:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu seçenek kullanıma alındığında, parolayı unutursanız şifrelenmiş dosyalarınıza yeniden erişim izni elde edebilirsiniz",
- "Enabled" : "Kullanıma alınmış",
- "Disabled" : "Kullanımdan kaldırılmış"
+ "Enable password recovery:" : "Parola kurtarma özelliğini aç:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu seçenek açıldığında, parolayı unutursanız şifrelenmiş dosyalarınıza yeniden erişim izni elde edebilirsiniz",
+ "Enabled" : "Açık",
+ "Disabled" : "Kapalı"
},"pluralForm" :"nplurals=2; plural=(n > 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/ug.js b/apps/encryption/l10n/ug.js
index a0f48c7c7bf..3575f43bb5e 100644
--- a/apps/encryption/l10n/ug.js
+++ b/apps/encryption/l10n/ug.js
@@ -53,7 +53,6 @@ OC.L10N.register(
"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." : " كونا پارولىڭىزنى ئېسىڭىزدە تۇتمىسىڭىز باشقۇرغۇچىڭىزدىن ھۆججەتلىرىڭىزنى ئەسلىگە كەلتۈرۈشنى تەلەپ قىلسىڭىز بولىدۇ.",
"Old log-in password" : "كونا كىرىش پارولى",
"Current log-in password" : "نۆۋەتتىكى كىرىش پارولى",
"Update Private Key Password" : "شەخسىي ئاچقۇچ پارولىنى يېڭىلاڭ",
diff --git a/apps/encryption/l10n/ug.json b/apps/encryption/l10n/ug.json
index 1d87d9304e0..e924f446720 100644
--- a/apps/encryption/l10n/ug.json
+++ b/apps/encryption/l10n/ug.json
@@ -51,7 +51,6 @@
"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." : " كونا پارولىڭىزنى ئېسىڭىزدە تۇتمىسىڭىز باشقۇرغۇچىڭىزدىن ھۆججەتلىرىڭىزنى ئەسلىگە كەلتۈرۈشنى تەلەپ قىلسىڭىز بولىدۇ.",
"Old log-in password" : "كونا كىرىش پارولى",
"Current log-in password" : "نۆۋەتتىكى كىرىش پارولى",
"Update Private Key Password" : "شەخسىي ئاچقۇچ پارولىنى يېڭىلاڭ",
diff --git a/apps/encryption/l10n/uk.js b/apps/encryption/l10n/uk.js
index efc94c65ce4..d17b0892569 100644
--- a/apps/encryption/l10n/uk.js
+++ b/apps/encryption/l10n/uk.js
@@ -53,7 +53,7 @@ OC.L10N.register(
"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." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до адміністратора щоб його відновити.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до вашого адміністратора для відновлення ваших файлів.",
"Old log-in password" : "Старий пароль входу",
"Current log-in password" : "Поточний пароль входу",
"Update Private Key Password" : "Оновити пароль для закритого ключа",
diff --git a/apps/encryption/l10n/uk.json b/apps/encryption/l10n/uk.json
index 56030d9bd0d..6f2c589357e 100644
--- a/apps/encryption/l10n/uk.json
+++ b/apps/encryption/l10n/uk.json
@@ -51,7 +51,7 @@
"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." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до адміністратора щоб його відновити.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до вашого адміністратора для відновлення ваших файлів.",
"Old log-in password" : "Старий пароль входу",
"Current log-in password" : "Поточний пароль входу",
"Update Private Key Password" : "Оновити пароль для закритого ключа",
diff --git a/apps/encryption/l10n/ur_PK.js b/apps/encryption/l10n/ur_PK.js
deleted file mode 100644
index 9fbed2e780f..00000000000
--- a/apps/encryption/l10n/ur_PK.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Cheers!" : "واہ!"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/ur_PK.json b/apps/encryption/l10n/ur_PK.json
deleted file mode 100644
index f798bdf2a7b..00000000000
--- a/apps/encryption/l10n/ur_PK.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Cheers!" : "واہ!"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/vi.js b/apps/encryption/l10n/vi.js
deleted file mode 100644
index d325fc71661..00000000000
--- a/apps/encryption/l10n/vi.js
+++ /dev/null
@@ -1,26 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Missing recovery key password" : "Thiếu khóa khôi phục mật khẩu",
- "Please repeat the recovery key password" : "Nhập lại khóa khôi phục mật khẩu",
- "Recovery key successfully enabled" : "Khóa khôi phục kích hoạt thành công",
- "Could not enable recovery key. Please check your recovery key password!" : "Không thể kích hoạt khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
- "Recovery key successfully disabled" : "Vô hiệu hóa khóa khôi phục thành công",
- "Could not disable recovery key. Please check your recovery key password!" : "Không thể vô hiệu hóa khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
- "Password successfully changed." : "Đã đổi mật khẩu.",
- "Could not change the password. Maybe the old password was not correct." : "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
- "Private key password successfully updated." : "Cập nhật thành công mật khẩu khóa cá nhân",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại",
- "The share will expire on %s." : "Chia sẻ này sẽ hết hiệu lực vào %s.",
- "Cheers!" : "Chúc mừng!",
- "Change Password" : "Đổi Mật khẩu",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Nếu bạn không nhớ mật khẩu cũ, bạn có thể yêu cầu quản trị viên khôi phục tập tin của bạn.",
- "Old log-in password" : "Mật khẩu đăng nhập cũ",
- "Current log-in password" : "Mật khẩu đăng nhập hiện tại",
- "Update Private Key Password" : "Cập nhật mật khẩu khóa cá nhân",
- "Enable password recovery:" : "Kích hoạt khôi phục mật khẩu:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tùy chọn này sẽ cho phép bạn tái truy cập đến các tập tin mã hóa trong trường hợp mất mật khẩu",
- "Enabled" : "Bật",
- "Disabled" : "Tắt"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/vi.json b/apps/encryption/l10n/vi.json
deleted file mode 100644
index 78ed43b7047..00000000000
--- a/apps/encryption/l10n/vi.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{ "translations": {
- "Missing recovery key password" : "Thiếu khóa khôi phục mật khẩu",
- "Please repeat the recovery key password" : "Nhập lại khóa khôi phục mật khẩu",
- "Recovery key successfully enabled" : "Khóa khôi phục kích hoạt thành công",
- "Could not enable recovery key. Please check your recovery key password!" : "Không thể kích hoạt khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
- "Recovery key successfully disabled" : "Vô hiệu hóa khóa khôi phục thành công",
- "Could not disable recovery key. Please check your recovery key password!" : "Không thể vô hiệu hóa khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
- "Password successfully changed." : "Đã đổi mật khẩu.",
- "Could not change the password. Maybe the old password was not correct." : "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
- "Private key password successfully updated." : "Cập nhật thành công mật khẩu khóa cá nhân",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại",
- "The share will expire on %s." : "Chia sẻ này sẽ hết hiệu lực vào %s.",
- "Cheers!" : "Chúc mừng!",
- "Change Password" : "Đổi Mật khẩu",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Nếu bạn không nhớ mật khẩu cũ, bạn có thể yêu cầu quản trị viên khôi phục tập tin của bạn.",
- "Old log-in password" : "Mật khẩu đăng nhập cũ",
- "Current log-in password" : "Mật khẩu đăng nhập hiện tại",
- "Update Private Key Password" : "Cập nhật mật khẩu khóa cá nhân",
- "Enable password recovery:" : "Kích hoạt khôi phục mật khẩu:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tùy chọn này sẽ cho phép bạn tái truy cập đến các tập tin mã hóa trong trường hợp mất mật khẩu",
- "Enabled" : "Bật",
- "Disabled" : "Tắt"
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/zh_CN.js b/apps/encryption/l10n/zh_CN.js
index 59743fd926e..79496467c11 100644
--- a/apps/encryption/l10n/zh_CN.js
+++ b/apps/encryption/l10n/zh_CN.js
@@ -28,6 +28,9 @@ OC.L10N.register(
"Bad Signature" : "签名已损坏",
"Missing Signature" : "签名已丢失",
"one-time password for server-side-encryption" : "用于服务端加密的一次性密码",
+ "Encryption password" : "加密密码",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "服务器端加密已启用,您的文件已经使用密码<strong>%s</strong>加密。",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "服务器端加密已启用,您的文件已经使用密码“%s”加密。",
"Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "请登录网络界面,进入个人设置的 \"安全\" 部分,在“旧登录密码”字段中输入此密码,并在当前登录密码中输入该密码,以更新您的加密密码。",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "无法解密此文件,可能这是一个共享文件。请通知文件所有者与你重新共享该文件。",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "无法读取此文件,可能这是一个共享文件。请通知文件所有者与你重新共享该文件。",
@@ -49,7 +52,6 @@ OC.L10N.register(
"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." : "如果您记不住旧的密码,您可以请求管理员恢复您的文件。",
"Old log-in password" : "旧登录密码",
"Current log-in password" : "当前登录密码",
"Update Private Key Password" : "更新私钥密码",
diff --git a/apps/encryption/l10n/zh_CN.json b/apps/encryption/l10n/zh_CN.json
index 885c447ac88..2d5411013dc 100644
--- a/apps/encryption/l10n/zh_CN.json
+++ b/apps/encryption/l10n/zh_CN.json
@@ -26,6 +26,9 @@
"Bad Signature" : "签名已损坏",
"Missing Signature" : "签名已丢失",
"one-time password for server-side-encryption" : "用于服务端加密的一次性密码",
+ "Encryption password" : "加密密码",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "服务器端加密已启用,您的文件已经使用密码<strong>%s</strong>加密。",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "服务器端加密已启用,您的文件已经使用密码“%s”加密。",
"Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "请登录网络界面,进入个人设置的 \"安全\" 部分,在“旧登录密码”字段中输入此密码,并在当前登录密码中输入该密码,以更新您的加密密码。",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "无法解密此文件,可能这是一个共享文件。请通知文件所有者与你重新共享该文件。",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "无法读取此文件,可能这是一个共享文件。请通知文件所有者与你重新共享该文件。",
@@ -47,7 +50,6 @@
"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." : "如果您记不住旧的密码,您可以请求管理员恢复您的文件。",
"Old log-in password" : "旧登录密码",
"Current log-in password" : "当前登录密码",
"Update Private Key Password" : "更新私钥密码",
diff --git a/apps/encryption/l10n/zh_HK.js b/apps/encryption/l10n/zh_HK.js
index 8be93c19c58..5084a5871f1 100644
--- a/apps/encryption/l10n/zh_HK.js
+++ b/apps/encryption/l10n/zh_HK.js
@@ -21,7 +21,7 @@ OC.L10N.register(
"The old password was not correct, please try again." : "舊密碼不正確,請再試一次",
"The current log-in password was not correct, please try again." : "目前登入的密碼不正確,請再試一次",
"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." : "無效的加密應用程序私鑰。請在您的個人設定中更新您的私鑰密碼,以恢復對加密文件的訪問。",
+ "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." : "已啟用加密應用,但是你的加密密鑰沒有初始化。請重新登出並登入系統一次。",
"Please enable server side encryption in the admin settings in order to use the encryption module." : "請啟用管理員設定中的伺服器端加密,以使用加密模組。",
"Encryption app is enabled and ready" : "加密應用程式已啟用並準備就緒",
@@ -36,7 +36,7 @@ OC.L10N.register(
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法檢視這個檔案,或許這是分享的檔案。請讓檔案所有者與您重新共享檔案。",
"Default encryption module" : "默認加密模組",
"Default encryption module for server-side encryption" : "伺服器端的默認加密模組",
- "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "您需要在管理員設置中啟用服務器端加密才能使用此加密模塊您需要在管理員設置中啟用服務器端加密。啟用後,此模塊將透明地加密您的所有文件。加密基於 AES 256 密鑰。\n該模塊不會觸及現有文件,啟用伺服器端加密後只會對新檔案進行加密。也不可能再次禁用加密並切換回未加密的系統。\n在您決定啟用伺服器端加密之前,請閱讀文檔以了解所有含義。一旦啟用,此模塊將透明地加密您的所有文件。加密基於 AES 256 密鑰。\n該模塊不會觸及現有文件,啟伺服器端加密後只會對新文件進行加密。也不可能再次禁用加密並切換回未加密的系統。\n在您決定啟用伺服器端加密之前,請閱讀文檔以了解所有含義。",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "要使用此加密模塊,您需要在管理設置中啟用伺服器端加密。啟用後,此模塊將透明地加密您的所有檔案,加密基於 AES 256 密鑰。\n\n請注意,該模塊不會影響現有檔案;只有在啟用伺服器端加密後,新的檔案才會被加密。此外,一旦啟用加密,將無法再次禁用並切換回未加密的系統。\n\n在您決定啟用伺服器端加密之前,請仔細閱讀說明書以了解所有影響。",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "已啟用加密應用,但是你的加密密鑰沒有初始化。請重新登出並登入系統一次。",
"Encrypt the home storage" : "加密主要存儲空間",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "請啟用這個功能以用來加密主要儲存空間的檔案,否則只有再外部儲存的檔案會加密",
@@ -53,7 +53,7 @@ OC.L10N.register(
"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." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
"Old log-in password" : "舊登入密碼",
"Current log-in password" : "目前的登入密碼",
"Update Private Key Password" : "更新私人密鑰密碼",
diff --git a/apps/encryption/l10n/zh_HK.json b/apps/encryption/l10n/zh_HK.json
index 77c3f71bf45..e8e49796265 100644
--- a/apps/encryption/l10n/zh_HK.json
+++ b/apps/encryption/l10n/zh_HK.json
@@ -19,7 +19,7 @@
"The old password was not correct, please try again." : "舊密碼不正確,請再試一次",
"The current log-in password was not correct, please try again." : "目前登入的密碼不正確,請再試一次",
"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." : "無效的加密應用程序私鑰。請在您的個人設定中更新您的私鑰密碼,以恢復對加密文件的訪問。",
+ "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." : "已啟用加密應用,但是你的加密密鑰沒有初始化。請重新登出並登入系統一次。",
"Please enable server side encryption in the admin settings in order to use the encryption module." : "請啟用管理員設定中的伺服器端加密,以使用加密模組。",
"Encryption app is enabled and ready" : "加密應用程式已啟用並準備就緒",
@@ -34,7 +34,7 @@
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法檢視這個檔案,或許這是分享的檔案。請讓檔案所有者與您重新共享檔案。",
"Default encryption module" : "默認加密模組",
"Default encryption module for server-side encryption" : "伺服器端的默認加密模組",
- "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "您需要在管理員設置中啟用服務器端加密才能使用此加密模塊您需要在管理員設置中啟用服務器端加密。啟用後,此模塊將透明地加密您的所有文件。加密基於 AES 256 密鑰。\n該模塊不會觸及現有文件,啟用伺服器端加密後只會對新檔案進行加密。也不可能再次禁用加密並切換回未加密的系統。\n在您決定啟用伺服器端加密之前,請閱讀文檔以了解所有含義。一旦啟用,此模塊將透明地加密您的所有文件。加密基於 AES 256 密鑰。\n該模塊不會觸及現有文件,啟伺服器端加密後只會對新文件進行加密。也不可能再次禁用加密並切換回未加密的系統。\n在您決定啟用伺服器端加密之前,請閱讀文檔以了解所有含義。",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "要使用此加密模塊,您需要在管理設置中啟用伺服器端加密。啟用後,此模塊將透明地加密您的所有檔案,加密基於 AES 256 密鑰。\n\n請注意,該模塊不會影響現有檔案;只有在啟用伺服器端加密後,新的檔案才會被加密。此外,一旦啟用加密,將無法再次禁用並切換回未加密的系統。\n\n在您決定啟用伺服器端加密之前,請仔細閱讀說明書以了解所有影響。",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "已啟用加密應用,但是你的加密密鑰沒有初始化。請重新登出並登入系統一次。",
"Encrypt the home storage" : "加密主要存儲空間",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "請啟用這個功能以用來加密主要儲存空間的檔案,否則只有再外部儲存的檔案會加密",
@@ -51,7 +51,7 @@
"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." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
"Old log-in password" : "舊登入密碼",
"Current log-in password" : "目前的登入密碼",
"Update Private Key Password" : "更新私人密鑰密碼",
diff --git a/apps/encryption/l10n/zh_TW.js b/apps/encryption/l10n/zh_TW.js
index d50d0976b5b..ed7578821d5 100644
--- a/apps/encryption/l10n/zh_TW.js
+++ b/apps/encryption/l10n/zh_TW.js
@@ -53,7 +53,7 @@ OC.L10N.register(
"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." : " 如果您忘記舊密碼,可以請求管理員協助取回檔案。",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
"Old log-in password" : "舊登入密碼",
"Current log-in password" : "目前登入密碼",
"Update Private Key Password" : "更新私鑰密碼",
diff --git a/apps/encryption/l10n/zh_TW.json b/apps/encryption/l10n/zh_TW.json
index 07f896c3555..961e5c1bee2 100644
--- a/apps/encryption/l10n/zh_TW.json
+++ b/apps/encryption/l10n/zh_TW.json
@@ -51,7 +51,7 @@
"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." : " 如果您忘記舊密碼,可以請求管理員協助取回檔案。",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
"Old log-in password" : "舊登入密碼",
"Current log-in password" : "目前登入密碼",
"Update Private Key Password" : "更新私鑰密碼",
diff --git a/apps/encryption/lib/AppInfo/Application.php b/apps/encryption/lib/AppInfo/Application.php
index 600bc300797..b1bf93b9dea 100644
--- a/apps/encryption/lib/AppInfo/Application.php
+++ b/apps/encryption/lib/AppInfo/Application.php
@@ -31,6 +31,9 @@ use OCP\User\Events\BeforePasswordUpdatedEvent;
use OCP\User\Events\PasswordUpdatedEvent;
use OCP\User\Events\UserCreatedEvent;
use OCP\User\Events\UserDeletedEvent;
+use OCP\User\Events\UserLoggedInEvent;
+use OCP\User\Events\UserLoggedInWithCookieEvent;
+use OCP\User\Events\UserLoggedOutEvent;
use Psr\Log\LoggerInterface;
class Application extends App implements IBootstrap {
@@ -69,7 +72,12 @@ class Application extends App implements IBootstrap {
}
}
- public function registerEventListeners(IConfig $config, IEventDispatcher $eventDispatcher, IManager $encryptionManager): void {
+ public function registerEventListeners(
+ IConfig $config,
+ IEventDispatcher $eventDispatcher,
+ IManager $encryptionManager,
+ Util $util,
+ ): void {
if (!$encryptionManager->isEnabled()) {
return;
}
@@ -81,15 +89,23 @@ class Application extends App implements IBootstrap {
}
// No maintenance so register all events
- $eventDispatcher->addServiceListener(UserCreatedEvent::class, UserEventsListener::class);
- $eventDispatcher->addServiceListener(UserDeletedEvent::class, UserEventsListener::class);
- $eventDispatcher->addServiceListener(BeforePasswordUpdatedEvent::class, UserEventsListener::class);
- $eventDispatcher->addServiceListener(PasswordUpdatedEvent::class, UserEventsListener::class);
- $eventDispatcher->addServiceListener(BeforePasswordResetEvent::class, UserEventsListener::class);
- $eventDispatcher->addServiceListener(PasswordResetEvent::class, UserEventsListener::class);
+ $eventDispatcher->addServiceListener(UserLoggedInEvent::class, UserEventsListener::class);
+ $eventDispatcher->addServiceListener(UserLoggedInWithCookieEvent::class, UserEventsListener::class);
+ $eventDispatcher->addServiceListener(UserLoggedOutEvent::class, UserEventsListener::class);
+ if (!$util->isMasterKeyEnabled()) {
+ // Only make sense if no master key is used
+ $eventDispatcher->addServiceListener(UserCreatedEvent::class, UserEventsListener::class);
+ $eventDispatcher->addServiceListener(UserDeletedEvent::class, UserEventsListener::class);
+ $eventDispatcher->addServiceListener(BeforePasswordUpdatedEvent::class, UserEventsListener::class);
+ $eventDispatcher->addServiceListener(PasswordUpdatedEvent::class, UserEventsListener::class);
+ $eventDispatcher->addServiceListener(BeforePasswordResetEvent::class, UserEventsListener::class);
+ $eventDispatcher->addServiceListener(PasswordResetEvent::class, UserEventsListener::class);
+ }
}
- public function registerEncryptionModule(IManager $encryptionManager) {
+ public function registerEncryptionModule(
+ IManager $encryptionManager,
+ ) {
$container = $this->getContainer();
$encryptionManager->registerEncryptionModule(
diff --git a/apps/encryption/lib/Command/DisableMasterKey.php b/apps/encryption/lib/Command/DisableMasterKey.php
index 1912d09728d..0b8b8e39e78 100644
--- a/apps/encryption/lib/Command/DisableMasterKey.php
+++ b/apps/encryption/lib/Command/DisableMasterKey.php
@@ -1,4 +1,5 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/apps/encryption/lib/Command/FixEncryptedVersion.php b/apps/encryption/lib/Command/FixEncryptedVersion.php
index 6635bb6cba9..462e3a5cc2a 100644
--- a/apps/encryption/lib/Command/FixEncryptedVersion.php
+++ b/apps/encryption/lib/Command/FixEncryptedVersion.php
@@ -12,6 +12,7 @@ use OC\Files\Storage\Wrapper\Encryption;
use OC\Files\View;
use OC\ServerNotAvailableException;
use OCA\Encryption\Util;
+use OCP\Encryption\Exceptions\InvalidHeaderException;
use OCP\Files\IRootFolder;
use OCP\HintException;
use OCP\IConfig;
@@ -196,7 +197,7 @@ class FixEncryptedVersion extends Command {
\fclose($handle);
return true;
- } catch (ServerNotAvailableException $e) {
+ } catch (ServerNotAvailableException|InvalidHeaderException $e) {
// not a "bad signature" error and likely "legacy cipher" exception
// this could mean that the file is maybe not encrypted but the encrypted version is set
if (!$this->supportLegacy && $ignoreCorrectEncVersionCall === true) {
diff --git a/apps/encryption/lib/Command/RecoverUser.php b/apps/encryption/lib/Command/RecoverUser.php
index aea90f158f6..8da962ac8b1 100644
--- a/apps/encryption/lib/Command/RecoverUser.php
+++ b/apps/encryption/lib/Command/RecoverUser.php
@@ -1,4 +1,5 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/apps/encryption/lib/Crypto/EncryptAll.php b/apps/encryption/lib/Crypto/EncryptAll.php
index 6dfa36e6e3d..4ed75b85a93 100644
--- a/apps/encryption/lib/Crypto/EncryptAll.php
+++ b/apps/encryption/lib/Crypto/EncryptAll.php
@@ -12,6 +12,7 @@ use OC\Files\View;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Users\Setup;
use OCA\Encryption\Util;
+use OCP\Files\FileInfo;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IUser;
@@ -20,6 +21,7 @@ use OCP\L10N\IFactory;
use OCP\Mail\Headers\AutoSubmitted;
use OCP\Mail\IMailer;
use OCP\Security\ISecureRandom;
+use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Helper\QuestionHelper;
use Symfony\Component\Console\Helper\Table;
@@ -50,6 +52,7 @@ class EncryptAll {
protected IFactory $l10nFactory,
protected QuestionHelper $questionHelper,
protected ISecureRandom $secureRandom,
+ protected LoggerInterface $logger,
) {
// store one time passwords for the users
$this->userPasswords = [];
@@ -200,33 +203,42 @@ class EncryptAll {
while ($root = array_pop($directories)) {
$content = $this->rootView->getDirectoryContent($root);
foreach ($content as $file) {
- $path = $root . '/' . $file['name'];
- if ($this->rootView->is_dir($path)) {
+ $path = $root . '/' . $file->getName();
+ if ($file->isShared()) {
+ $progress->setMessage("Skip shared file/folder $path");
+ $progress->advance();
+ continue;
+ } elseif ($file->getType() === FileInfo::TYPE_FOLDER) {
$directories[] = $path;
continue;
} else {
$progress->setMessage("encrypt files for user $userCount: $path");
$progress->advance();
- if ($this->encryptFile($path) === false) {
- $progress->setMessage("encrypt files for user $userCount: $path (already encrypted)");
+ try {
+ if ($this->encryptFile($file, $path) === false) {
+ $progress->setMessage("encrypt files for user $userCount: $path (already encrypted)");
+ $progress->advance();
+ }
+ } catch (\Exception $e) {
+ $progress->setMessage("Failed to encrypt path $path: " . $e->getMessage());
$progress->advance();
+ $this->logger->error(
+ 'Failed to encrypt path {path}',
+ [
+ 'user' => $uid,
+ 'path' => $path,
+ 'exception' => $e,
+ ]
+ );
}
}
}
}
}
- /**
- * encrypt file
- *
- * @param string $path
- * @return bool
- */
- protected function encryptFile($path) {
-
+ protected function encryptFile(FileInfo $fileInfo, string $path): bool {
// skip already encrypted files
- $fileInfo = $this->rootView->getFileInfo($path);
- if ($fileInfo !== false && $fileInfo->isEncrypted()) {
+ if ($fileInfo->isEncrypted()) {
return true;
}
@@ -234,7 +246,14 @@ class EncryptAll {
$target = $path . '.encrypted.' . time();
try {
- $this->rootView->copy($source, $target);
+ $copySuccess = $this->rootView->copy($source, $target);
+ if ($copySuccess === false) {
+ /* Copy failed, abort */
+ if ($this->rootView->file_exists($target)) {
+ $this->rootView->unlink($target);
+ }
+ throw new \Exception('Copy failed for ' . $source);
+ }
$this->rootView->rename($target, $source);
} catch (DecryptionFailedException $e) {
if ($this->rootView->file_exists($target)) {
diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php
index 68bc7df808d..6d388624e48 100644
--- a/apps/encryption/lib/Crypto/Encryption.php
+++ b/apps/encryption/lib/Crypto/Encryption.php
@@ -446,8 +446,8 @@ class Encryption implements IEncryptionModule {
// error message because in this case it means that the file was
// shared with the user at a point where the user didn't had a
// valid private/public key
- $msg = 'Encryption module "' . $this->getDisplayName() .
- '" is not able to read ' . $path;
+ $msg = 'Encryption module "' . $this->getDisplayName()
+ . '" is not able to read ' . $path;
$hint = $this->l->t('Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
$this->logger->warning($msg);
throw new DecryptionFailedException($msg, $hint);
diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php
index f694e6550f1..f9c1ef94634 100644
--- a/apps/encryption/lib/KeyManager.php
+++ b/apps/encryption/lib/KeyManager.php
@@ -211,8 +211,8 @@ class KeyManager {
*/
public function setRecoveryKey($password, $keyPair) {
// Save Public Key
- $this->keyStorage->setSystemUserKey($this->getRecoveryKeyId() .
- '.' . $this->publicKeyId,
+ $this->keyStorage->setSystemUserKey($this->getRecoveryKeyId()
+ . '.' . $this->publicKeyId,
$keyPair['publicKey'],
Encryption::ID);
@@ -633,8 +633,8 @@ class KeyManager {
$publicKeys[$this->getPublicShareKeyId()] = $publicShareKey;
}
- if ($this->recoveryKeyExists() &&
- $this->util->isRecoveryEnabledForUser($uid)) {
+ if ($this->recoveryKeyExists()
+ && $this->util->isRecoveryEnabledForUser($uid)) {
$publicKeys[$this->getRecoveryKeyId()] = $this->getRecoveryKey();
}
diff --git a/apps/encryption/lib/Listeners/UserEventsListener.php b/apps/encryption/lib/Listeners/UserEventsListener.php
index 694640a0103..3f61fde599b 100644
--- a/apps/encryption/lib/Listeners/UserEventsListener.php
+++ b/apps/encryption/lib/Listeners/UserEventsListener.php
@@ -26,10 +26,11 @@ use OCP\User\Events\PasswordUpdatedEvent;
use OCP\User\Events\UserCreatedEvent;
use OCP\User\Events\UserDeletedEvent;
use OCP\User\Events\UserLoggedInEvent;
+use OCP\User\Events\UserLoggedInWithCookieEvent;
use OCP\User\Events\UserLoggedOutEvent;
/**
- * @template-implements IEventListener<UserCreatedEvent|UserDeletedEvent|UserLoggedInEvent|UserLoggedOutEvent|BeforePasswordUpdatedEvent|PasswordUpdatedEvent|BeforePasswordResetEvent|PasswordResetEvent>
+ * @template-implements IEventListener<UserCreatedEvent|UserDeletedEvent|UserLoggedInEvent|UserLoggedInWithCookieEvent|UserLoggedOutEvent|BeforePasswordUpdatedEvent|PasswordUpdatedEvent|BeforePasswordResetEvent|PasswordResetEvent>
*/
class UserEventsListener implements IEventListener {
@@ -50,7 +51,7 @@ class UserEventsListener implements IEventListener {
$this->onUserCreated($event->getUid(), $event->getPassword());
} elseif ($event instanceof UserDeletedEvent) {
$this->onUserDeleted($event->getUid());
- } elseif ($event instanceof UserLoggedInEvent) {
+ } elseif ($event instanceof UserLoggedInEvent || $event instanceof UserLoggedInWithCookieEvent) {
$this->onUserLogin($event->getUser(), $event->getPassword());
} elseif ($event instanceof UserLoggedOutEvent) {
$this->onUserLogout();
diff --git a/apps/encryption/lib/Migration/SetMasterKeyStatus.php b/apps/encryption/lib/Migration/SetMasterKeyStatus.php
index 96194351296..5f98308de89 100644
--- a/apps/encryption/lib/Migration/SetMasterKeyStatus.php
+++ b/apps/encryption/lib/Migration/SetMasterKeyStatus.php
@@ -1,4 +1,5 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/apps/encryption/lib/Services/PassphraseService.php b/apps/encryption/lib/Services/PassphraseService.php
index 0786cd3399a..bdcc3f1108a 100644
--- a/apps/encryption/lib/Services/PassphraseService.php
+++ b/apps/encryption/lib/Services/PassphraseService.php
@@ -55,6 +55,11 @@ class PassphraseService {
return true;
}
+ if ($this->util->isMasterKeyEnabled()) {
+ $this->logger->error('setPassphraseForUser should never be called when master key is enabled');
+ return true;
+ }
+
// Check user exists on backend
$user = $this->userManager->get($userId);
if ($user === null) {
diff --git a/apps/encryption/lib/Session.php b/apps/encryption/lib/Session.php
index e2731d9611d..df1e5d664ad 100644
--- a/apps/encryption/lib/Session.php
+++ b/apps/encryption/lib/Session.php
@@ -66,7 +66,7 @@ class Session {
public function getPrivateKey() {
$key = $this->session->get('privateKey');
if (is_null($key)) {
- throw new PrivateKeyMissingException('please try to log-out and log-in again', 0);
+ throw new PrivateKeyMissingException('please try to log-out and log-in again');
}
return $key;
}
diff --git a/apps/encryption/lib/Settings/Admin.php b/apps/encryption/lib/Settings/Admin.php
index e8290b778ad..a5de4ba68ff 100644
--- a/apps/encryption/lib/Settings/Admin.php
+++ b/apps/encryption/lib/Settings/Admin.php
@@ -1,4 +1,5 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/apps/encryption/lib/Settings/Personal.php b/apps/encryption/lib/Settings/Personal.php
index 63e50ccc078..8814d3afb58 100644
--- a/apps/encryption/lib/Settings/Personal.php
+++ b/apps/encryption/lib/Settings/Personal.php
@@ -1,4 +1,5 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/apps/encryption/lib/Util.php b/apps/encryption/lib/Util.php
index 20b2c0e5804..ccbdcdcb242 100644
--- a/apps/encryption/lib/Util.php
+++ b/apps/encryption/lib/Util.php
@@ -121,8 +121,8 @@ class Util {
if (count($parts) > 1) {
$owner = $parts[1];
if ($this->userManager->userExists($owner) === false) {
- throw new \BadMethodCallException('Unknown user: ' .
- 'method expects path to a user folder relative to the data folder');
+ throw new \BadMethodCallException('Unknown user: '
+ . 'method expects path to a user folder relative to the data folder');
}
}
diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index 6d06f28ffe7..432ba2f11b0 100644
--- a/apps/encryption/templates/settings-admin.php
+++ b/apps/encryption/templates/settings-admin.php
@@ -7,7 +7,7 @@
*/
/** @var array $_ */
/** @var \OCP\IL10N $l */
-script('encryption', 'settings-admin');
+\OCP\Util::addScript('encryption', 'settings-admin', 'core');
style('encryption', 'settings-admin');
?>
<form id="ocDefaultEncryptionModule" class="sub-section">
diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php
index 5aa227e7354..604bed53a8f 100644
--- a/apps/encryption/templates/settings-personal.php
+++ b/apps/encryption/templates/settings-personal.php
@@ -7,7 +7,7 @@
*/
/** @var array $_ */
/** @var \OCP\IL10N $l */
-script('encryption', 'settings-personal');
+\OCP\Util::addScript('encryption', 'settings-personal', 'core');
?>
<form id="ocDefaultEncryptionModule" class="section">
<h2 data-anchor-name="basic-encryption-module"><?php p($l->t('Basic encryption module')); ?></h2>
@@ -25,7 +25,7 @@ script('encryption', 'settings-personal');
<br />
<?php p($l->t('Set your old private key password to your current log-in password:')); ?>
<?php if ($_['recoveryEnabledForUser']):
- p($l->t(" If you don't remember your old password you can ask your administrator to recover your files."));
+ p(' ' . $l->t('If you do not remember your old password you can ask your administrator to recover your files.'));
endif; ?>
<br />
<input
diff --git a/apps/encryption/tests/Command/FixEncryptedVersionTest.php b/apps/encryption/tests/Command/FixEncryptedVersionTest.php
index e5079b9a8af..d0af359183b 100644
--- a/apps/encryption/tests/Command/FixEncryptedVersionTest.php
+++ b/apps/encryption/tests/Command/FixEncryptedVersionTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2019 ownCloud GmbH
@@ -11,6 +13,12 @@ namespace OCA\Encryption\Tests\Command;
use OC\Files\View;
use OCA\Encryption\Command\FixEncryptedVersion;
use OCA\Encryption\Util;
+use OCP\Files\IRootFolder;
+use OCP\IConfig;
+use OCP\ITempManager;
+use OCP\IUserManager;
+use OCP\Server;
+use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Tester\CommandTester;
use Test\TestCase;
@@ -29,21 +37,18 @@ class FixEncryptedVersionTest extends TestCase {
use EncryptionTrait;
use UserTrait;
- private $userId;
+ private string $userId;
- /** @var FixEncryptedVersion */
- private $fixEncryptedVersion;
+ private FixEncryptedVersion $fixEncryptedVersion;
- /** @var CommandTester */
- private $commandTester;
+ private CommandTester $commandTester;
- /** @var Util|\PHPUnit\Framework\MockObject\MockObject */
- protected $util;
+ protected Util&MockObject $util;
public function setUp(): void {
parent::setUp();
- \OC::$server->getConfig()->setAppValue('encryption', 'useMasterKey', '1');
+ Server::get(IConfig::class)->setAppValue('encryption', 'useMasterKey', '1');
$this->util = $this->getMockBuilder(Util::class)
->disableOriginalConstructor()->getMock();
@@ -51,24 +56,24 @@ class FixEncryptedVersionTest extends TestCase {
$this->userId = $this->getUniqueId('user_');
$this->createUser($this->userId, 'foo12345678');
- $tmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+ $tmpFolder = Server::get(ITempManager::class)->getTemporaryFolder();
$this->registerMount($this->userId, '\OC\Files\Storage\Local', '/' . $this->userId, ['datadir' => $tmpFolder]);
$this->setupForUser($this->userId, 'foo12345678');
$this->loginWithEncryption($this->userId);
$this->fixEncryptedVersion = new FixEncryptedVersion(
- \OC::$server->getConfig(),
- \OC::$server->get(LoggerInterface::class),
- \OC::$server->getRootFolder(),
- \OC::$server->getUserManager(),
+ Server::get(IConfig::class),
+ Server::get(LoggerInterface::class),
+ Server::get(IRootFolder::class),
+ Server::get(IUserManager::class),
$this->util,
new View('/')
);
$this->commandTester = new CommandTester($this->fixEncryptedVersion);
- $this->assertTrue(\OC::$server->getEncryptionManager()->isEnabled());
- $this->assertTrue(\OC::$server->getEncryptionManager()->isReady());
- $this->assertTrue(\OC::$server->getEncryptionManager()->isReadyForUser($this->userId));
+ $this->assertTrue(Server::get(\OCP\Encryption\IManager::class)->isEnabled());
+ $this->assertTrue(Server::get(\OCP\Encryption\IManager::class)->isReady());
+ $this->assertTrue(Server::get(\OCP\Encryption\IManager::class)->isReadyForUser($this->userId));
}
/**
@@ -370,7 +375,7 @@ The file \"/$this->userId/files/sub/hello.txt\" is: OK", $output);
* Test commands without master key
*/
public function testExecuteWithNoMasterKey(): void {
- \OC::$server->getConfig()->setAppValue('encryption', 'useMasterKey', '0');
+ Server::get(IConfig::class)->setAppValue('encryption', 'useMasterKey', '0');
$this->util->expects($this->once())->method('isMasterKeyEnabled')
->willReturn(false);
diff --git a/apps/encryption/tests/Command/TestEnableMasterKey.php b/apps/encryption/tests/Command/TestEnableMasterKey.php
index c4678b778bc..ead3dfd0195 100644
--- a/apps/encryption/tests/Command/TestEnableMasterKey.php
+++ b/apps/encryption/tests/Command/TestEnableMasterKey.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -53,11 +55,11 @@ class TestEnableMasterKey extends TestCase {
}
/**
- * @dataProvider dataTestExecute
*
* @param bool $isAlreadyEnabled
* @param string $answer
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestExecute')]
public function testExecute($isAlreadyEnabled, $answer): void {
$this->util->expects($this->once())->method('isMasterKeyEnabled')
->willReturn($isAlreadyEnabled);
@@ -79,7 +81,7 @@ class TestEnableMasterKey extends TestCase {
$this->invokePrivate($this->enableMasterKey, 'execute', [$this->input, $this->output]);
}
- public function dataTestExecute() {
+ public static function dataTestExecute() {
return [
[true, ''],
[false, 'y'],
diff --git a/apps/encryption/tests/Controller/RecoveryControllerTest.php b/apps/encryption/tests/Controller/RecoveryControllerTest.php
index 9de583b387c..0fec3f4d6a9 100644
--- a/apps/encryption/tests/Controller/RecoveryControllerTest.php
+++ b/apps/encryption/tests/Controller/RecoveryControllerTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -13,38 +15,35 @@ use OCP\AppFramework\Http;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IRequest;
+use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class RecoveryControllerTest extends TestCase {
- /** @var RecoveryController */
- private $controller;
- /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
- private $requestMock;
- /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
- private $configMock;
- /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
- private $l10nMock;
- /** @var Recovery|\PHPUnit\Framework\MockObject\MockObject */
- private $recoveryMock;
-
- public function adminRecoveryProvider() {
+ protected RecoveryController $controller;
+
+ protected IRequest&MockObject $requestMock;
+ protected IConfig&MockObject $configMock;
+ protected IL10N&MockObject $l10nMock;
+ protected Recovery&MockObject $recoveryMock;
+
+ public static function adminRecoveryProvider(): array {
return [
['test', 'test', '1', 'Recovery key successfully enabled', Http::STATUS_OK],
['', 'test', '1', 'Missing recovery key password', Http::STATUS_BAD_REQUEST],
['test', '', '1', 'Please repeat the recovery key password', Http::STATUS_BAD_REQUEST],
- ['test', 'soimething that doesn\'t match', '1', 'Repeated recovery key password does not match the provided recovery key password', Http::STATUS_BAD_REQUEST],
+ ['test', 'something that doesn\'t match', '1', 'Repeated recovery key password does not match the provided recovery key password', Http::STATUS_BAD_REQUEST],
['test', 'test', '0', 'Recovery key successfully disabled', Http::STATUS_OK],
];
}
/**
- * @dataProvider adminRecoveryProvider
* @param $recoveryPassword
* @param $passConfirm
* @param $enableRecovery
* @param $expectedMessage
* @param $expectedStatus
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('adminRecoveryProvider')]
public function testAdminRecovery($recoveryPassword, $passConfirm, $enableRecovery, $expectedMessage, $expectedStatus): void {
$this->recoveryMock->expects($this->any())
->method('enableAdminRecovery')
@@ -63,7 +62,7 @@ class RecoveryControllerTest extends TestCase {
$this->assertEquals($expectedStatus, $response->getStatus());
}
- public function changeRecoveryPasswordProvider() {
+ public static function changeRecoveryPasswordProvider(): array {
return [
['test', 'test', 'oldtestFail', 'Could not change the password. Maybe the old password was not correct.', Http::STATUS_BAD_REQUEST],
['test', 'test', 'oldtest', 'Password successfully changed.', Http::STATUS_OK],
@@ -74,13 +73,13 @@ class RecoveryControllerTest extends TestCase {
}
/**
- * @dataProvider changeRecoveryPasswordProvider
* @param $password
* @param $confirmPassword
* @param $oldPassword
* @param $expectedMessage
* @param $expectedStatus
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('changeRecoveryPasswordProvider')]
public function testChangeRecoveryPassword($password, $confirmPassword, $oldPassword, $expectedMessage, $expectedStatus): void {
$this->recoveryMock->expects($this->any())
->method('changeRecoveryKeyPassword')
@@ -98,7 +97,7 @@ class RecoveryControllerTest extends TestCase {
$this->assertEquals($expectedStatus, $response->getStatus());
}
- public function userSetRecoveryProvider() {
+ public static function userSetRecoveryProvider(): array {
return [
['1', 'Recovery Key enabled', Http::STATUS_OK],
['0', 'Could not enable the recovery key, please try again or contact your administrator', Http::STATUS_BAD_REQUEST]
@@ -106,11 +105,11 @@ class RecoveryControllerTest extends TestCase {
}
/**
- * @dataProvider userSetRecoveryProvider
* @param $enableRecovery
* @param $expectedMessage
* @param $expectedStatus
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('userSetRecoveryProvider')]
public function testUserSetRecovery($enableRecovery, $expectedMessage, $expectedStatus): void {
$this->recoveryMock->expects($this->any())
->method('setRecoveryForUser')
diff --git a/apps/encryption/tests/Controller/SettingsControllerTest.php b/apps/encryption/tests/Controller/SettingsControllerTest.php
index b676d57164f..bee20f67cec 100644
--- a/apps/encryption/tests/Controller/SettingsControllerTest.php
+++ b/apps/encryption/tests/Controller/SettingsControllerTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -24,37 +26,18 @@ use Test\TestCase;
class SettingsControllerTest extends TestCase {
- /** @var SettingsController */
- private $controller;
-
- /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
- private $requestMock;
-
- /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
- private $l10nMock;
-
- /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
- private $userManagerMock;
-
- /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
- private $userSessionMock;
-
- /** @var KeyManager|\PHPUnit\Framework\MockObject\MockObject */
- private $keyManagerMock;
+ protected SettingsController $controller;
- /** @var Crypt|\PHPUnit\Framework\MockObject\MockObject */
- private $cryptMock;
-
- /** @var Session|\PHPUnit\Framework\MockObject\MockObject */
- private $sessionMock;
- /** @var MockObject|IUser */
- private $user;
-
- /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */
- private $ocSessionMock;
-
- /** @var Util|\PHPUnit\Framework\MockObject\MockObject */
- private $utilMock;
+ protected IRequest&MockObject $requestMock;
+ protected IL10N&MockObject $l10nMock;
+ protected IUserManager&MockObject $userManagerMock;
+ protected IUserSession&MockObject $userSessionMock;
+ protected KeyManager&MockObject $keyManagerMock;
+ protected Crypt&MockObject $cryptMock;
+ protected Session&MockObject $sessionMock;
+ protected IUser&MockObject $user;
+ protected ISession&MockObject $ocSessionMock;
+ protected Util&MockObject $utilMock;
protected function setUp(): void {
parent::setUp();
@@ -171,21 +154,17 @@ class SettingsControllerTest extends TestCase {
$newPassword = 'new';
$this->ocSessionMock->expects($this->once())
- ->method('get')->with('loginname')->willReturn('testUser');
+ ->method('get')
+ ->with('loginname')
+ ->willReturn('testUser');
$this->userManagerMock
->expects($this->exactly(2))
->method('checkPassword')
- ->withConsecutive(
- ['testUserUid', 'new'],
- ['testUser', 'new'],
- )
- ->willReturnOnConsecutiveCalls(
- false,
- true,
- );
-
-
+ ->willReturnMap([
+ ['testUserUid', 'new', false],
+ ['testUser', 'new', true],
+ ]);
$this->cryptMock
->expects($this->once())
diff --git a/apps/encryption/tests/Controller/StatusControllerTest.php b/apps/encryption/tests/Controller/StatusControllerTest.php
index fbe44f52fb7..1bbcad77411 100644
--- a/apps/encryption/tests/Controller/StatusControllerTest.php
+++ b/apps/encryption/tests/Controller/StatusControllerTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -12,24 +14,17 @@ use OCA\Encryption\Session;
use OCP\Encryption\IManager;
use OCP\IL10N;
use OCP\IRequest;
+use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class StatusControllerTest extends TestCase {
- /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
- private $requestMock;
-
- /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
- private $l10nMock;
-
- /** @var Session|\PHPUnit\Framework\MockObject\MockObject */
- protected $sessionMock;
-
- /** @var IManager | \PHPUnit\Framework\MockObject\MockObject */
- protected $encryptionManagerMock;
+ protected IRequest&MockObject $requestMock;
+ protected IL10N&MockObject $l10nMock;
+ protected Session&MockObject $sessionMock;
+ protected IManager&MockObject $encryptionManagerMock;
- /** @var StatusController */
- protected $controller;
+ protected StatusController $controller;
protected function setUp(): void {
parent::setUp();
@@ -55,11 +50,11 @@ class StatusControllerTest extends TestCase {
}
/**
- * @dataProvider dataTestGetStatus
*
* @param string $status
* @param string $expectedStatus
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetStatus')]
public function testGetStatus($status, $expectedStatus): void {
$this->sessionMock->expects($this->once())
->method('getStatus')->willReturn($status);
@@ -68,7 +63,7 @@ class StatusControllerTest extends TestCase {
$this->assertSame($expectedStatus, $data['status']);
}
- public function dataTestGetStatus() {
+ public static function dataTestGetStatus(): array {
return [
[Session::INIT_EXECUTED, 'interactionNeeded'],
[Session::INIT_SUCCESSFUL, 'success'],
diff --git a/apps/encryption/tests/Crypto/CryptTest.php b/apps/encryption/tests/Crypto/CryptTest.php
index 74afc6d44a1..1355e2c855d 100644
--- a/apps/encryption/tests/Crypto/CryptTest.php
+++ b/apps/encryption/tests/Crypto/CryptTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -12,24 +14,17 @@ use OCP\Encryption\Exceptions\GenericEncryptionException;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
use Test\TestCase;
class CryptTest extends TestCase {
- /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
- private $logger;
-
- /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
- private $userSession;
-
- /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
- private $config;
+ protected LoggerInterface&MockObject $logger;
+ protected IUserSession&MockObject $userSession;
+ protected IConfig&MockObject $config;
+ protected IL10N&MockObject $l;
- /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
- private $l;
-
- /** @var Crypt */
- private $crypt;
+ protected Crypt $crypt;
protected function setUp(): void {
parent::setUp();
@@ -85,9 +80,8 @@ class CryptTest extends TestCase {
/**
* test generateHeader with valid key formats
- *
- * @dataProvider dataTestGenerateHeader
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestGenerateHeader')]
public function testGenerateHeader($keyFormat, $expected): void {
$this->config->expects($this->once())
->method('getSystemValueString')
@@ -113,10 +107,7 @@ class CryptTest extends TestCase {
$this->crypt->generateHeader('unknown');
}
- /**
- * @return array
- */
- public function dataTestGenerateHeader() {
+ public static function dataTestGenerateHeader(): array {
return [
[null, 'HBEGIN:cipher:AES-128-CFB:keyFormat:hash2:encoding:binary:HEND'],
['password', 'HBEGIN:cipher:AES-128-CFB:keyFormat:password:encoding:binary:HEND'],
@@ -138,10 +129,10 @@ class CryptTest extends TestCase {
}
/**
- * @dataProvider dataProviderGetCipher
* @param string $configValue
* @param string $expected
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataProviderGetCipher')]
public function testGetCipher($configValue, $expected): void {
$this->config->expects($this->once())
->method('getSystemValueString')
@@ -155,10 +146,8 @@ class CryptTest extends TestCase {
/**
* data provider for testGetCipher
- *
- * @return array
*/
- public function dataProviderGetCipher() {
+ public static function dataProviderGetCipher(): array {
return [
['AES-128-CFB', 'AES-128-CFB'],
['AES-256-CFB', 'AES-256-CFB'],
@@ -183,9 +172,7 @@ class CryptTest extends TestCase {
);
}
- /**
- * @dataProvider dataTestSplitMetaData
- */
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestSplitMetaData')]
public function testSplitMetaData($data, $expected): void {
$this->config->method('getSystemValueBool')
->with('encryption_skip_signature_check', false)
@@ -201,7 +188,7 @@ class CryptTest extends TestCase {
$this->assertSame($expected['signature'], $result['signature']);
}
- public function dataTestSplitMetaData() {
+ public static function dataTestSplitMetaData(): array {
return [
['encryptedContent00iv001234567890123456xx',
['encrypted' => 'encryptedContent', 'iv' => '1234567890123456', 'signature' => false]],
@@ -210,9 +197,7 @@ class CryptTest extends TestCase {
];
}
- /**
- * @dataProvider dataTestHasSignature
- */
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestHasSignature')]
public function testHasSignature($data, $expected): void {
$this->config->method('getSystemValueBool')
->with('encryption_skip_signature_check', false)
@@ -222,16 +207,14 @@ class CryptTest extends TestCase {
);
}
- public function dataTestHasSignature() {
+ public static function dataTestHasSignature(): array {
return [
['encryptedContent00iv001234567890123456xx', false],
['encryptedContent00iv00123456789012345600sig00e1992521e437f6915f9173b190a512cfc38a00ac24502db44e0ba10c2bb0cc86xxx', true]
];
}
- /**
- * @dataProvider dataTestHasSignatureFail
- */
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestHasSignatureFail')]
public function testHasSignatureFail($cipher): void {
$this->expectException(GenericEncryptionException::class);
@@ -239,7 +222,7 @@ class CryptTest extends TestCase {
$this->invokePrivate($this->crypt, 'hasSignature', [$data, $cipher]);
}
- public function dataTestHasSignatureFail() {
+ public static function dataTestHasSignatureFail(): array {
return [
['AES-256-CTR'],
['aes-256-ctr'],
@@ -259,10 +242,10 @@ class CryptTest extends TestCase {
/**
* test removePadding()
*
- * @dataProvider dataProviderRemovePadding
* @param $data
* @param $expected
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataProviderRemovePadding')]
public function testRemovePadding($data, $expected): void {
$result = self::invokePrivate($this->crypt, 'removePadding', [$data]);
$this->assertSame($expected, $result);
@@ -270,10 +253,8 @@ class CryptTest extends TestCase {
/**
* data provider for testRemovePadding
- *
- * @return array
*/
- public function dataProviderRemovePadding() {
+ public static function dataProviderRemovePadding(): array {
return [
['dataxx', 'data'],
['data', false]
@@ -339,9 +320,8 @@ class CryptTest extends TestCase {
/**
* test return values of valid ciphers
- *
- * @dataProvider dataTestGetKeySize
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetKeySize')]
public function testGetKeySize($cipher, $expected): void {
$result = $this->invokePrivate($this->crypt, 'getKeySize', [$cipher]);
$this->assertSame($expected, $result);
@@ -357,10 +337,7 @@ class CryptTest extends TestCase {
$this->invokePrivate($this->crypt, 'getKeySize', ['foo']);
}
- /**
- * @return array
- */
- public function dataTestGetKeySize() {
+ public static function dataTestGetKeySize(): array {
return [
['AES-256-CFB', 32],
['AES-128-CFB', 16],
@@ -369,33 +346,28 @@ class CryptTest extends TestCase {
];
}
- /**
- * @dataProvider dataTestDecryptPrivateKey
- */
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestDecryptPrivateKey')]
public function testDecryptPrivateKey($header, $privateKey, $expectedCipher, $isValidKey, $expected): void {
$this->config->method('getSystemValueBool')
- ->withConsecutive(['encryption.legacy_format_support', false],
- ['encryption.use_legacy_base64_encoding', false])
- ->willReturnOnConsecutiveCalls(true, false);
+ ->willReturnMap([
+ ['encryption.legacy_format_support', false, true],
+ ['encryption.use_legacy_base64_encoding', false, false],
+ ]);
/** @var Crypt|\PHPUnit\Framework\MockObject\MockObject $crypt */
$crypt = $this->getMockBuilder(Crypt::class)
- ->setConstructorArgs(
- [
- $this->logger,
- $this->userSession,
- $this->config,
- $this->l
- ]
- )
- ->setMethods(
- [
- 'parseHeader',
- 'generatePasswordHash',
- 'symmetricDecryptFileContent',
- 'isValidPrivateKey'
- ]
- )
+ ->setConstructorArgs([
+ $this->logger,
+ $this->userSession,
+ $this->config,
+ $this->l
+ ])
+ ->onlyMethods([
+ 'parseHeader',
+ 'generatePasswordHash',
+ 'symmetricDecryptFileContent',
+ 'isValidPrivateKey'
+ ])
->getMock();
$crypt->expects($this->once())->method('parseHeader')->willReturn($header);
@@ -416,10 +388,7 @@ class CryptTest extends TestCase {
$this->assertSame($expected, $result);
}
- /**
- * @return array
- */
- public function dataTestDecryptPrivateKey() {
+ public static function dataTestDecryptPrivateKey(): array {
return [
[['cipher' => 'AES-128-CFB', 'keyFormat' => 'password'], 'HBEGIN:HENDprivateKey', 'AES-128-CFB', true, 'key'],
[['cipher' => 'AES-256-CFB', 'keyFormat' => 'password'], 'HBEGIN:HENDprivateKey', 'AES-256-CFB', true, 'key'],
diff --git a/apps/encryption/tests/Crypto/DecryptAllTest.php b/apps/encryption/tests/Crypto/DecryptAllTest.php
index 0d8543153ef..82e6100bce5 100644
--- a/apps/encryption/tests/Crypto/DecryptAllTest.php
+++ b/apps/encryption/tests/Crypto/DecryptAllTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -12,28 +14,19 @@ use OCA\Encryption\Crypto\DecryptAll;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Session;
use OCA\Encryption\Util;
+use PHPUnit\Framework\MockObject\MockObject;
use Symfony\Component\Console\Helper\QuestionHelper;
use Test\TestCase;
class DecryptAllTest extends TestCase {
- /** @var DecryptAll */
- protected $instance;
-
- /** @var Util | \PHPUnit\Framework\MockObject\MockObject */
- protected $util;
-
- /** @var KeyManager | \PHPUnit\Framework\MockObject\MockObject */
- protected $keyManager;
-
- /** @var Crypt | \PHPUnit\Framework\MockObject\MockObject */
- protected $crypt;
-
- /** @var Session | \PHPUnit\Framework\MockObject\MockObject */
- protected $session;
+ protected DecryptAll $instance;
- /** @var QuestionHelper | \PHPUnit\Framework\MockObject\MockObject */
- protected $questionHelper;
+ protected Util&MockObject $util;
+ protected KeyManager&MockObject $keyManager;
+ protected Crypt&MockObject $crypt;
+ protected Session&MockObject $session;
+ protected QuestionHelper&MockObject $questionHelper;
protected function setUp(): void {
parent::setUp();
@@ -66,15 +59,16 @@ class DecryptAllTest extends TestCase {
}
/**
- * @dataProvider dataTestGetPrivateKey
*
* @param string $user
* @param string $recoveryKeyId
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetPrivateKey')]
public function testGetPrivateKey($user, $recoveryKeyId, $masterKeyId): void {
$password = 'passwd';
$recoveryKey = 'recoveryKey';
$userKey = 'userKey';
+ $masterKey = 'userKey';
$unencryptedKey = 'unencryptedKey';
$this->keyManager->expects($this->any())->method('getRecoveryKeyId')
@@ -105,7 +99,7 @@ class DecryptAllTest extends TestCase {
);
}
- public function dataTestGetPrivateKey() {
+ public static function dataTestGetPrivateKey() {
return [
['user1', 'recoveryKey', 'masterKeyId'],
['recoveryKeyId', 'recoveryKeyId', 'masterKeyId'],
diff --git a/apps/encryption/tests/Crypto/EncryptAllTest.php b/apps/encryption/tests/Crypto/EncryptAllTest.php
index d702c123b9b..c56e3375a73 100644
--- a/apps/encryption/tests/Crypto/EncryptAllTest.php
+++ b/apps/encryption/tests/Crypto/EncryptAllTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -20,6 +22,8 @@ use OCP\L10N\IFactory;
use OCP\Mail\IMailer;
use OCP\Security\ISecureRandom;
use OCP\UserInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Formatter\OutputFormatterInterface;
use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Helper\QuestionHelper;
@@ -29,50 +33,23 @@ use Test\TestCase;
class EncryptAllTest extends TestCase {
- /** @var \PHPUnit\Framework\MockObject\MockObject|KeyManager */
- protected $keyManager;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject|Util */
- protected $util;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject|IUserManager */
- protected $userManager;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject|Setup */
- protected $setupUser;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject|View */
- protected $view;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject|IConfig */
- protected $config;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject|IMailer */
- protected $mailer;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject|IL10N */
- protected $l;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject | IFactory */
- protected $l10nFactory;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject | \Symfony\Component\Console\Helper\QuestionHelper */
- protected $questionHelper;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject | \Symfony\Component\Console\Input\InputInterface */
- protected $inputInterface;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject | \Symfony\Component\Console\Output\OutputInterface */
- protected $outputInterface;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject|UserInterface */
- protected $userInterface;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject|ISecureRandom */
- protected $secureRandom;
-
- /** @var EncryptAll */
- protected $encryptAll;
+ protected KeyManager&MockObject $keyManager;
+ protected Util&MockObject $util;
+ protected IUserManager&MockObject $userManager;
+ protected Setup&MockObject $setupUser;
+ protected View&MockObject $view;
+ protected IConfig&MockObject $config;
+ protected IMailer&MockObject $mailer;
+ protected IL10N&MockObject $l;
+ protected IFactory&MockObject $l10nFactory;
+ protected \Symfony\Component\Console\Helper\QuestionHelper&MockObject $questionHelper;
+ protected \Symfony\Component\Console\Input\InputInterface&MockObject $inputInterface;
+ protected \Symfony\Component\Console\Output\OutputInterface&MockObject $outputInterface;
+ protected UserInterface&MockObject $userInterface;
+ protected ISecureRandom&MockObject $secureRandom;
+ protected LoggerInterface&MockObject $logger;
+
+ protected EncryptAll $encryptAll;
protected function setUp(): void {
parent::setUp();
@@ -101,10 +78,11 @@ class EncryptAllTest extends TestCase {
->disableOriginalConstructor()->getMock();
$this->userInterface = $this->getMockBuilder(UserInterface::class)
->disableOriginalConstructor()->getMock();
+ $this->logger = $this->createMock(LoggerInterface::class);
/**
* We need format method to return a string
- * @var OutputFormatterInterface|\PHPUnit\Framework\MockObject\MockObject
+ * @var OutputFormatterInterface&MockObject
*/
$outputFormatter = $this->createMock(OutputFormatterInterface::class);
$outputFormatter->method('isDecorated')->willReturn(false);
@@ -131,12 +109,20 @@ class EncryptAllTest extends TestCase {
$this->l,
$this->l10nFactory,
$this->questionHelper,
- $this->secureRandom
+ $this->secureRandom,
+ $this->logger,
);
}
+ protected function createFileInfoMock($type, string $name): FileInfo&MockObject {
+ $fileInfo = $this->createMock(FileInfo::class);
+ $fileInfo->method('getType')->willReturn($type);
+ $fileInfo->method('getName')->willReturn($name);
+ return $fileInfo;
+ }
+
public function testEncryptAll(): void {
- /** @var EncryptAll | \PHPUnit\Framework\MockObject\MockObject $encryptAll */
+ /** @var EncryptAll&MockObject $encryptAll */
$encryptAll = $this->getMockBuilder(EncryptAll::class)
->setConstructorArgs(
[
@@ -150,10 +136,11 @@ class EncryptAllTest extends TestCase {
$this->l,
$this->l10nFactory,
$this->questionHelper,
- $this->secureRandom
+ $this->secureRandom,
+ $this->logger,
]
)
- ->setMethods(['createKeyPairs', 'encryptAllUsersFiles', 'outputPasswords'])
+ ->onlyMethods(['createKeyPairs', 'encryptAllUsersFiles', 'outputPasswords'])
->getMock();
$this->util->expects($this->any())->method('isMasterKeyEnabled')->willReturn(false);
@@ -165,7 +152,7 @@ class EncryptAllTest extends TestCase {
}
public function testEncryptAllWithMasterKey(): void {
- /** @var EncryptAll | \PHPUnit\Framework\MockObject\MockObject $encryptAll */
+ /** @var EncryptAll&MockObject $encryptAll */
$encryptAll = $this->getMockBuilder(EncryptAll::class)
->setConstructorArgs(
[
@@ -179,10 +166,11 @@ class EncryptAllTest extends TestCase {
$this->l,
$this->l10nFactory,
$this->questionHelper,
- $this->secureRandom
+ $this->secureRandom,
+ $this->logger,
]
)
- ->setMethods(['createKeyPairs', 'encryptAllUsersFiles', 'outputPasswords'])
+ ->onlyMethods(['createKeyPairs', 'encryptAllUsersFiles', 'outputPasswords'])
->getMock();
$this->util->expects($this->any())->method('isMasterKeyEnabled')->willReturn(true);
@@ -195,7 +183,7 @@ class EncryptAllTest extends TestCase {
}
public function testCreateKeyPairs(): void {
- /** @var EncryptAll | \PHPUnit\Framework\MockObject\MockObject $encryptAll */
+ /** @var EncryptAll&MockObject $encryptAll */
$encryptAll = $this->getMockBuilder(EncryptAll::class)
->setConstructorArgs(
[
@@ -209,10 +197,11 @@ class EncryptAllTest extends TestCase {
$this->l,
$this->l10nFactory,
$this->questionHelper,
- $this->secureRandom
+ $this->secureRandom,
+ $this->logger,
]
)
- ->setMethods(['setupUserFS', 'generateOneTimePassword'])
+ ->onlyMethods(['setupUserFS', 'generateOneTimePassword'])
->getMock();
@@ -245,7 +234,7 @@ class EncryptAllTest extends TestCase {
}
public function testEncryptAllUsersFiles(): void {
- /** @var EncryptAll | \PHPUnit\Framework\MockObject\MockObject $encryptAll */
+ /** @var EncryptAll&MockObject $encryptAll */
$encryptAll = $this->getMockBuilder(EncryptAll::class)
->setConstructorArgs(
[
@@ -259,10 +248,11 @@ class EncryptAllTest extends TestCase {
$this->l,
$this->l10nFactory,
$this->questionHelper,
- $this->secureRandom
+ $this->secureRandom,
+ $this->logger,
]
)
- ->setMethods(['encryptUsersFiles'])
+ ->onlyMethods(['encryptUsersFiles'])
->getMock();
$this->util->expects($this->any())->method('isMasterKeyEnabled')->willReturn(false);
@@ -271,17 +261,22 @@ class EncryptAllTest extends TestCase {
$this->invokePrivate($encryptAll, 'output', [$this->outputInterface]);
$this->invokePrivate($encryptAll, 'userPasswords', [['user1' => 'pwd1', 'user2' => 'pwd2']]);
- $encryptAll->expects($this->exactly(2))->method('encryptUsersFiles')
- ->withConsecutive(
- ['user1'],
- ['user2'],
- );
+ $encryptAllCalls = [];
+ $encryptAll->expects($this->exactly(2))
+ ->method('encryptUsersFiles')
+ ->willReturnCallback(function ($uid) use (&$encryptAllCalls): void {
+ $encryptAllCalls[] = $uid;
+ });
$this->invokePrivate($encryptAll, 'encryptAllUsersFiles');
+ self::assertEquals([
+ 'user1',
+ 'user2',
+ ], $encryptAllCalls);
}
public function testEncryptUsersFiles(): void {
- /** @var EncryptAll | \PHPUnit\Framework\MockObject\MockObject $encryptAll */
+ /** @var EncryptAll&MockObject $encryptAll */
$encryptAll = $this->getMockBuilder(EncryptAll::class)
->setConstructorArgs(
[
@@ -295,43 +290,43 @@ class EncryptAllTest extends TestCase {
$this->l,
$this->l10nFactory,
$this->questionHelper,
- $this->secureRandom
+ $this->secureRandom,
+ $this->logger,
]
)
- ->setMethods(['encryptFile', 'setupUserFS'])
+ ->onlyMethods(['encryptFile', 'setupUserFS'])
->getMock();
$this->util->expects($this->any())->method('isMasterKeyEnabled')->willReturn(false);
$this->view->expects($this->exactly(2))->method('getDirectoryContent')
- ->withConsecutive(
- ['/user1/files'],
- ['/user1/files/foo'],
- )->willReturnOnConsecutiveCalls(
+ ->willReturnMap([
[
- ['name' => 'foo', 'type' => 'dir'],
- ['name' => 'bar', 'type' => 'file'],
+ '/user1/files',
+ '',
+ null,
+ [
+ $this->createFileInfoMock(FileInfo::TYPE_FOLDER, 'foo'),
+ $this->createFileInfoMock(FileInfo::TYPE_FILE, 'bar'),
+ ],
],
[
- ['name' => 'subfile', 'type' => 'file']
- ]
- );
-
- $this->view->expects($this->any())->method('is_dir')
- ->willReturnCallback(
- function ($path) {
- if ($path === '/user1/files/foo') {
- return true;
- }
- return false;
- }
- );
+ '/user1/files/foo',
+ '',
+ null,
+ [
+ $this->createFileInfoMock(FileInfo::TYPE_FILE, 'subfile'),
+ ],
+ ],
+ ]);
- $encryptAll->expects($this->exactly(2))->method('encryptFile')
- ->withConsecutive(
- ['/user1/files/bar'],
- ['/user1/files/foo/subfile'],
- );
+ $encryptAllCalls = [];
+ $encryptAll->expects($this->exactly(2))
+ ->method('encryptFile')
+ ->willReturnCallback(function (FileInfo $file, string $path) use (&$encryptAllCalls): bool {
+ $encryptAllCalls[] = $path;
+ return true;
+ });
$outputFormatter = $this->createMock(OutputFormatterInterface::class);
$outputFormatter->method('isDecorated')->willReturn(false);
@@ -341,6 +336,10 @@ class EncryptAllTest extends TestCase {
$progressBar = new ProgressBar($this->outputInterface);
$this->invokePrivate($encryptAll, 'encryptUsersFiles', ['user1', $progressBar, '']);
+ self::assertEquals([
+ '/user1/files/bar',
+ '/user1/files/foo/subfile',
+ ], $encryptAllCalls);
}
public function testGenerateOneTimePassword(): void {
@@ -354,15 +353,14 @@ class EncryptAllTest extends TestCase {
}
/**
- * @dataProvider dataTestEncryptFile
* @param $isEncrypted
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestEncryptFile')]
public function testEncryptFile($isEncrypted): void {
$fileInfo = $this->createMock(FileInfo::class);
$fileInfo->expects($this->any())->method('isEncrypted')
->willReturn($isEncrypted);
- $this->view->expects($this->any())->method('getFileInfo')
- ->willReturn($fileInfo);
+ $this->view->expects($this->never())->method('getFileInfo');
if ($isEncrypted) {
@@ -374,11 +372,11 @@ class EncryptAllTest extends TestCase {
}
$this->assertTrue(
- $this->invokePrivate($this->encryptAll, 'encryptFile', ['foo.txt'])
+ $this->invokePrivate($this->encryptAll, 'encryptFile', [$fileInfo, 'foo.txt'])
);
}
- public function dataTestEncryptFile() {
+ public static function dataTestEncryptFile(): array {
return [
[true],
[false],
diff --git a/apps/encryption/tests/Crypto/EncryptionTest.php b/apps/encryption/tests/Crypto/EncryptionTest.php
index 7f3d9d1f348..37e484550ef 100644
--- a/apps/encryption/tests/Crypto/EncryptionTest.php
+++ b/apps/encryption/tests/Crypto/EncryptionTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -26,34 +28,18 @@ use Symfony\Component\Console\Output\OutputInterface;
use Test\TestCase;
class EncryptionTest extends TestCase {
- /** @var Encryption */
- private $instance;
-
- /** @var KeyManager|\PHPUnit\Framework\MockObject\MockObject */
- private $keyManagerMock;
-
- /** @var EncryptAll|\PHPUnit\Framework\MockObject\MockObject */
- private $encryptAllMock;
-
- /** @var DecryptAll|\PHPUnit\Framework\MockObject\MockObject */
- private $decryptAllMock;
-
- /** @var Session|\PHPUnit\Framework\MockObject\MockObject */
- private $sessionMock;
-
- /** @var Crypt|\PHPUnit\Framework\MockObject\MockObject */
- private $cryptMock;
-
- /** @var Util|\PHPUnit\Framework\MockObject\MockObject */
- private $utilMock;
- /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
- private $loggerMock;
+ protected Encryption $instance;
- /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
- private $l10nMock;
-
- private IStorage&MockObject $storageMock;
+ protected KeyManager&MockObject $keyManagerMock;
+ protected EncryptAll&MockObject $encryptAllMock;
+ protected DecryptAll&MockObject $decryptAllMock;
+ protected Session&MockObject $sessionMock;
+ protected Crypt&MockObject $cryptMock;
+ protected Util&MockObject $utilMock;
+ protected LoggerInterface&MockObject $loggerMock;
+ protected IL10N&MockObject $l10nMock;
+ protected IStorage&MockObject $storageMock;
protected function setUp(): void {
parent::setUp();
@@ -166,16 +152,14 @@ class EncryptionTest extends TestCase {
return $publicKeys;
}
- /**
- * @dataProvider dataProviderForTestGetPathToRealFile
- */
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataProviderForTestGetPathToRealFile')]
public function testGetPathToRealFile($path, $expected): void {
$this->assertSame($expected,
self::invokePrivate($this->instance, 'getPathToRealFile', [$path])
);
}
- public function dataProviderForTestGetPathToRealFile() {
+ public static function dataProviderForTestGetPathToRealFile(): array {
return [
['/user/files/foo/bar.txt', '/user/files/foo/bar.txt'],
['/user/files/foo.txt', '/user/files/foo.txt'],
@@ -184,9 +168,7 @@ class EncryptionTest extends TestCase {
];
}
- /**
- * @dataProvider dataTestBegin
- */
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestBegin')]
public function testBegin($mode, $header, $legacyCipher, $defaultCipher, $fileKey, $expected): void {
$this->sessionMock->expects($this->once())
->method('decryptAllModeActivated')
@@ -228,7 +210,7 @@ class EncryptionTest extends TestCase {
}
}
- public function dataTestBegin() {
+ public static function dataTestBegin(): array {
return [
['w', ['cipher' => 'myCipher'], 'legacyCipher', 'defaultCipher', 'fileKey', 'defaultCipher'],
['r', ['cipher' => 'myCipher'], 'legacyCipher', 'defaultCipher', 'fileKey', 'myCipher'],
@@ -279,11 +261,11 @@ class EncryptionTest extends TestCase {
}
/**
- * @dataProvider dataTestUpdate
*
* @param string $fileKey
* @param boolean $expected
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestUpdate')]
public function testUpdate($fileKey, $expected): void {
$this->keyManagerMock->expects($this->once())
->method('getFileKey')->willReturn($fileKey);
@@ -305,7 +287,7 @@ class EncryptionTest extends TestCase {
);
}
- public function dataTestUpdate() {
+ public static function dataTestUpdate(): array {
return [
['', false],
['fileKey', true]
@@ -368,9 +350,8 @@ class EncryptionTest extends TestCase {
/**
* by default the encryption module should encrypt regular files, files in
* files_versions and files in files_trashbin
- *
- * @dataProvider dataTestShouldEncrypt
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestShouldEncrypt')]
public function testShouldEncrypt($path, $shouldEncryptHomeStorage, $isHomeStorage, $expected): void {
$this->utilMock->expects($this->once())->method('shouldEncryptHomeStorage')
->willReturn($shouldEncryptHomeStorage);
@@ -387,7 +368,7 @@ class EncryptionTest extends TestCase {
);
}
- public function dataTestShouldEncrypt() {
+ public static function dataTestShouldEncrypt(): array {
return [
['/user1/files/foo.txt', true, true, true],
['/user1/files_versions/foo.txt', true, true, true],
diff --git a/apps/encryption/tests/EncryptedStorageTest.php b/apps/encryption/tests/EncryptedStorageTest.php
index 7671eab4992..59f419a7f7a 100644
--- a/apps/encryption/tests/EncryptedStorageTest.php
+++ b/apps/encryption/tests/EncryptedStorageTest.php
@@ -13,6 +13,7 @@ use OC\Files\Storage\Wrapper\Encryption;
use OC\Files\View;
use OCP\Files\Mount\IMountManager;
use OCP\Files\Storage\IDisableEncryptionStorage;
+use OCP\Server;
use Test\TestCase;
use Test\Traits\EncryptionTrait;
use Test\Traits\MountProviderTrait;
@@ -44,7 +45,7 @@ class EncryptedStorageTest extends TestCase {
$view = new View('/test1/files');
/** @var IMountManager $mountManager */
- $mountManager = \OC::$server->get(IMountManager::class);
+ $mountManager = Server::get(IMountManager::class);
$encryptedMount = $mountManager->find('/test1/files/enc');
$unencryptedMount = $mountManager->find('/test1/files/unenc');
diff --git a/apps/encryption/tests/KeyManagerTest.php b/apps/encryption/tests/KeyManagerTest.php
index 8f5c9a78faf..3fe76fc4f59 100644
--- a/apps/encryption/tests/KeyManagerTest.php
+++ b/apps/encryption/tests/KeyManagerTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -28,41 +30,19 @@ use Psr\Log\LoggerInterface;
use Test\TestCase;
class KeyManagerTest extends TestCase {
- /**
- * @var KeyManager
- */
- private $instance;
- /**
- * @var string
- */
- private $userId;
-
- /** @var string */
- private $systemKeyId;
-
- /** @var \OCP\Encryption\Keys\IStorage|\PHPUnit\Framework\MockObject\MockObject */
- private $keyStorageMock;
- /** @var Crypt|\PHPUnit\Framework\MockObject\MockObject */
- private $cryptMock;
+ protected KeyManager $instance;
- /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
- private $userMock;
-
- /** @var Session|\PHPUnit\Framework\MockObject\MockObject */
- private $sessionMock;
-
- /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
- private $logMock;
-
- /** @var Util|\PHPUnit\Framework\MockObject\MockObject */
- private $utilMock;
-
- /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
- private $configMock;
-
- /** @var ILockingProvider|MockObject */
- private $lockingProviderMock;
+ protected string $userId;
+ protected string $systemKeyId;
+ protected IStorage&MockObject $keyStorageMock;
+ protected Crypt&MockObject $cryptMock;
+ protected IUserSession&MockObject $userMock;
+ protected Session&MockObject $sessionMock;
+ protected LoggerInterface&MockObject $logMock;
+ protected Util&MockObject $utilMock;
+ protected IConfig&MockObject $configMock;
+ protected ILockingProvider&MockObject $lockingProviderMock;
protected function setUp(): void {
parent::setUp();
@@ -186,9 +166,7 @@ class KeyManagerTest extends TestCase {
);
}
- /**
- * @dataProvider dataTestUserHasKeys
- */
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestUserHasKeys')]
public function testUserHasKeys($key, $expected): void {
$this->keyStorageMock->expects($this->exactly(2))
->method('getUserKey')
@@ -201,7 +179,7 @@ class KeyManagerTest extends TestCase {
);
}
- public function dataTestUserHasKeys() {
+ public static function dataTestUserHasKeys(): array {
return [
['key', true],
['', false]
@@ -241,12 +219,11 @@ class KeyManagerTest extends TestCase {
}
/**
- * @dataProvider dataTestInit
- *
* @param bool $useMasterKey
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestInit')]
public function testInit($useMasterKey): void {
- /** @var KeyManager|\PHPUnit\Framework\MockObject\MockObject $instance */
+ /** @var KeyManager&MockObject $instance */
$instance = $this->getMockBuilder(KeyManager::class)
->setConstructorArgs(
[
@@ -259,17 +236,18 @@ class KeyManagerTest extends TestCase {
$this->utilMock,
$this->lockingProviderMock
]
- )->setMethods(['getMasterKeyId', 'getMasterKeyPassword', 'getSystemPrivateKey', 'getPrivateKey'])
+ )->onlyMethods(['getMasterKeyId', 'getMasterKeyPassword', 'getSystemPrivateKey', 'getPrivateKey'])
->getMock();
$this->utilMock->expects($this->once())->method('isMasterKeyEnabled')
->willReturn($useMasterKey);
- $this->sessionMock->expects($this->exactly(2))->method('setStatus')
- ->withConsecutive(
- [Session::INIT_EXECUTED],
- [Session::INIT_SUCCESSFUL],
- );
+ $sessionSetStatusCalls = [];
+ $this->sessionMock->expects($this->exactly(2))
+ ->method('setStatus')
+ ->willReturnCallback(function (string $status) use (&$sessionSetStatusCalls): void {
+ $sessionSetStatusCalls[] = $status;
+ });
$instance->expects($this->any())->method('getMasterKeyId')->willReturn('masterKeyId');
$instance->expects($this->any())->method('getMasterKeyPassword')->willReturn('masterKeyPassword');
@@ -290,9 +268,13 @@ class KeyManagerTest extends TestCase {
->with('key');
$this->assertTrue($instance->init($this->userId, 'pass'));
+ self::assertEquals([
+ Session::INIT_EXECUTED,
+ Session::INIT_SUCCESSFUL,
+ ], $sessionSetStatusCalls);
}
- public function dataTestInit() {
+ public static function dataTestInit(): array {
return [
[true],
[false]
@@ -349,7 +331,7 @@ class KeyManagerTest extends TestCase {
$this->assertTrue($this->instance->getEncryptedFileKey('/'));
}
- public function dataTestGetFileKey() {
+ public static function dataTestGetFileKey(): array {
return [
['user1', false, 'privateKey', 'legacyKey', 'multiKeyDecryptResult'],
['user1', false, 'privateKey', '', 'multiKeyDecryptResult'],
@@ -371,13 +353,13 @@ class KeyManagerTest extends TestCase {
}
/**
- * @dataProvider dataTestGetFileKey
*
* @param $uid
* @param $isMasterKeyEnabled
* @param $privateKey
* @param $expected
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetFileKey')]
public function testGetFileKey($uid, $isMasterKeyEnabled, $privateKey, $encryptedFileKey, $expected): void {
$path = '/foo.txt';
@@ -395,14 +377,10 @@ class KeyManagerTest extends TestCase {
$this->keyStorageMock->expects($this->exactly(2))
->method('getFileKey')
- ->withConsecutive(
- [$path, 'fileKey', 'OC_DEFAULT_MODULE'],
- [$path, $expectedUid . '.shareKey', 'OC_DEFAULT_MODULE'],
- )
- ->willReturnOnConsecutiveCalls(
- $encryptedFileKey,
- 'fileKey',
- );
+ ->willReturnMap([
+ [$path, 'fileKey', 'OC_DEFAULT_MODULE', $encryptedFileKey],
+ [$path, $expectedUid . '.shareKey', 'OC_DEFAULT_MODULE', 'fileKey'],
+ ]);
$this->utilMock->expects($this->any())->method('isMasterKeyEnabled')
->willReturn($isMasterKeyEnabled);
@@ -471,13 +449,13 @@ class KeyManagerTest extends TestCase {
/**
* test add public share key and or recovery key to the list of public keys
*
- * @dataProvider dataTestAddSystemKeys
*
* @param array $accessList
* @param array $publicKeys
* @param string $uid
* @param array $expectedKeys
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestAddSystemKeys')]
public function testAddSystemKeys($accessList, $publicKeys, $uid, $expectedKeys): void {
$publicShareKeyId = 'publicShareKey';
$recoveryKeyId = 'recoveryKey';
@@ -515,7 +493,7 @@ class KeyManagerTest extends TestCase {
*
* @return array
*/
- public function dataTestAddSystemKeys() {
+ public static function dataTestAddSystemKeys(): array {
return [
[['public' => true],[], 'user1', ['publicShareKey', 'recoveryKey']],
[['public' => false], [], 'user1', ['recoveryKey']],
@@ -558,12 +536,11 @@ class KeyManagerTest extends TestCase {
}
/**
- * @dataProvider dataTestValidateMasterKey
- *
* @param $masterKey
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestValidateMasterKey')]
public function testValidateMasterKey($masterKey): void {
- /** @var KeyManager|\PHPUnit\Framework\MockObject\MockObject $instance */
+ /** @var KeyManager&MockObject $instance */
$instance = $this->getMockBuilder(KeyManager::class)
->setConstructorArgs(
[
@@ -576,7 +553,7 @@ class KeyManagerTest extends TestCase {
$this->utilMock,
$this->lockingProviderMock
]
- )->setMethods(['getPublicMasterKey', 'setSystemPrivateKey', 'getMasterKeyPassword'])
+ )->onlyMethods(['getPublicMasterKey', 'setSystemPrivateKey', 'getMasterKeyPassword'])
->getMock();
$this->utilMock->expects($this->once())->method('isMasterKeyEnabled')
@@ -611,20 +588,19 @@ class KeyManagerTest extends TestCase {
}
public function testValidateMasterKeyLocked(): void {
- /** @var KeyManager|\PHPUnit_Framework_MockObject_MockObject $instance */
+ /** @var KeyManager&MockObject $instance */
$instance = $this->getMockBuilder(KeyManager::class)
- ->setConstructorArgs(
- [
- $this->keyStorageMock,
- $this->cryptMock,
- $this->configMock,
- $this->userMock,
- $this->sessionMock,
- $this->logMock,
- $this->utilMock,
- $this->lockingProviderMock
- ]
- )->setMethods(['getPublicMasterKey', 'getPrivateMasterKey', 'setSystemPrivateKey', 'getMasterKeyPassword'])
+ ->setConstructorArgs([
+ $this->keyStorageMock,
+ $this->cryptMock,
+ $this->configMock,
+ $this->userMock,
+ $this->sessionMock,
+ $this->logMock,
+ $this->utilMock,
+ $this->lockingProviderMock
+ ])
+ ->onlyMethods(['getPublicMasterKey', 'getPrivateMasterKey', 'setSystemPrivateKey', 'getMasterKeyPassword'])
->getMock();
$this->utilMock->expects($this->once())->method('isMasterKeyEnabled')
@@ -646,7 +622,7 @@ class KeyManagerTest extends TestCase {
$instance->validateMasterKey();
}
- public function dataTestValidateMasterKey() {
+ public static function dataTestValidateMasterKey(): array {
return [
['masterKey'],
['']
diff --git a/apps/encryption/tests/RecoveryTest.php b/apps/encryption/tests/RecoveryTest.php
index 17ad385eca0..0627724a856 100644
--- a/apps/encryption/tests/RecoveryTest.php
+++ b/apps/encryption/tests/RecoveryTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
diff --git a/apps/encryption/tests/SessionTest.php b/apps/encryption/tests/SessionTest.php
index 3072bc6ef3b..986502749c8 100644
--- a/apps/encryption/tests/SessionTest.php
+++ b/apps/encryption/tests/SessionTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -10,17 +12,14 @@ namespace OCA\Encryption\Tests;
use OCA\Encryption\Exceptions\PrivateKeyMissingException;
use OCA\Encryption\Session;
use OCP\ISession;
+use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class SessionTest extends TestCase {
private static $tempStorage = [];
- /**
- * @var Session
- */
- private $instance;
- /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */
- private $sessionMock;
+ protected Session $instance;
+ protected ISession&MockObject $sessionMock;
public function testThatGetPrivateKeyThrowsExceptionWhenNotSet(): void {
$this->expectException(PrivateKeyMissingException::class);
@@ -116,16 +115,17 @@ class SessionTest extends TestCase {
}
/**
- * @dataProvider dataTestIsReady
*
* @param int $status
* @param bool $expected
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsReady')]
public function testIsReady($status, $expected): void {
- /** @var Session | \PHPUnit\Framework\MockObject\MockObject $instance */
+ /** @var Session&MockObject $instance */
$instance = $this->getMockBuilder(Session::class)
->setConstructorArgs([$this->sessionMock])
- ->setMethods(['getStatus'])->getMock();
+ ->onlyMethods(['getStatus'])
+ ->getMock();
$instance->expects($this->once())->method('getStatus')
->willReturn($status);
@@ -133,7 +133,7 @@ class SessionTest extends TestCase {
$this->assertSame($expected, $instance->isReady());
}
- public function dataTestIsReady() {
+ public static function dataTestIsReady(): array {
return [
[Session::INIT_SUCCESSFUL, true],
[Session::INIT_EXECUTED, false],
diff --git a/apps/encryption/tests/Settings/AdminTest.php b/apps/encryption/tests/Settings/AdminTest.php
index 4ddaeb1b84d..8355cdf6729 100644
--- a/apps/encryption/tests/Settings/AdminTest.php
+++ b/apps/encryption/tests/Settings/AdminTest.php
@@ -1,4 +1,7 @@
<?php
+
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
@@ -12,24 +15,20 @@ use OCP\IL10N;
use OCP\ISession;
use OCP\IUserManager;
use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
use Test\TestCase;
class AdminTest extends TestCase {
- /** @var Admin */
- private $admin;
- /** @var IL10N */
- private $l;
- /** @var LoggerInterface */
- private $logger;
- /** @var IUserSession */
- private $userSession;
- /** @var IConfig */
- private $config;
- /** @var IUserManager */
- private $userManager;
- /** @var ISession */
- private $session;
+
+ protected Admin $admin;
+
+ protected IL10N&MockObject $l;
+ protected LoggerInterface&MockObject $logger;
+ protected IUserSession&MockObject $userSession;
+ protected IConfig&MockObject $config;
+ protected IUserManager&MockObject $userManager;
+ protected ISession&MockObject $session;
protected function setUp(): void {
parent::setUp();
@@ -54,7 +53,7 @@ class AdminTest extends TestCase {
public function testGetForm(): void {
$this->config
->method('getAppValue')
- ->will($this->returnCallback(function ($app, $key, $default) {
+ ->willReturnCallback(function ($app, $key, $default) {
if ($app === 'encryption' && $key === 'recoveryAdminEnabled' && $default === '0') {
return '1';
}
@@ -62,7 +61,7 @@ class AdminTest extends TestCase {
return '1';
}
return $default;
- }));
+ });
$params = [
'recoveryEnabled' => '1',
'initStatus' => '0',
diff --git a/apps/encryption/tests/Users/SetupTest.php b/apps/encryption/tests/Users/SetupTest.php
index 7a6beaf3594..6b2b8b4cad5 100644
--- a/apps/encryption/tests/Users/SetupTest.php
+++ b/apps/encryption/tests/Users/SetupTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -10,21 +12,15 @@ namespace OCA\Encryption\Tests\Users;
use OCA\Encryption\Crypto\Crypt;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Users\Setup;
+use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class SetupTest extends TestCase {
- /**
- * @var KeyManager|\PHPUnit\Framework\MockObject\MockObject
- */
- private $keyManagerMock;
- /**
- * @var Crypt|\PHPUnit\Framework\MockObject\MockObject
- */
- private $cryptMock;
- /**
- * @var Setup
- */
- private $instance;
+
+ protected Setup $instance;
+
+ protected KeyManager&MockObject $keyManagerMock;
+ protected Crypt&MockObject $cryptMock;
protected function setUp(): void {
parent::setUp();
@@ -50,11 +46,11 @@ class SetupTest extends TestCase {
}
/**
- * @dataProvider dataTestSetupUser
*
* @param bool $hasKeys
* @param bool $expected
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestSetupUser')]
public function testSetupUser($hasKeys, $expected): void {
$this->keyManagerMock->expects($this->once())->method('userHasKeys')
->with('uid')->willReturn($hasKeys);
@@ -72,7 +68,7 @@ class SetupTest extends TestCase {
);
}
- public function dataTestSetupUser() {
+ public static function dataTestSetupUser(): array {
return [
[true, true],
[false, true]
diff --git a/apps/encryption/tests/UtilTest.php b/apps/encryption/tests/UtilTest.php
index 711564af5bd..41860a44ffb 100644
--- a/apps/encryption/tests/UtilTest.php
+++ b/apps/encryption/tests/UtilTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -20,22 +22,14 @@ use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class UtilTest extends TestCase {
- private static $tempStorage = [];
-
- /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
- private $configMock;
-
- /** @var View|\PHPUnit\Framework\MockObject\MockObject */
- private $filesMock;
-
- /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
- private $userManagerMock;
- /** @var IMountPoint|\PHPUnit\Framework\MockObject\MockObject */
- private $mountMock;
+ protected Util $instance;
+ protected static $tempStorage = [];
- /** @var Util */
- private $instance;
+ protected IConfig&MockObject $configMock;
+ protected View&MockObject $filesMock;
+ protected IUserManager&MockObject $userManagerMock;
+ protected IMountPoint&MockObject $mountMock;
public function testSetRecoveryForUser(): void {
$this->instance->setRecoveryForUser('1');
@@ -121,11 +115,11 @@ class UtilTest extends TestCase {
}
/**
- * @dataProvider dataTestIsMasterKeyEnabled
*
* @param string $value
* @param bool $expect
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsMasterKeyEnabled')]
public function testIsMasterKeyEnabled($value, $expect): void {
$this->configMock->expects($this->once())->method('getAppValue')
->with('encryption', 'useMasterKey', '1')->willReturn($value);
@@ -134,7 +128,7 @@ class UtilTest extends TestCase {
);
}
- public function dataTestIsMasterKeyEnabled() {
+ public static function dataTestIsMasterKeyEnabled(): array {
return [
['0', false],
['1', true]
@@ -142,10 +136,10 @@ class UtilTest extends TestCase {
}
/**
- * @dataProvider dataTestShouldEncryptHomeStorage
* @param string $returnValue return value from getAppValue()
* @param bool $expected
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestShouldEncryptHomeStorage')]
public function testShouldEncryptHomeStorage($returnValue, $expected): void {
$this->configMock->expects($this->once())->method('getAppValue')
->with('encryption', 'encryptHomeStorage', '1')
@@ -155,7 +149,7 @@ class UtilTest extends TestCase {
$this->instance->shouldEncryptHomeStorage());
}
- public function dataTestShouldEncryptHomeStorage() {
+ public static function dataTestShouldEncryptHomeStorage(): array {
return [
['1', true],
['0', false]
@@ -163,17 +157,17 @@ class UtilTest extends TestCase {
}
/**
- * @dataProvider dataTestSetEncryptHomeStorage
* @param $value
* @param $expected
*/
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestSetEncryptHomeStorage')]
public function testSetEncryptHomeStorage($value, $expected): void {
$this->configMock->expects($this->once())->method('setAppValue')
->with('encryption', 'encryptHomeStorage', $expected);
$this->instance->setEncryptHomeStorage($value);
}
- public function dataTestSetEncryptHomeStorage() {
+ public static function dataTestSetEncryptHomeStorage(): array {
return [
[true, '1'],
[false, '0']