diff options
Diffstat (limited to 'apps/encryption')
66 files changed, 476 insertions, 1009 deletions
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/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/de.js b/apps/encryption/l10n/de.js index d32f6e03d33..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!", diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json index 8b47d1d9d94..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!", diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js index 92226e19cf3..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", diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json index 21c6acc753c..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", diff --git a/apps/encryption/l10n/et_EE.js b/apps/encryption/l10n/et_EE.js index 1dd886792e6..70de2cc0c46 100644 --- a/apps/encryption/l10n/et_EE.js +++ b/apps/encryption/l10n/et_EE.js @@ -1,46 +1,55 @@ 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!", + "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 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.", + "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.", - "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älja lülitatud" }, diff --git a/apps/encryption/l10n/et_EE.json b/apps/encryption/l10n/et_EE.json index 1f1cad621d0..bd7a9d32858 100644 --- a/apps/encryption/l10n/et_EE.json +++ b/apps/encryption/l10n/et_EE.json @@ -1,44 +1,53 @@ { "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!", + "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 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.", + "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.", - "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älja lülitatud" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js index 750da7bc6d5..f24147117cf 100644 --- a/apps/encryption/l10n/fr.js +++ b/apps/encryption/l10n/fr.js @@ -53,6 +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 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 fa8d0349d01..99936241dd5 100644 --- a/apps/encryption/l10n/fr.json +++ b/apps/encryption/l10n/fr.json @@ -51,6 +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 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/hu.js b/apps/encryption/l10n/hu.js index 7dcabf023b1..cb8f07952a4 100644 --- a/apps/encryption/l10n/hu.js +++ b/apps/encryption/l10n/hu.js @@ -53,6 +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 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 390f9467c6a..cd394f8fad1 100644 --- a/apps/encryption/l10n/hu.json +++ b/apps/encryption/l10n/hu.json @@ -51,6 +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 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/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/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/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/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/pt_BR.js b/apps/encryption/l10n/pt_BR.js index a53a5cf461a..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:", diff --git a/apps/encryption/l10n/pt_BR.json b/apps/encryption/l10n/pt_BR.json index 06edec92aa1..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:", 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/tr.js b/apps/encryption/l10n/tr.js index 40b44b02bd7..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.", @@ -57,9 +57,9 @@ OC.L10N.register( "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 52e0006e72b..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.", @@ -55,9 +55,9 @@ "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/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/lib/AppInfo/Application.php b/apps/encryption/lib/AppInfo/Application.php index a4e9426c3e5..b1bf93b9dea 100644 --- a/apps/encryption/lib/AppInfo/Application.php +++ b/apps/encryption/lib/AppInfo/Application.php @@ -72,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; } @@ -84,18 +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/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/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/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/tests/Command/FixEncryptedVersionTest.php b/apps/encryption/tests/Command/FixEncryptedVersionTest.php index 7a69b4bf901..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 @@ -16,6 +18,7 @@ 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; @@ -34,16 +37,13 @@ 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(); 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..6dbbd55df78 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,7 @@ use OCP\L10N\IFactory; use OCP\Mail\IMailer; use OCP\Security\ISecureRandom; use OCP\UserInterface; +use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\Console\Formatter\OutputFormatterInterface; use Symfony\Component\Console\Helper\ProgressBar; use Symfony\Component\Console\Helper\QuestionHelper; @@ -29,50 +32,22 @@ 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 EncryptAll $encryptAll; protected function setUp(): void { parent::setUp(); @@ -153,7 +128,7 @@ class EncryptAllTest extends TestCase { $this->secureRandom ] ) - ->setMethods(['createKeyPairs', 'encryptAllUsersFiles', 'outputPasswords']) + ->onlyMethods(['createKeyPairs', 'encryptAllUsersFiles', 'outputPasswords']) ->getMock(); $this->util->expects($this->any())->method('isMasterKeyEnabled')->willReturn(false); @@ -182,7 +157,7 @@ class EncryptAllTest extends TestCase { $this->secureRandom ] ) - ->setMethods(['createKeyPairs', 'encryptAllUsersFiles', 'outputPasswords']) + ->onlyMethods(['createKeyPairs', 'encryptAllUsersFiles', 'outputPasswords']) ->getMock(); $this->util->expects($this->any())->method('isMasterKeyEnabled')->willReturn(true); @@ -212,7 +187,7 @@ class EncryptAllTest extends TestCase { $this->secureRandom ] ) - ->setMethods(['setupUserFS', 'generateOneTimePassword']) + ->onlyMethods(['setupUserFS', 'generateOneTimePassword']) ->getMock(); @@ -245,7 +220,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( [ @@ -262,7 +237,7 @@ class EncryptAllTest extends TestCase { $this->secureRandom ] ) - ->setMethods(['encryptUsersFiles']) + ->onlyMethods(['encryptUsersFiles']) ->getMock(); $this->util->expects($this->any())->method('isMasterKeyEnabled')->willReturn(false); @@ -271,17 +246,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( [ @@ -298,24 +278,31 @@ class EncryptAllTest extends TestCase { $this->secureRandom ] ) - ->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, + [ + ['name' => 'foo', 'type' => 'dir'], + ['name' => 'bar', 'type' => 'file'], + ], ], [ - ['name' => 'subfile', 'type' => 'file'] - ] - ); + '/user1/files/foo', + '', + null, + [ + ['name' => 'subfile', 'type' => 'file'] + ], + ], + ]); $this->view->expects($this->any())->method('is_dir') ->willReturnCallback( @@ -327,11 +314,12 @@ class EncryptAllTest extends TestCase { } ); - $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 (string $path) use (&$encryptAllCalls): void { + $encryptAllCalls[] = $path; + }); $outputFormatter = $this->createMock(OutputFormatterInterface::class); $outputFormatter->method('isDecorated')->willReturn(false); @@ -341,6 +329,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,9 +346,9 @@ 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') @@ -378,7 +370,7 @@ class EncryptAllTest extends TestCase { ); } - 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/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'] |