aboutsummaryrefslogtreecommitdiffstats
path: root/apps/encryption
diff options
context:
space:
mode:
Diffstat (limited to 'apps/encryption')
-rw-r--r--apps/encryption/appinfo/app.php21
-rw-r--r--apps/encryption/appinfo/info.xml4
-rw-r--r--apps/encryption/composer/composer/autoload_classmap.php5
-rw-r--r--apps/encryption/composer/composer/autoload_static.php5
-rw-r--r--apps/encryption/css/settings-personal.css.map.license3
-rw-r--r--apps/encryption/img/app.svg2
-rw-r--r--apps/encryption/l10n/ar.js30
-rw-r--r--apps/encryption/l10n/ar.json30
-rw-r--r--apps/encryption/l10n/ast.js29
-rw-r--r--apps/encryption/l10n/ast.json27
-rw-r--r--apps/encryption/l10n/az.js35
-rw-r--r--apps/encryption/l10n/az.json33
-rw-r--r--apps/encryption/l10n/bg.js5
-rw-r--r--apps/encryption/l10n/bg.json5
-rw-r--r--apps/encryption/l10n/bn_BD.js13
-rw-r--r--apps/encryption/l10n/bn_BD.json11
-rw-r--r--apps/encryption/l10n/bs.js11
-rw-r--r--apps/encryption/l10n/bs.json9
-rw-r--r--apps/encryption/l10n/ca.js4
-rw-r--r--apps/encryption/l10n/ca.json4
-rw-r--r--apps/encryption/l10n/cs.js7
-rw-r--r--apps/encryption/l10n/cs.json7
-rw-r--r--apps/encryption/l10n/da.js16
-rw-r--r--apps/encryption/l10n/da.json16
-rw-r--r--apps/encryption/l10n/de.js25
-rw-r--r--apps/encryption/l10n/de.json25
-rw-r--r--apps/encryption/l10n/de_DE.js12
-rw-r--r--apps/encryption/l10n/de_DE.json12
-rw-r--r--apps/encryption/l10n/el.js4
-rw-r--r--apps/encryption/l10n/el.json4
-rw-r--r--apps/encryption/l10n/en_GB.js6
-rw-r--r--apps/encryption/l10n/en_GB.json6
-rw-r--r--apps/encryption/l10n/eo.js4
-rw-r--r--apps/encryption/l10n/eo.json4
-rw-r--r--apps/encryption/l10n/es.js8
-rw-r--r--apps/encryption/l10n/es.json8
-rw-r--r--apps/encryption/l10n/es_419.js4
-rw-r--r--apps/encryption/l10n/es_419.json4
-rw-r--r--apps/encryption/l10n/es_AR.js4
-rw-r--r--apps/encryption/l10n/es_AR.json4
-rw-r--r--apps/encryption/l10n/es_CL.js4
-rw-r--r--apps/encryption/l10n/es_CL.json4
-rw-r--r--apps/encryption/l10n/es_CO.js4
-rw-r--r--apps/encryption/l10n/es_CO.json4
-rw-r--r--apps/encryption/l10n/es_CR.js4
-rw-r--r--apps/encryption/l10n/es_CR.json4
-rw-r--r--apps/encryption/l10n/es_DO.js4
-rw-r--r--apps/encryption/l10n/es_DO.json4
-rw-r--r--apps/encryption/l10n/es_EC.js5
-rw-r--r--apps/encryption/l10n/es_EC.json5
-rw-r--r--apps/encryption/l10n/es_GT.js4
-rw-r--r--apps/encryption/l10n/es_GT.json4
-rw-r--r--apps/encryption/l10n/es_HN.js4
-rw-r--r--apps/encryption/l10n/es_HN.json4
-rw-r--r--apps/encryption/l10n/es_MX.js4
-rw-r--r--apps/encryption/l10n/es_MX.json4
-rw-r--r--apps/encryption/l10n/es_NI.js4
-rw-r--r--apps/encryption/l10n/es_NI.json4
-rw-r--r--apps/encryption/l10n/es_PA.js4
-rw-r--r--apps/encryption/l10n/es_PA.json4
-rw-r--r--apps/encryption/l10n/es_PE.js4
-rw-r--r--apps/encryption/l10n/es_PE.json4
-rw-r--r--apps/encryption/l10n/es_PR.js4
-rw-r--r--apps/encryption/l10n/es_PR.json4
-rw-r--r--apps/encryption/l10n/es_PY.js4
-rw-r--r--apps/encryption/l10n/es_PY.json4
-rw-r--r--apps/encryption/l10n/es_SV.js4
-rw-r--r--apps/encryption/l10n/es_SV.json4
-rw-r--r--apps/encryption/l10n/es_UY.js4
-rw-r--r--apps/encryption/l10n/es_UY.json4
-rw-r--r--apps/encryption/l10n/et_EE.js73
-rw-r--r--apps/encryption/l10n/et_EE.json73
-rw-r--r--apps/encryption/l10n/eu.js6
-rw-r--r--apps/encryption/l10n/eu.json6
-rw-r--r--apps/encryption/l10n/fa.js5
-rw-r--r--apps/encryption/l10n/fa.json5
-rw-r--r--apps/encryption/l10n/fi.js4
-rw-r--r--apps/encryption/l10n/fi.json4
-rw-r--r--apps/encryption/l10n/fr.js6
-rw-r--r--apps/encryption/l10n/fr.json6
-rw-r--r--apps/encryption/l10n/ga.js65
-rw-r--r--apps/encryption/l10n/ga.json63
-rw-r--r--apps/encryption/l10n/gl.js7
-rw-r--r--apps/encryption/l10n/gl.json7
-rw-r--r--apps/encryption/l10n/he.js4
-rw-r--r--apps/encryption/l10n/he.json4
-rw-r--r--apps/encryption/l10n/hr.js4
-rw-r--r--apps/encryption/l10n/hr.json4
-rw-r--r--apps/encryption/l10n/hu.js7
-rw-r--r--apps/encryption/l10n/hu.json7
-rw-r--r--apps/encryption/l10n/ia.js7
-rw-r--r--apps/encryption/l10n/ia.json5
-rw-r--r--apps/encryption/l10n/id.js4
-rw-r--r--apps/encryption/l10n/id.json4
-rw-r--r--apps/encryption/l10n/is.js4
-rw-r--r--apps/encryption/l10n/is.json4
-rw-r--r--apps/encryption/l10n/it.js4
-rw-r--r--apps/encryption/l10n/it.json4
-rw-r--r--apps/encryption/l10n/ja.js8
-rw-r--r--apps/encryption/l10n/ja.json8
-rw-r--r--apps/encryption/l10n/ka.js5
-rw-r--r--apps/encryption/l10n/ka.json5
-rw-r--r--apps/encryption/l10n/ka_GE.js4
-rw-r--r--apps/encryption/l10n/ka_GE.json4
-rw-r--r--apps/encryption/l10n/km.js10
-rw-r--r--apps/encryption/l10n/km.json8
-rw-r--r--apps/encryption/l10n/kn.js8
-rw-r--r--apps/encryption/l10n/kn.json6
-rw-r--r--apps/encryption/l10n/ko.js6
-rw-r--r--apps/encryption/l10n/ko.json6
-rw-r--r--apps/encryption/l10n/lb.js9
-rw-r--r--apps/encryption/l10n/lb.json7
-rw-r--r--apps/encryption/l10n/lt_LT.js4
-rw-r--r--apps/encryption/l10n/lt_LT.json4
-rw-r--r--apps/encryption/l10n/lv.js18
-rw-r--r--apps/encryption/l10n/lv.json18
-rw-r--r--apps/encryption/l10n/mk.js17
-rw-r--r--apps/encryption/l10n/mk.json15
-rw-r--r--apps/encryption/l10n/nb.js5
-rw-r--r--apps/encryption/l10n/nb.json5
-rw-r--r--apps/encryption/l10n/nl.js27
-rw-r--r--apps/encryption/l10n/nl.json27
-rw-r--r--apps/encryption/l10n/oc.js59
-rw-r--r--apps/encryption/l10n/oc.json57
-rw-r--r--apps/encryption/l10n/pl.js5
-rw-r--r--apps/encryption/l10n/pl.json5
-rw-r--r--apps/encryption/l10n/pt_BR.js20
-rw-r--r--apps/encryption/l10n/pt_BR.json20
-rw-r--r--apps/encryption/l10n/pt_PT.js14
-rw-r--r--apps/encryption/l10n/pt_PT.json14
-rw-r--r--apps/encryption/l10n/ru.js6
-rw-r--r--apps/encryption/l10n/ru.json6
-rw-r--r--apps/encryption/l10n/sc.js6
-rw-r--r--apps/encryption/l10n/sc.json6
-rw-r--r--apps/encryption/l10n/sk.js6
-rw-r--r--apps/encryption/l10n/sk.json6
-rw-r--r--apps/encryption/l10n/sl.js4
-rw-r--r--apps/encryption/l10n/sl.json4
-rw-r--r--apps/encryption/l10n/sq.js4
-rw-r--r--apps/encryption/l10n/sq.json4
-rw-r--r--apps/encryption/l10n/sr.js6
-rw-r--r--apps/encryption/l10n/sr.json6
-rw-r--r--apps/encryption/l10n/sr@latin.js10
-rw-r--r--apps/encryption/l10n/sr@latin.json8
-rw-r--r--apps/encryption/l10n/sv.js6
-rw-r--r--apps/encryption/l10n/sv.json6
-rw-r--r--apps/encryption/l10n/sw.js65
-rw-r--r--apps/encryption/l10n/sw.json63
-rw-r--r--apps/encryption/l10n/th.js4
-rw-r--r--apps/encryption/l10n/th.json4
-rw-r--r--apps/encryption/l10n/tr.js58
-rw-r--r--apps/encryption/l10n/tr.json58
-rw-r--r--apps/encryption/l10n/ug.js64
-rw-r--r--apps/encryption/l10n/ug.json62
-rw-r--r--apps/encryption/l10n/uk.js6
-rw-r--r--apps/encryption/l10n/uk.json6
-rw-r--r--apps/encryption/l10n/ur_PK.js6
-rw-r--r--apps/encryption/l10n/ur_PK.json4
-rw-r--r--apps/encryption/l10n/vi.js26
-rw-r--r--apps/encryption/l10n/vi.json24
-rw-r--r--apps/encryption/l10n/zh_CN.js19
-rw-r--r--apps/encryption/l10n/zh_CN.json19
-rw-r--r--apps/encryption/l10n/zh_HK.js12
-rw-r--r--apps/encryption/l10n/zh_HK.json12
-rw-r--r--apps/encryption/l10n/zh_TW.js42
-rw-r--r--apps/encryption/l10n/zh_TW.json42
-rw-r--r--apps/encryption/lib/AppInfo/Application.php124
-rw-r--r--apps/encryption/lib/Command/DisableMasterKey.php61
-rw-r--r--apps/encryption/lib/Command/DropLegacyFileKey.php8
-rw-r--r--apps/encryption/lib/Command/EnableMasterKey.php52
-rw-r--r--apps/encryption/lib/Command/FixEncryptedVersion.php57
-rw-r--r--apps/encryption/lib/Command/FixKeyLocation.php92
-rw-r--r--apps/encryption/lib/Command/RecoverUser.php38
-rw-r--r--apps/encryption/lib/Command/ScanLegacyFormat.php46
-rw-r--r--apps/encryption/lib/Controller/RecoveryController.php32
-rw-r--r--apps/encryption/lib/Controller/SettingsController.php63
-rw-r--r--apps/encryption/lib/Controller/StatusController.php26
-rw-r--r--apps/encryption/lib/Crypto/Crypt.php14
-rw-r--r--apps/encryption/lib/Crypto/DecryptAll.php35
-rw-r--r--apps/encryption/lib/Crypto/EncryptAll.php123
-rw-r--r--apps/encryption/lib/Crypto/Encryption.php13
-rw-r--r--apps/encryption/lib/Exceptions/PrivateKeyMissingException.php2
-rw-r--r--apps/encryption/lib/Exceptions/PublicKeyMissingException.php2
-rw-r--r--apps/encryption/lib/HookManager.php43
-rw-r--r--apps/encryption/lib/Hooks/Contracts/IHook.php17
-rw-r--r--apps/encryption/lib/Hooks/UserHooks.php266
-rw-r--r--apps/encryption/lib/KeyManager.php16
-rw-r--r--apps/encryption/lib/Listeners/UserEventsListener.php144
-rw-r--r--apps/encryption/lib/Migration/SetMasterKeyStatus.php10
-rw-r--r--apps/encryption/lib/Recovery.php39
-rw-r--r--apps/encryption/lib/Services/PassphraseService.php148
-rw-r--r--apps/encryption/lib/Session.php10
-rw-r--r--apps/encryption/lib/Settings/Admin.php7
-rw-r--r--apps/encryption/lib/Settings/Personal.php25
-rw-r--r--apps/encryption/lib/Users/Setup.php12
-rw-r--r--apps/encryption/lib/Util.php19
-rw-r--r--apps/encryption/templates/settings-admin.php32
-rw-r--r--apps/encryption/templates/settings-personal.php36
-rw-r--r--apps/encryption/tests/Command/FixEncryptedVersionTest.php83
-rw-r--r--apps/encryption/tests/Command/TestEnableMasterKey.php18
-rw-r--r--apps/encryption/tests/Controller/RecoveryControllerTest.php41
-rw-r--r--apps/encryption/tests/Controller/SettingsControllerTest.php69
-rw-r--r--apps/encryption/tests/Controller/StatusControllerTest.php27
-rw-r--r--apps/encryption/tests/Crypto/CryptTest.php163
-rw-r--r--apps/encryption/tests/Crypto/DecryptAllTest.php34
-rw-r--r--apps/encryption/tests/Crypto/EncryptAllTest.php202
-rw-r--r--apps/encryption/tests/Crypto/EncryptionTest.php101
-rw-r--r--apps/encryption/tests/EncryptedStorageTest.php35
-rw-r--r--apps/encryption/tests/HookManagerTest.php52
-rw-r--r--apps/encryption/tests/Hooks/UserHooksTest.php370
-rw-r--r--apps/encryption/tests/KeyManagerTest.php213
-rw-r--r--apps/encryption/tests/Listeners/UserEventsListenersTest.php258
-rw-r--r--apps/encryption/tests/PassphraseServiceTest.php196
-rw-r--r--apps/encryption/tests/RecoveryTest.php36
-rw-r--r--apps/encryption/tests/SessionTest.php57
-rw-r--r--apps/encryption/tests/Settings/AdminTest.php37
-rw-r--r--apps/encryption/tests/Users/SetupTest.php28
-rw-r--r--apps/encryption/tests/UtilTest.php54
218 files changed, 2603 insertions, 3185 deletions
diff --git a/apps/encryption/appinfo/app.php b/apps/encryption/appinfo/app.php
deleted file mode 100644
index da838c3f280..00000000000
--- a/apps/encryption/appinfo/app.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-namespace OCA\Encryption\AppInfo;
-
-\OCP\Util::addscript('encryption', 'encryption');
-
-$encryptionManager = \OC::$server->getEncryptionManager();
-$encryptionSystemReady = $encryptionManager->isReady();
-
-/** @var Application $app */
-$app = \OC::$server->query(Application::class);
-if ($encryptionSystemReady) {
- $app->registerEncryptionModule($encryptionManager);
- $app->registerHooks(\OC::$server->getConfig());
- $app->setUp($encryptionManager);
-}
diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml
index 425621b9967..58f18f4d950 100644
--- a/apps/encryption/appinfo/info.xml
+++ b/apps/encryption/appinfo/info.xml
@@ -14,7 +14,7 @@ In order to use this encryption module you need to enable server-side encryption
The 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.
Please read the documentation to know all implications before you decide to enable server-side encryption.
</description>
- <version>2.18.0</version>
+ <version>2.20.0</version>
<licence>agpl</licence>
<author>Bjoern Schiessle</author>
<author>Clark Tomlinson</author>
@@ -31,7 +31,7 @@ Please read the documentation to know all implications before you decide to enab
<dependencies>
<lib>openssl</lib>
- <nextcloud min-version="30" max-version="30"/>
+ <nextcloud min-version="32" max-version="32"/>
</dependencies>
<repair-steps>
diff --git a/apps/encryption/composer/composer/autoload_classmap.php b/apps/encryption/composer/composer/autoload_classmap.php
index 059296338b4..814f39653e9 100644
--- a/apps/encryption/composer/composer/autoload_classmap.php
+++ b/apps/encryption/composer/composer/autoload_classmap.php
@@ -26,12 +26,11 @@ return array(
'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => $baseDir . '/../lib/Exceptions/MultiKeyEncryptException.php',
'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => $baseDir . '/../lib/Exceptions/PrivateKeyMissingException.php',
'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => $baseDir . '/../lib/Exceptions/PublicKeyMissingException.php',
- 'OCA\\Encryption\\HookManager' => $baseDir . '/../lib/HookManager.php',
- 'OCA\\Encryption\\Hooks\\Contracts\\IHook' => $baseDir . '/../lib/Hooks/Contracts/IHook.php',
- 'OCA\\Encryption\\Hooks\\UserHooks' => $baseDir . '/../lib/Hooks/UserHooks.php',
'OCA\\Encryption\\KeyManager' => $baseDir . '/../lib/KeyManager.php',
+ 'OCA\\Encryption\\Listeners\\UserEventsListener' => $baseDir . '/../lib/Listeners/UserEventsListener.php',
'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => $baseDir . '/../lib/Migration/SetMasterKeyStatus.php',
'OCA\\Encryption\\Recovery' => $baseDir . '/../lib/Recovery.php',
+ 'OCA\\Encryption\\Services\\PassphraseService' => $baseDir . '/../lib/Services/PassphraseService.php',
'OCA\\Encryption\\Session' => $baseDir . '/../lib/Session.php',
'OCA\\Encryption\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
'OCA\\Encryption\\Settings\\Personal' => $baseDir . '/../lib/Settings/Personal.php',
diff --git a/apps/encryption/composer/composer/autoload_static.php b/apps/encryption/composer/composer/autoload_static.php
index 6c458eabddd..af5e5192520 100644
--- a/apps/encryption/composer/composer/autoload_static.php
+++ b/apps/encryption/composer/composer/autoload_static.php
@@ -41,12 +41,11 @@ class ComposerStaticInitEncryption
'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => __DIR__ . '/..' . '/../lib/Exceptions/MultiKeyEncryptException.php',
'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => __DIR__ . '/..' . '/../lib/Exceptions/PrivateKeyMissingException.php',
'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => __DIR__ . '/..' . '/../lib/Exceptions/PublicKeyMissingException.php',
- 'OCA\\Encryption\\HookManager' => __DIR__ . '/..' . '/../lib/HookManager.php',
- 'OCA\\Encryption\\Hooks\\Contracts\\IHook' => __DIR__ . '/..' . '/../lib/Hooks/Contracts/IHook.php',
- 'OCA\\Encryption\\Hooks\\UserHooks' => __DIR__ . '/..' . '/../lib/Hooks/UserHooks.php',
'OCA\\Encryption\\KeyManager' => __DIR__ . '/..' . '/../lib/KeyManager.php',
+ 'OCA\\Encryption\\Listeners\\UserEventsListener' => __DIR__ . '/..' . '/../lib/Listeners/UserEventsListener.php',
'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => __DIR__ . '/..' . '/../lib/Migration/SetMasterKeyStatus.php',
'OCA\\Encryption\\Recovery' => __DIR__ . '/..' . '/../lib/Recovery.php',
+ 'OCA\\Encryption\\Services\\PassphraseService' => __DIR__ . '/..' . '/../lib/Services/PassphraseService.php',
'OCA\\Encryption\\Session' => __DIR__ . '/..' . '/../lib/Session.php',
'OCA\\Encryption\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
'OCA\\Encryption\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
diff --git a/apps/encryption/css/settings-personal.css.map.license b/apps/encryption/css/settings-personal.css.map.license
new file mode 100644
index 00000000000..be73f3515e3
--- /dev/null
+++ b/apps/encryption/css/settings-personal.css.map.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+SPDX-FileCopyrightText: 2013 ownCloud, Inc.
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/apps/encryption/img/app.svg b/apps/encryption/img/app.svg
index 60b4faa73ec..ae1202bf4e2 100644
--- a/apps/encryption/img/app.svg
+++ b/apps/encryption/img/app.svg
@@ -1 +1 @@
-<svg viewBox="0 0 16 16" height="16" width="16" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"><path d="M6 22c-.55 0-1.021-.196-1.412-.587A1.927 1.927 0 0 1 4 20V10c0-.55.196-1.021.588-1.413A1.926 1.926 0 0 1 6 8h1V6c0-1.383.488-2.562 1.463-3.538C9.438 1.487 10.617 1 12 1s2.563.487 3.538 1.462C16.513 3.438 17 4.617 17 6v2h1c.55 0 1.021.196 1.413.587.391.392.587.863.587 1.413v10a1.93 1.93 0 0 1-.587 1.413A1.93 1.93 0 0 1 18 22H6Zm6-5a1.93 1.93 0 0 0 1.413-.587A1.93 1.93 0 0 0 14 15a1.93 1.93 0 0 0-.587-1.413A1.93 1.93 0 0 0 12 13c-.55 0-1.021.196-1.412.587A1.927 1.927 0 0 0 10 15c0 .55.196 1.021.588 1.413.391.391.862.587 1.412.587ZM9 8h6V6c0-.833-.292-1.542-.875-2.125A2.894 2.894 0 0 0 12 3c-.833 0-1.542.292-2.125.875A2.894 2.894 0 0 0 9 6v2Z" style="fill:#fff;fill-rule:nonzero" transform="matrix(.625 0 0 .625 .5 .375)"/></svg> \ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 -960 960 960" width="20px" fill="#fff"><path d="M422-360h116l-22-129q16.74-8.94 26.37-25.93 9.63-16.99 9.63-37.56Q552-582 530.79-603q-21.21-21-51-21T429-602.85Q408-581.7 408-552q0 20.41 9.63 37.27Q427.26-497.87 444-489l-22 129Zm58 264q-135-33-223.5-152.84Q168-368.69 168-515v-229l312-120 312 120v229q0 146.31-88.5 266.16Q615-129 480-96Z"/></svg> \ No newline at end of file
diff --git a/apps/encryption/l10n/ar.js b/apps/encryption/l10n/ar.js
index 8f073e06d18..f8cc148d1a8 100644
--- a/apps/encryption/l10n/ar.js
+++ b/apps/encryption/l10n/ar.js
@@ -8,7 +8,7 @@ OC.L10N.register(
"Could not enable recovery key. Please check your recovery key password!" : "لم يُمكن تفعيل مفتاح الاستعادة. يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
"Recovery key successfully disabled" : "تمّ بنجاح تعطيل مفتاح الاستعادة ",
"Could not disable recovery key. Please check your recovery key password!" : "لم يُمكن تعطيل مفتاح الاستعادة. يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
- "Missing parameters" : "البارامترات ناقصة",
+ "Missing parameters" : "المعاملات ناقصة",
"Please provide the old recovery password" : "يرجى إعطاء كلمة مرور الاستعادة القديمة",
"Please provide a new recovery password" : "يرجى إعطاء كلمة مرور جديدة للاستعادة",
"Please repeat the new recovery password" : "يرجى تكرار كلمة مرور الاستعادة الجديدة",
@@ -22,22 +22,22 @@ OC.L10N.register(
"The current log-in password was not correct, please try again." : "كلمة المرور الحالية للدخول غير صحيحة، يرجى المحاولة مرة أخرى.",
"Private key password successfully updated." : "تم تحديث كلمة المرور للمفتاح الخاص بنجاح.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "مفتاح خاص غير صالح لتطبيق التشفير. يرجى تحديث كلمة مرور المفتاح الخاص في إعداداتك الشخصية لاستعادة الوصول إلى ملفاتك المشفرة.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "تمّ تفعيل تطبيق التشفير، لكن لم تتم تهيئة المفاتيح الخاصة بك. الرجاء الخروج ثم الدخول من جديدٍ.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "يرجى تمكين التشفير من جانب الخادوم في إعدادات المُشرف حتّى يتسنّى استخدام وحدة التشفير.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "تم تمكين تطبيق التشفير، ولكن لم تتم تهيئة المفاتيح الخاصة بك. يرجى تسجيل الخروج ثم تسجيل الدخول من جديد.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "يرجى تمكين التشفير من جانب الخادم في إعدادات المدير حتى يمكن استخدام وحدة التشفير.",
"Encryption app is enabled and ready" : "تطبيق التشفير مُفعّل و جاهز للعمل",
"Bad Signature" : "توقيع غير مقبول",
"Missing Signature" : "توقيع مفقود",
- "one-time password for server-side-encryption" : "كلمة مرور لمرة واحدة للتشفير من جانب الخادوم",
- "Encryption password" : "كلمة سر التشفير",
- "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "قام المشرف بتمكين التشفير من جانب الخادوم. و تمّ تشفير ملفاتك باستخدام كلمة السر <strong>%s</strong>.",
- "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "قام المشرف بتمكين التشفير من جانب الخادوم. و تمّ تشفير ملفاتك باستخدام كلمة السر \"%s\".",
- "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "يرجى تسجيل الدخول إلى واجهة الويب، و الانتقال إلى قسم \"الأمان\" Security في إعداداتك الشخصية وتحديث كلمة مرور التشفير خاصّتك عن طريق إدخال كلمة المرور هذه في حقل \"كلمة مرور تسجيل الدخول القديمة\" Old login password،و كلمة مرور تسجيل الدخول الحالية.",
+ "one-time password for server-side-encryption" : "كلمة مرور لمرة واحدة للتشفير من جانب الخادم",
+ "Encryption password" : "كلمة مرور التشفير",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "قام المدير بتمكين التشفير من جانب الخادم. و تمّ تشفير ملفاتك باستخدام كلمة المرور <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "قام المدير بتمكين التشفير من جانب الخادم. و تمّ تشفير ملفاتك باستخدام كلمة المرور \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "يرجى تسجيل الدخول إلى واجهة الويب، و الانتقال إلى قسم \"الأمان\" Security في إعداداتك الشخصية وتحديث كلمة مرور التشفير الخاصة بك عن طريق إدخال كلمة المرور هذه في حقل \"كلمة مرور تسجيل الدخول القديمة\" Old login password،و كلمة مرور تسجيل الدخول الحالية.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "تعذّر فك تشفير هذا الملف؛ ربما يكون ملفّاً مُشتركاً. رجاءً، أطلب من مالك الملف إلغاء مشاركته معك.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "تعذرت قراءة هذا الملف؛ ربما يكون ملفّاً مُشتركاً. رجاءً، أطلب من مالك الملف إلغاء مشاركته معك.",
"Default encryption module" : "وحدة التشفير الافتراضية",
- "Default encryption module for server-side encryption" : "وحدة التشفير الافتراضية للتشفير من جانب الخادوم",
- "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "لاستخدام وحدة التشفير هذه ، تحتاج إلى تمكين التشفير من جانب الخادوم في إعدادات المُشرف. بمجرد تمكين هذه الوحدة ، ستقوم بتشفير جميع ملفاتك بشفافية. يعتمد التشفير على مفاتيح AES 256. لن تلمس الوحدة الملفات الموجودة ، سيتم تشفير الملفات الجديدة فقط بعد تمكين التشفير من جانب الخادوم. لكن لاحظ أنه لن يُمكن تعطيل التشفير والعودة إلى حالة عدم التشفير. يرجى قراءة الوثائق لمعرفة جميع العواقب قبل أن تقرر تمكين التشفير من جانب الخادوم.",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "تمّ تمكين تطبيق التشفير، ولكن لم يتمّ تهيئة المفاتيح الخاصة بك. يرجى الخروج ثم الدخول من جديدٍ.",
+ "Default encryption module for server-side encryption" : "وحدة التشفير الافتراضية للتشفير من جانب الخادم",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "لاستخدام وحدة التشفير هذه ، تحتاج إلى تمكين التشفير من جانب الخادم في إعدادات المدير. بمجرد تمكين هذه الوحدة ، ستقوم بتشفير جميع ملفاتك بشفافية. يعتمد التشفير على مفاتيح AES 256. لن تلمس الوحدة الملفات الموجودة ، سيتم تشفير الملفات الجديدة فقط بعد تمكين التشفير من جانب الخادم. لكن لاحظ أنه لن يُمكن تعطيل التشفير والعودة إلى حالة عدم التشفير. يرجى قراءة الوثائق لمعرفة جميع العواقب قبل أن تقرر تمكين التشفير من جانب الخادم.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تطبيق التشفير، ولكن لم تتم تهيئة المفاتيح الخاصة بك. يرجى تسجيل الخروج ثم تسجيل الدخول من جديد.",
"Encrypt the home storage" : "تشفير وحدة التخزين الأساسية",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "يؤدي تمكين هذا الخيار إلى تشفير جميع الملفات المخزنة على وحدة التخزين الرئيسية، وإلا فسيتم تشفير الملفات الموجودة على وحدة التخزين الخارجية فقط",
"Enable recovery key" : "تمكين مفتاح الاستعادة",
@@ -49,19 +49,17 @@ OC.L10N.register(
"Old recovery key password" : "كلمة مرور مفتاح الاستعادة القديمة",
"New recovery key password" : "كلمة مرور جديدة لمفتاح الاستعادة",
"Repeat new recovery key password" : "أعد كتابة كلمة مرور مفتاح الاستعادة الجديدة",
- "Change Password" : "عدل كلمة السر",
+ "Change Password" : "تعديل كلمة المرور",
"Basic encryption module" : "وحدة التشفير الأساسية",
"Your private key password no longer matches your log-in password." : "لم تعد كلمة مرور المفتاح الخاص تطابق كلمة مرور تسجيل الدخول الخاصة بك.",
"Set your old private key password to your current log-in password:" : "قم بتعيين كلمة مرور المفتاح الخاص القديم على كلمة مرور تسجيل الدخول الحالية:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "اذا كنت لاتتذكر كلمة السر تستطيع ان تطلب من المدير ان يستعيد ملفاتك.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "إذا كنت لا تتذكر كلمة مرورك القديمة، فيمكنك أن تطلب من المشرف استرداد ملفاتك.",
"Old log-in password" : "كلمة المرور القديمة الخاصة بالدخول",
"Current log-in password" : "كلمة المرور الحالية الخاصة بالدخول",
"Update Private Key Password" : "تحديث كلمة المرور لـ المفتاح الخاص",
"Enable password recovery:" : "تفعيل استعادة كلمة المرور:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "تفعيل هذا الخيار يمكنك من اعادة الوصول الى ملفاتك المشفرة عند فقدان كلمة المرور",
"Enabled" : "مفعلة",
- "Disabled" : "معطلة",
- "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 log-in password\" field and your current login-password." : "الرجاء تسجيل الدخول إلى واجهة الويب ثم الانتقال إلى قسم \"الأمان\" security في إعداداتك الشخصية وتحديث كلمة مرور التشفير الخاصة بك بإدخالها في خانة \"كلمة مرور الدخول القديمة\" Old log-in password ثم إدخال كلمة مرور الدخول الحالية.",
- "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." : "مفتاح الاسترداد هو مفتاح تشفير إضافي يُستخدم لتشفير الملفات. يسمح باستعادة ملفات المستخدم إذا نسي المستخدم كلمة المرور الخاصة به."
+ "Disabled" : "معطلة"
},
"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/apps/encryption/l10n/ar.json b/apps/encryption/l10n/ar.json
index 838b01660d4..a99cca63d1e 100644
--- a/apps/encryption/l10n/ar.json
+++ b/apps/encryption/l10n/ar.json
@@ -6,7 +6,7 @@
"Could not enable recovery key. Please check your recovery key password!" : "لم يُمكن تفعيل مفتاح الاستعادة. يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
"Recovery key successfully disabled" : "تمّ بنجاح تعطيل مفتاح الاستعادة ",
"Could not disable recovery key. Please check your recovery key password!" : "لم يُمكن تعطيل مفتاح الاستعادة. يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
- "Missing parameters" : "البارامترات ناقصة",
+ "Missing parameters" : "المعاملات ناقصة",
"Please provide the old recovery password" : "يرجى إعطاء كلمة مرور الاستعادة القديمة",
"Please provide a new recovery password" : "يرجى إعطاء كلمة مرور جديدة للاستعادة",
"Please repeat the new recovery password" : "يرجى تكرار كلمة مرور الاستعادة الجديدة",
@@ -20,22 +20,22 @@
"The current log-in password was not correct, please try again." : "كلمة المرور الحالية للدخول غير صحيحة، يرجى المحاولة مرة أخرى.",
"Private key password successfully updated." : "تم تحديث كلمة المرور للمفتاح الخاص بنجاح.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "مفتاح خاص غير صالح لتطبيق التشفير. يرجى تحديث كلمة مرور المفتاح الخاص في إعداداتك الشخصية لاستعادة الوصول إلى ملفاتك المشفرة.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "تمّ تفعيل تطبيق التشفير، لكن لم تتم تهيئة المفاتيح الخاصة بك. الرجاء الخروج ثم الدخول من جديدٍ.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "يرجى تمكين التشفير من جانب الخادوم في إعدادات المُشرف حتّى يتسنّى استخدام وحدة التشفير.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "تم تمكين تطبيق التشفير، ولكن لم تتم تهيئة المفاتيح الخاصة بك. يرجى تسجيل الخروج ثم تسجيل الدخول من جديد.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "يرجى تمكين التشفير من جانب الخادم في إعدادات المدير حتى يمكن استخدام وحدة التشفير.",
"Encryption app is enabled and ready" : "تطبيق التشفير مُفعّل و جاهز للعمل",
"Bad Signature" : "توقيع غير مقبول",
"Missing Signature" : "توقيع مفقود",
- "one-time password for server-side-encryption" : "كلمة مرور لمرة واحدة للتشفير من جانب الخادوم",
- "Encryption password" : "كلمة سر التشفير",
- "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "قام المشرف بتمكين التشفير من جانب الخادوم. و تمّ تشفير ملفاتك باستخدام كلمة السر <strong>%s</strong>.",
- "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "قام المشرف بتمكين التشفير من جانب الخادوم. و تمّ تشفير ملفاتك باستخدام كلمة السر \"%s\".",
- "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "يرجى تسجيل الدخول إلى واجهة الويب، و الانتقال إلى قسم \"الأمان\" Security في إعداداتك الشخصية وتحديث كلمة مرور التشفير خاصّتك عن طريق إدخال كلمة المرور هذه في حقل \"كلمة مرور تسجيل الدخول القديمة\" Old login password،و كلمة مرور تسجيل الدخول الحالية.",
+ "one-time password for server-side-encryption" : "كلمة مرور لمرة واحدة للتشفير من جانب الخادم",
+ "Encryption password" : "كلمة مرور التشفير",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "قام المدير بتمكين التشفير من جانب الخادم. و تمّ تشفير ملفاتك باستخدام كلمة المرور <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "قام المدير بتمكين التشفير من جانب الخادم. و تمّ تشفير ملفاتك باستخدام كلمة المرور \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "يرجى تسجيل الدخول إلى واجهة الويب، و الانتقال إلى قسم \"الأمان\" Security في إعداداتك الشخصية وتحديث كلمة مرور التشفير الخاصة بك عن طريق إدخال كلمة المرور هذه في حقل \"كلمة مرور تسجيل الدخول القديمة\" Old login password،و كلمة مرور تسجيل الدخول الحالية.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "تعذّر فك تشفير هذا الملف؛ ربما يكون ملفّاً مُشتركاً. رجاءً، أطلب من مالك الملف إلغاء مشاركته معك.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "تعذرت قراءة هذا الملف؛ ربما يكون ملفّاً مُشتركاً. رجاءً، أطلب من مالك الملف إلغاء مشاركته معك.",
"Default encryption module" : "وحدة التشفير الافتراضية",
- "Default encryption module for server-side encryption" : "وحدة التشفير الافتراضية للتشفير من جانب الخادوم",
- "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "لاستخدام وحدة التشفير هذه ، تحتاج إلى تمكين التشفير من جانب الخادوم في إعدادات المُشرف. بمجرد تمكين هذه الوحدة ، ستقوم بتشفير جميع ملفاتك بشفافية. يعتمد التشفير على مفاتيح AES 256. لن تلمس الوحدة الملفات الموجودة ، سيتم تشفير الملفات الجديدة فقط بعد تمكين التشفير من جانب الخادوم. لكن لاحظ أنه لن يُمكن تعطيل التشفير والعودة إلى حالة عدم التشفير. يرجى قراءة الوثائق لمعرفة جميع العواقب قبل أن تقرر تمكين التشفير من جانب الخادوم.",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "تمّ تمكين تطبيق التشفير، ولكن لم يتمّ تهيئة المفاتيح الخاصة بك. يرجى الخروج ثم الدخول من جديدٍ.",
+ "Default encryption module for server-side encryption" : "وحدة التشفير الافتراضية للتشفير من جانب الخادم",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "لاستخدام وحدة التشفير هذه ، تحتاج إلى تمكين التشفير من جانب الخادم في إعدادات المدير. بمجرد تمكين هذه الوحدة ، ستقوم بتشفير جميع ملفاتك بشفافية. يعتمد التشفير على مفاتيح AES 256. لن تلمس الوحدة الملفات الموجودة ، سيتم تشفير الملفات الجديدة فقط بعد تمكين التشفير من جانب الخادم. لكن لاحظ أنه لن يُمكن تعطيل التشفير والعودة إلى حالة عدم التشفير. يرجى قراءة الوثائق لمعرفة جميع العواقب قبل أن تقرر تمكين التشفير من جانب الخادم.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تطبيق التشفير، ولكن لم تتم تهيئة المفاتيح الخاصة بك. يرجى تسجيل الخروج ثم تسجيل الدخول من جديد.",
"Encrypt the home storage" : "تشفير وحدة التخزين الأساسية",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "يؤدي تمكين هذا الخيار إلى تشفير جميع الملفات المخزنة على وحدة التخزين الرئيسية، وإلا فسيتم تشفير الملفات الموجودة على وحدة التخزين الخارجية فقط",
"Enable recovery key" : "تمكين مفتاح الاستعادة",
@@ -47,19 +47,17 @@
"Old recovery key password" : "كلمة مرور مفتاح الاستعادة القديمة",
"New recovery key password" : "كلمة مرور جديدة لمفتاح الاستعادة",
"Repeat new recovery key password" : "أعد كتابة كلمة مرور مفتاح الاستعادة الجديدة",
- "Change Password" : "عدل كلمة السر",
+ "Change Password" : "تعديل كلمة المرور",
"Basic encryption module" : "وحدة التشفير الأساسية",
"Your private key password no longer matches your log-in password." : "لم تعد كلمة مرور المفتاح الخاص تطابق كلمة مرور تسجيل الدخول الخاصة بك.",
"Set your old private key password to your current log-in password:" : "قم بتعيين كلمة مرور المفتاح الخاص القديم على كلمة مرور تسجيل الدخول الحالية:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "اذا كنت لاتتذكر كلمة السر تستطيع ان تطلب من المدير ان يستعيد ملفاتك.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "إذا كنت لا تتذكر كلمة مرورك القديمة، فيمكنك أن تطلب من المشرف استرداد ملفاتك.",
"Old log-in password" : "كلمة المرور القديمة الخاصة بالدخول",
"Current log-in password" : "كلمة المرور الحالية الخاصة بالدخول",
"Update Private Key Password" : "تحديث كلمة المرور لـ المفتاح الخاص",
"Enable password recovery:" : "تفعيل استعادة كلمة المرور:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "تفعيل هذا الخيار يمكنك من اعادة الوصول الى ملفاتك المشفرة عند فقدان كلمة المرور",
"Enabled" : "مفعلة",
- "Disabled" : "معطلة",
- "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 log-in password\" field and your current login-password." : "الرجاء تسجيل الدخول إلى واجهة الويب ثم الانتقال إلى قسم \"الأمان\" security في إعداداتك الشخصية وتحديث كلمة مرور التشفير الخاصة بك بإدخالها في خانة \"كلمة مرور الدخول القديمة\" Old log-in password ثم إدخال كلمة مرور الدخول الحالية.",
- "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." : "مفتاح الاسترداد هو مفتاح تشفير إضافي يُستخدم لتشفير الملفات. يسمح باستعادة ملفات المستخدم إذا نسي المستخدم كلمة المرور الخاصة به."
+ "Disabled" : "معطلة"
},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/ast.js b/apps/encryption/l10n/ast.js
deleted file mode 100644
index eb732bada56..00000000000
--- a/apps/encryption/l10n/ast.js
+++ /dev/null
@@ -1,29 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Recovery key successfully enabled" : "Habilitóse la recuperación de ficheros",
- "Could not enable recovery key. Please check your recovery key password!" : "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña.",
- "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
- "Could not disable recovery key. Please check your recovery key password!" : "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
- "Password successfully changed." : "Camudóse la contraseña",
- "Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
- "Private key password successfully updated." : "Contraseña de clave privada anovada correchamente.",
- "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clave privada non válida pa Encryption. Por favor, anueva la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.",
- "The share will expire on %s." : "La compartición va caducar el %s.",
- "Cheers!" : "¡Salú!",
- "Recovery key password" : "Contraseña de clave de recuperación",
- "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
- "Change Password" : "Camudar contraseña",
- "Set your old private key password to your current log-in password:" : "Afita la contraseña de clave privada vieya pa la to contraseña d'aniciu de sesión actual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.",
- "Old log-in password" : "Contraseña d'accesu vieya",
- "Current log-in password" : "Contraseña d'accesu actual",
- "Update Private Key Password" : "Anovar Contraseña de Clave Privada",
- "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña",
- "Enabled" : "Habilitar",
- "Disabled" : "Deshabilitáu"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/ast.json b/apps/encryption/l10n/ast.json
deleted file mode 100644
index 501e4757acf..00000000000
--- a/apps/encryption/l10n/ast.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{ "translations": {
- "Recovery key successfully enabled" : "Habilitóse la recuperación de ficheros",
- "Could not enable recovery key. Please check your recovery key password!" : "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña.",
- "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
- "Could not disable recovery key. Please check your recovery key password!" : "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
- "Password successfully changed." : "Camudóse la contraseña",
- "Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
- "Private key password successfully updated." : "Contraseña de clave privada anovada correchamente.",
- "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clave privada non válida pa Encryption. Por favor, anueva la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.",
- "The share will expire on %s." : "La compartición va caducar el %s.",
- "Cheers!" : "¡Salú!",
- "Recovery key password" : "Contraseña de clave de recuperación",
- "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
- "Change Password" : "Camudar contraseña",
- "Set your old private key password to your current log-in password:" : "Afita la contraseña de clave privada vieya pa la to contraseña d'aniciu de sesión actual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.",
- "Old log-in password" : "Contraseña d'accesu vieya",
- "Current log-in password" : "Contraseña d'accesu actual",
- "Update Private Key Password" : "Anovar Contraseña de Clave Privada",
- "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña",
- "Enabled" : "Habilitar",
- "Disabled" : "Deshabilitáu"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/az.js b/apps/encryption/l10n/az.js
deleted file mode 100644
index d4190b66aab..00000000000
--- a/apps/encryption/l10n/az.js
+++ /dev/null
@@ -1,35 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Missing recovery key password" : "Bərpa açarının şifrəsi çatışmır",
- "Please repeat the recovery key password" : "Xahiş olunur bərpa açarı şifrəsini təkrarlayasınız",
- "Repeated recovery key password does not match the provided recovery key password" : "Təkrar daxil edilən bərpa açarı şifrəsi, öncə daxil edilən bərpa açarı ilə üst-üstə düşmür ",
- "Recovery key successfully enabled" : "Bərpa açarı uğurla aktivləşdi",
- "Could not enable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarının aktivləşdirilməsi mümkün olmadı. Xahiş olunur geriqaytarılma açarı üçün tələb edilən şifrəni yoxlayasınız.",
- "Recovery key successfully disabled" : "Bərpa açarı uğurla söndürüldü",
- "Could not disable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarını sondürmək olmur. Xahiş edirik geriqaytarılma key açarınızı yoxlayın.",
- "Please provide the old recovery password" : "Xahiş olunur köhnə bərpa açarını daxil edəsiniz",
- "Please provide a new recovery password" : "Xahiş olunur yeni bərpa açarı şifrəsini daxil esəsiniz",
- "Please repeat the new recovery password" : "Xahiş olunur yeni bərpa açarını təkrarlayasınız",
- "Password successfully changed." : "Şifrə uğurla dəyişdirildi.",
- "Could not change the password. Maybe the old password was not correct." : "Şifrəni dəyişmək olmur, ola bilər ki, köhnə şifrə düzgün olmayıb.",
- "Could not update the private key password." : "Gizli açarın şifrəsini yeniləmək mümkün olmadı.",
- "The old password was not correct, please try again." : "Köhnə şifrə düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
- "The current log-in password was not correct, please try again." : "Hal-hazırki istifadəçi şifrəsi düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
- "Private key password successfully updated." : "Gizli aşar şifrəsi uğurla yeniləndi.",
- "Cheers!" : "Şərəfə!",
- "Recovery key password" : "Açar şifrənin bərpa edilməsi",
- "Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
- "Change Password" : "Şifrəni dəyişdir",
- "Your private key password no longer matches your log-in password." : "Sizin gizli açar şifrəsi, artıq giriş adınızla uyğun gəlmir.",
- "Set your old private key password to your current log-in password:" : "Köhnə açar şifrənizi, sizin hal-hazırki giriş şifrənizə təyin edin: ",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Əgər siz köhnə şifrənizi xatırlamırsınızsa, öz inzibatçınızdan fayllarınızın bərpasını istəyə bilərsiniz.",
- "Old log-in password" : "Köhnə giriş şifrəsi",
- "Current log-in password" : "Hal-hazırki giriş şifrəsi",
- "Update Private Key Password" : "Gizli açar şifrəsini yenilə",
- "Enable password recovery:" : "Şifrə bərpasını işə sal:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu opsiyanın aktiv edilməsi sizə, şifrənin itdiyi hallarda bütün şifrələnmiş fayllarınıza yetkinin yenidən əldə edilməsinə şərait yaradacaq",
- "Enabled" : "İşə salınıb",
- "Disabled" : "Dayandırılıb"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/az.json b/apps/encryption/l10n/az.json
deleted file mode 100644
index 6e88e1740a7..00000000000
--- a/apps/encryption/l10n/az.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{ "translations": {
- "Missing recovery key password" : "Bərpa açarının şifrəsi çatışmır",
- "Please repeat the recovery key password" : "Xahiş olunur bərpa açarı şifrəsini təkrarlayasınız",
- "Repeated recovery key password does not match the provided recovery key password" : "Təkrar daxil edilən bərpa açarı şifrəsi, öncə daxil edilən bərpa açarı ilə üst-üstə düşmür ",
- "Recovery key successfully enabled" : "Bərpa açarı uğurla aktivləşdi",
- "Could not enable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarının aktivləşdirilməsi mümkün olmadı. Xahiş olunur geriqaytarılma açarı üçün tələb edilən şifrəni yoxlayasınız.",
- "Recovery key successfully disabled" : "Bərpa açarı uğurla söndürüldü",
- "Could not disable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarını sondürmək olmur. Xahiş edirik geriqaytarılma key açarınızı yoxlayın.",
- "Please provide the old recovery password" : "Xahiş olunur köhnə bərpa açarını daxil edəsiniz",
- "Please provide a new recovery password" : "Xahiş olunur yeni bərpa açarı şifrəsini daxil esəsiniz",
- "Please repeat the new recovery password" : "Xahiş olunur yeni bərpa açarını təkrarlayasınız",
- "Password successfully changed." : "Şifrə uğurla dəyişdirildi.",
- "Could not change the password. Maybe the old password was not correct." : "Şifrəni dəyişmək olmur, ola bilər ki, köhnə şifrə düzgün olmayıb.",
- "Could not update the private key password." : "Gizli açarın şifrəsini yeniləmək mümkün olmadı.",
- "The old password was not correct, please try again." : "Köhnə şifrə düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
- "The current log-in password was not correct, please try again." : "Hal-hazırki istifadəçi şifrəsi düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
- "Private key password successfully updated." : "Gizli aşar şifrəsi uğurla yeniləndi.",
- "Cheers!" : "Şərəfə!",
- "Recovery key password" : "Açar şifrənin bərpa edilməsi",
- "Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
- "Change Password" : "Şifrəni dəyişdir",
- "Your private key password no longer matches your log-in password." : "Sizin gizli açar şifrəsi, artıq giriş adınızla uyğun gəlmir.",
- "Set your old private key password to your current log-in password:" : "Köhnə açar şifrənizi, sizin hal-hazırki giriş şifrənizə təyin edin: ",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Əgər siz köhnə şifrənizi xatırlamırsınızsa, öz inzibatçınızdan fayllarınızın bərpasını istəyə bilərsiniz.",
- "Old log-in password" : "Köhnə giriş şifrəsi",
- "Current log-in password" : "Hal-hazırki giriş şifrəsi",
- "Update Private Key Password" : "Gizli açar şifrəsini yenilə",
- "Enable password recovery:" : "Şifrə bərpasını işə sal:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu opsiyanın aktiv edilməsi sizə, şifrənin itdiyi hallarda bütün şifrələnmiş fayllarınıza yetkinin yenidən əldə edilməsinə şərait yaradacaq",
- "Enabled" : "İşə salınıb",
- "Disabled" : "Dayandırılıb"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/bg.js b/apps/encryption/l10n/bg.js
index 845bda9a915..009fb7d9aee 100644
--- a/apps/encryption/l10n/bg.js
+++ b/apps/encryption/l10n/bg.js
@@ -51,15 +51,12 @@ OC.L10N.register(
"Basic encryption module" : "Основен модул за криптиране",
"Your private key password no longer matches your log-in password." : "Личният ви ключ не съвпада с паролата за вписване.",
"Set your old private key password to your current log-in password:" : "Промени паролата за тайния ти включ на паролата за вписване:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ако не помниш старата парола помоли администратора да възстанови файловете ти.",
"Old log-in password" : "Стара парола за вписване",
"Current log-in password" : "Текуща парола за вписване",
"Update Private Key Password" : "Промени Тайната Парола за Ключа",
"Enable password recovery:" : "Включи опцията възстановяване на паролата:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Избирането на тази опция ще ти позволи да възстановиш достъпа си до файловете в случай на изгубена парола.",
"Enabled" : "Включено",
- "Disabled" : "Изключено",
- "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 log-in password\" field and your current login-password." : "Моля, влезте в уеб интерфейса, отидете в раздел „Сигурност“ на личните си настройки и актуализирайте паролата си за криптиране, като въведете тази парола в полето „Стара парола за влизане“ и текущата си парола за влизане.",
- "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." : "Ключът за възстановяване е допълнителен ключ за криптиране, който се използва за криптиране на файлове. Той позволява възстановяване на файлове на потребител, ако потребителят си забрави паролата."
+ "Disabled" : "Изключено"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/bg.json b/apps/encryption/l10n/bg.json
index 3b1d1bc99c1..4a4ed94210e 100644
--- a/apps/encryption/l10n/bg.json
+++ b/apps/encryption/l10n/bg.json
@@ -49,15 +49,12 @@
"Basic encryption module" : "Основен модул за криптиране",
"Your private key password no longer matches your log-in password." : "Личният ви ключ не съвпада с паролата за вписване.",
"Set your old private key password to your current log-in password:" : "Промени паролата за тайния ти включ на паролата за вписване:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ако не помниш старата парола помоли администратора да възстанови файловете ти.",
"Old log-in password" : "Стара парола за вписване",
"Current log-in password" : "Текуща парола за вписване",
"Update Private Key Password" : "Промени Тайната Парола за Ключа",
"Enable password recovery:" : "Включи опцията възстановяване на паролата:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Избирането на тази опция ще ти позволи да възстановиш достъпа си до файловете в случай на изгубена парола.",
"Enabled" : "Включено",
- "Disabled" : "Изключено",
- "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 log-in password\" field and your current login-password." : "Моля, влезте в уеб интерфейса, отидете в раздел „Сигурност“ на личните си настройки и актуализирайте паролата си за криптиране, като въведете тази парола в полето „Стара парола за влизане“ и текущата си парола за влизане.",
- "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." : "Ключът за възстановяване е допълнителен ключ за криптиране, който се използва за криптиране на файлове. Той позволява възстановяване на файлове на потребител, ако потребителят си забрави паролата."
+ "Disabled" : "Изключено"
},"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/ca.js b/apps/encryption/l10n/ca.js
index e5f7f4126a8..fd531c313ab 100644
--- a/apps/encryption/l10n/ca.js
+++ b/apps/encryption/l10n/ca.js
@@ -47,14 +47,12 @@ OC.L10N.register(
"Basic encryption module" : "Mòdul de xifratge bàsic",
"Your private key password no longer matches your log-in password." : "La clau privada ja no es correspon amb la contrasenya d'inici de sessió:",
"Set your old private key password to your current log-in password:" : "Establiu la vostra antiga clau privada a l'actual contrasenya d'accés:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers.",
"Old log-in password" : "Contrasenya antiga d’inici de sessió",
"Current log-in password" : "Contrasenya actual d’inici de sessió",
"Update Private Key Password" : "Actualitza la contrasenya de clau privada",
"Enable password recovery:" : "Habilita la recuperació de contrasenya:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Si activeu aquesta opció, podreu accedir als vostres fitxers encriptats en cas de pèrdua de contrasenya",
"Enabled" : "Habilitat",
- "Disabled" : "Inhabilitat",
- "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 recuperació és una clau de xifratge addicional que s'utilitza per xifrar fitxers. Permet la recuperació dels fitxers d'un usuari si l'usuari oblida de la seva contrasenya."
+ "Disabled" : "Inhabilitat"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/ca.json b/apps/encryption/l10n/ca.json
index 03c644368b7..80c09aa0b0d 100644
--- a/apps/encryption/l10n/ca.json
+++ b/apps/encryption/l10n/ca.json
@@ -45,14 +45,12 @@
"Basic encryption module" : "Mòdul de xifratge bàsic",
"Your private key password no longer matches your log-in password." : "La clau privada ja no es correspon amb la contrasenya d'inici de sessió:",
"Set your old private key password to your current log-in password:" : "Establiu la vostra antiga clau privada a l'actual contrasenya d'accés:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers.",
"Old log-in password" : "Contrasenya antiga d’inici de sessió",
"Current log-in password" : "Contrasenya actual d’inici de sessió",
"Update Private Key Password" : "Actualitza la contrasenya de clau privada",
"Enable password recovery:" : "Habilita la recuperació de contrasenya:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Si activeu aquesta opció, podreu accedir als vostres fitxers encriptats en cas de pèrdua de contrasenya",
"Enabled" : "Habilitat",
- "Disabled" : "Inhabilitat",
- "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 recuperació és una clau de xifratge addicional que s'utilitza per xifrar fitxers. Permet la recuperació dels fitxers d'un usuari si l'usuari oblida de la seva contrasenya."
+ "Disabled" : "Inhabilitat"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/cs.js b/apps/encryption/l10n/cs.js
index 0a6ca640e8b..97d6108a17d 100644
--- a/apps/encryption/l10n/cs.js
+++ b/apps/encryption/l10n/cs.js
@@ -42,6 +42,7 @@ OC.L10N.register(
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Povolení tohoto nastavení zašifruje všechny soubory uložené v hlavním úložišti, jinak budou šifrovány pouze soubory na externích úložištích.",
"Enable recovery key" : "Povolit záchranný klíč",
"Disable recovery key" : "Vypnout záchranný klíč",
+ "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." : "Záchranný klíč je dodatečný šifrovací klíč sloužící pro šifrování souborů. Slouží k obnovení souborů z účtu, pokud dojde k zapomenutí hesla.",
"Recovery key password" : "Heslo ke klíči pro obnovu",
"Repeat recovery key password" : "Zopakovat heslo záchranného klíče",
"Change recovery key password:" : "Změna hesla klíče pro obnovu:",
@@ -52,15 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "Základní šifrovací modul",
"Your private key password no longer matches your log-in password." : "Heslo k vašemu soukromému klíči se už neshoduje s vaším přihlašovacím heslem.",
"Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
"Old log-in password" : "Původní přihlašovací heslo",
"Current log-in password" : "Stávající přihlašovací heslo",
"Update Private Key Password" : "Změnit heslo k soukromé části klíče",
"Enable password recovery:" : "Povolit obnovu hesla:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",
"Enabled" : "Povoleno",
- "Disabled" : "Zakázáno",
- "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 log-in password\" field and your current login-password." : "Přihlaste se do webového rozhraní, jděte do osobních nastavení, sekce „Zabezpečení“ a zaktualizujte své šifrovací heslo zadáním tohoto hesla do kolonky „Původní přihlašovací heslo“ a pak jako nové nastavte to heslo, kterým se nyní přihlašujete do Nexcloud.",
- "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." : "Záchranný klíč je dodatečný šifrovací klíč použitý pro\nšifrování souborů. S jeho pomocí lze obnovit soubory uživatele při zapomenutí hesla."
+ "Disabled" : "Zakázáno"
},
"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
diff --git a/apps/encryption/l10n/cs.json b/apps/encryption/l10n/cs.json
index 0b1c0a4df4b..24b09516608 100644
--- a/apps/encryption/l10n/cs.json
+++ b/apps/encryption/l10n/cs.json
@@ -40,6 +40,7 @@
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Povolení tohoto nastavení zašifruje všechny soubory uložené v hlavním úložišti, jinak budou šifrovány pouze soubory na externích úložištích.",
"Enable recovery key" : "Povolit záchranný klíč",
"Disable recovery key" : "Vypnout záchranný klíč",
+ "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." : "Záchranný klíč je dodatečný šifrovací klíč sloužící pro šifrování souborů. Slouží k obnovení souborů z účtu, pokud dojde k zapomenutí hesla.",
"Recovery key password" : "Heslo ke klíči pro obnovu",
"Repeat recovery key password" : "Zopakovat heslo záchranného klíče",
"Change recovery key password:" : "Změna hesla klíče pro obnovu:",
@@ -50,15 +51,13 @@
"Basic encryption module" : "Základní šifrovací modul",
"Your private key password no longer matches your log-in password." : "Heslo k vašemu soukromému klíči se už neshoduje s vaším přihlašovacím heslem.",
"Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
"Old log-in password" : "Původní přihlašovací heslo",
"Current log-in password" : "Stávající přihlašovací heslo",
"Update Private Key Password" : "Změnit heslo k soukromé části klíče",
"Enable password recovery:" : "Povolit obnovu hesla:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",
"Enabled" : "Povoleno",
- "Disabled" : "Zakázáno",
- "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 log-in password\" field and your current login-password." : "Přihlaste se do webového rozhraní, jděte do osobních nastavení, sekce „Zabezpečení“ a zaktualizujte své šifrovací heslo zadáním tohoto hesla do kolonky „Původní přihlašovací heslo“ a pak jako nové nastavte to heslo, kterým se nyní přihlašujete do Nexcloud.",
- "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." : "Záchranný klíč je dodatečný šifrovací klíč použitý pro\nšifrování souborů. S jeho pomocí lze obnovit soubory uživatele při zapomenutí hesla."
+ "Disabled" : "Zakázáno"
},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/da.js b/apps/encryption/l10n/da.js
index a9c1c8188c2..2688722c16c 100644
--- a/apps/encryption/l10n/da.js
+++ b/apps/encryption/l10n/da.js
@@ -27,16 +27,22 @@ OC.L10N.register(
"Encryption app is enabled and ready" : "Krypteringsprogrammet er aktiveret og klar",
"Bad Signature" : "Ugyldig signatur",
"Missing Signature" : "Signatur mangler",
- "one-time password for server-side-encryption" : "Engangs password for kryptering på serverdelen",
+ "one-time password for server-side-encryption" : "Engangs adgangskode for kryptering på serverdelen",
+ "Encryption password" : "Krypterings adgangskode",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Administrationen aktiverede server-side-kryptering. Dine filer blev krypteret med adgangskoden 1%s1.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Administrationen aktiverede server-side-kryptering. Dine filer blev krypteret med adgangskoden \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Log venligst ind på webgrænsefladen, gå til afsnittet \"Sikkerhed\" i dine personlige indstillinger og opdater din krypteringsadgangskode ved at indtaste denne adgangskode i feltet \"Gammel loginadgangskode\" og din nuværende loginadgangskode.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke dekryptere denne fil, sandsynligvis er dette en delt fil. Bed filejeren om at videredele filen med dig.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis er dette en delt fil. Bed filejeren om at videredele filen med dig.",
"Default encryption module" : "Standard krypterings modul",
"Default encryption module for server-side encryption" : "Standard krypteringsmodul til kryptering på serveren",
+ "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." : "For at bruge dette krypteringsmodul skal du aktivere serversidekryptering i admin-indstillingerne. Når det er aktiveret, vil dette modul kryptere alle dine filer gennemsigtigt. Krypteringen er baseret på AES 256 nøgler.\nModulet vil ikke røre ved eksisterende filer, kun nye filer vil blive krypteret efter server-side kryptering blev aktiveret. Det er heller ikke muligt at deaktivere krypteringen igen og skifte tilbage til et ukrypteret system.\nLæs venligst dokumentationen for at kende alle implikationer, før du beslutter dig for at aktivere server-side-kryptering.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret men dine nøgler er ikke indlæst, log venligst ud og ind igen",
"Encrypt the home storage" : "Krypter hjemmelageret",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ved at slå denne valgmulighed til krypteres alle filer i hovedlageret, ellers vil kun filer på eksternt lager blive krypteret",
- "Enable recovery key" : "Aktivér gendannelsesnøgle",
- "Disable recovery key" : "Deaktivér gendannelsesnøgle",
+ "Enable recovery key" : "Aktiver gendannelsesnøgle",
+ "Disable recovery key" : "Deaktiver gendannelsesnøgle",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Det bruges til at gendanne filer fra en konto, hvis adgangskoden er glemt.",
"Recovery key password" : "Gendannelsesnøgle kodeord",
"Repeat recovery key password" : "Gentag adgangskode for gendannelsesnøgle",
"Change recovery key password:" : "Skift gendannelsesnøgle kodeord:",
@@ -47,14 +53,12 @@ OC.L10N.register(
"Basic encryption module" : "Basis krypterings modul",
"Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
"Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
"Old log-in password" : "Gammel adgangskode",
"Current log-in password" : "Nuværende adgangskode",
"Update Private Key Password" : "Opdater Privat Nøgle Kodeord",
"Enable password recovery:" : "Aktiver kodeord gendannelse:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord",
"Enabled" : "Aktiveret",
- "Disabled" : "Deaktiveret",
- "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." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Den tillader gendannelse af en brugers filer, hvis brugeren glemmer sin adgangskode."
+ "Disabled" : "Deaktiveret"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/da.json b/apps/encryption/l10n/da.json
index f4dc54d66ed..688adab4704 100644
--- a/apps/encryption/l10n/da.json
+++ b/apps/encryption/l10n/da.json
@@ -25,16 +25,22 @@
"Encryption app is enabled and ready" : "Krypteringsprogrammet er aktiveret og klar",
"Bad Signature" : "Ugyldig signatur",
"Missing Signature" : "Signatur mangler",
- "one-time password for server-side-encryption" : "Engangs password for kryptering på serverdelen",
+ "one-time password for server-side-encryption" : "Engangs adgangskode for kryptering på serverdelen",
+ "Encryption password" : "Krypterings adgangskode",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Administrationen aktiverede server-side-kryptering. Dine filer blev krypteret med adgangskoden 1%s1.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Administrationen aktiverede server-side-kryptering. Dine filer blev krypteret med adgangskoden \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Log venligst ind på webgrænsefladen, gå til afsnittet \"Sikkerhed\" i dine personlige indstillinger og opdater din krypteringsadgangskode ved at indtaste denne adgangskode i feltet \"Gammel loginadgangskode\" og din nuværende loginadgangskode.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke dekryptere denne fil, sandsynligvis er dette en delt fil. Bed filejeren om at videredele filen med dig.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis er dette en delt fil. Bed filejeren om at videredele filen med dig.",
"Default encryption module" : "Standard krypterings modul",
"Default encryption module for server-side encryption" : "Standard krypteringsmodul til kryptering på serveren",
+ "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." : "For at bruge dette krypteringsmodul skal du aktivere serversidekryptering i admin-indstillingerne. Når det er aktiveret, vil dette modul kryptere alle dine filer gennemsigtigt. Krypteringen er baseret på AES 256 nøgler.\nModulet vil ikke røre ved eksisterende filer, kun nye filer vil blive krypteret efter server-side kryptering blev aktiveret. Det er heller ikke muligt at deaktivere krypteringen igen og skifte tilbage til et ukrypteret system.\nLæs venligst dokumentationen for at kende alle implikationer, før du beslutter dig for at aktivere server-side-kryptering.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret men dine nøgler er ikke indlæst, log venligst ud og ind igen",
"Encrypt the home storage" : "Krypter hjemmelageret",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ved at slå denne valgmulighed til krypteres alle filer i hovedlageret, ellers vil kun filer på eksternt lager blive krypteret",
- "Enable recovery key" : "Aktivér gendannelsesnøgle",
- "Disable recovery key" : "Deaktivér gendannelsesnøgle",
+ "Enable recovery key" : "Aktiver gendannelsesnøgle",
+ "Disable recovery key" : "Deaktiver gendannelsesnøgle",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Det bruges til at gendanne filer fra en konto, hvis adgangskoden er glemt.",
"Recovery key password" : "Gendannelsesnøgle kodeord",
"Repeat recovery key password" : "Gentag adgangskode for gendannelsesnøgle",
"Change recovery key password:" : "Skift gendannelsesnøgle kodeord:",
@@ -45,14 +51,12 @@
"Basic encryption module" : "Basis krypterings modul",
"Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
"Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
"Old log-in password" : "Gammel adgangskode",
"Current log-in password" : "Nuværende adgangskode",
"Update Private Key Password" : "Opdater Privat Nøgle Kodeord",
"Enable password recovery:" : "Aktiver kodeord gendannelse:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord",
"Enabled" : "Aktiveret",
- "Disabled" : "Deaktiveret",
- "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." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Den tillader gendannelse af en brugers filer, hvis brugeren glemmer sin adgangskode."
+ "Disabled" : "Deaktiveret"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/de.js b/apps/encryption/l10n/de.js
index ffe03dd515f..d75e6ab3a18 100644
--- a/apps/encryption/l10n/de.js
+++ b/apps/encryption/l10n/de.js
@@ -4,7 +4,7 @@ OC.L10N.register(
"Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
"Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
"Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
- "Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
+ "Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde aktiviert",
"Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfe das Passwort für den Wiederherstellungsschlüssel!",
"Recovery key successfully disabled" : "Wiederherstellungsschlüssel deaktiviert.",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfe das Passwort für den Wiederherstellungsschlüssel!",
@@ -16,32 +16,33 @@ OC.L10N.register(
"Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
"Recovery Key disabled" : "Wiederherstellungsschlüssel deaktiviert",
"Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
- "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuche es noch einmal oder kontaktiere deinen Administrator",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuche es noch einmal oder kontaktiere deine Administration",
"Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
"The old password was not correct, please try again." : "Das alte Passwort war falsch, bitte versuche es erneut.",
"The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuche es noch einmal.",
"Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Falscher privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisiere deinen privaten Schlüssel in deinen persönlichen Einstellungen, um wieder Zugriff auf die verschlüsselten Dateien zu erhalten.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselung-App ist aktiviert, aber deine Schlüssel sind nicht initialisiert. Bitte melde dich ab und wieder an.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktiviere server-seitige Verschlüsselung in den Verwaltungseinstellungen, um das Verschlüsselungsmodul nutzen zu können.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind nicht initialisiert. Bitte ab- und wieder anmelden",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte die serverseitige Verschlüsselung in den Verwaltungseinstellungen aktivieren, um das Verschlüsselungsmodul nutzen zu können.",
"Encryption app is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
"Bad Signature" : "Ungültige Signatur",
"Missing Signature" : "Fehlende Signatur",
"one-time password for server-side-encryption" : "Einmal-Passwort für serverseitige Verschlüsselung",
"Encryption password" : "Verschlüsselungskennwort",
- "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Deine Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.",
- "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Deine Dateien wurden mit dem Passwort \"%s\" verschlüsselt.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort \"%s\" verschlüsselt.",
"Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Bitte melde dich an der Weboberfläche an, gehe zum Abschnitt \"Sicherheit\" deiner persönlichen Einstellungen und aktualisiere dein Verschlüsselungspasswort, indem du dieses Passwort in das Feld \"Altes Login-Passwort\" sowie dein aktuelles Login-Passwort eingibst.",
- "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit dir zu teilen.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte den Eigentümer der Datei kontaktieren und ihn darum bitten, die Datei noch einmal zu teilen.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit dir zu teilen.",
"Default encryption module" : "Standard-Verschlüsselungsmodul",
"Default encryption module for server-side encryption" : "Standard-Verschlüsselungsmodul für serverseitige Verschlüsselung",
"In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Um dieses Verschlüsselungsmodul nutzen zu können, musst du die serverseitige Verschlüsselung in den Verwaltungseinstellungen aktivieren. Sobald das Modul aktiviert ist, verschlüsselt es alle deine Dateien transparent. Die Verschlüsselung basiert auf AES-256-Schlüsseln.\nDas Modul ändert keine vorhandenen Dateien, nur neue Dateien werden verschlüsselt, nachdem die serverseitige Verschlüsselung aktiviert wurde. Es ist nicht möglich, die Verschlüsselung zu deaktivieren und wieder auf ein unverschlüsseltes System umzuschalten.\nBitte lies die Dokumentation, um alle Auswirkungen zu kennen, bevor du dich entscheidest, die serverseitige Verschlüsselung zu aktivieren.",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte melde dich ab und wieder an",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte melde ab- und wieder anmelden",
"Encrypt the home storage" : "Benutzerverzeichnis verschlüsseln",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Die Aktivierung dieser Option verschlüsselt alle Dateien die auf dem Hauptspeicher gespeichert sind, ansonsten werden nur Dateien auf dem externen Speicher verschlüsselt",
"Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
"Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
+ "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." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zur Verschlüsselung von Dateien verwendet wird. Er wird verwendet, um Dateien aus einem Konto wiederherzustellen, wenn das Passwort vergessen wurde.",
"Recovery key password" : "Passwort für den Wiederherstellungsschlüsse",
"Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change recovery key password:" : "Passwort für den Wiederherstellungsschlüssel ändern:",
@@ -50,17 +51,15 @@ OC.L10N.register(
"Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change Password" : "Passwort ändern",
"Basic encryption module" : "Basisverschlüsselungsmodul",
- "Your private key password no longer matches your log-in password." : "Das Passwort für deinen privaten Schlüssel stimmt nicht mehr mit deinem Anmelde-Passwort überein.",
+ "Your private key password no longer matches your log-in password." : "Das Passwort für den privaten Schlüssel stimmt nicht mehr mit dem Anmelde-Passwort überein.",
"Set your old private key password to your current log-in password:" : "Dein altes Passwort für den privaten Schlüssel auf dein aktuelles Anmeldepasswort setzen:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Falls du dich nicht an dein altes Passwort erinnern kannst, frage deinen Administrator, um deine Dateien wiederherzustellen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Wenn du dich nicht mehr an dein altes Passwort erinnern kannst, kannst du deine Administration bitten, deine Dateien wiederherzustellen.",
"Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Passwort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
"Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option hast du die Möglichkeit, wieder auf deine verschlüsselten Dateien zugreifen zu können, wenn du dein Passwort verloren hast.",
"Enabled" : "Aktiviert",
- "Disabled" : "Deaktiviert",
- "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 log-in password\" field and your current login-password." : "Bitte melde dich an der Weboberfläche an, gehe zum Abschnitt \"Sicherheit\" deiner persönlichen Einstellungen und aktualisiere dein Verschlüsselungspasswort, indem du dieses Passwort in das Feld \"Altes Login-Passwort\" sowie dein aktuelles Login-Passwort eingibst.",
- "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." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat."
+ "Disabled" : "Deaktiviert"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json
index d4fc02d846e..a2559fdf4f3 100644
--- a/apps/encryption/l10n/de.json
+++ b/apps/encryption/l10n/de.json
@@ -2,7 +2,7 @@
"Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
"Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
"Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
- "Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
+ "Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde aktiviert",
"Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfe das Passwort für den Wiederherstellungsschlüssel!",
"Recovery key successfully disabled" : "Wiederherstellungsschlüssel deaktiviert.",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfe das Passwort für den Wiederherstellungsschlüssel!",
@@ -14,32 +14,33 @@
"Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
"Recovery Key disabled" : "Wiederherstellungsschlüssel deaktiviert",
"Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
- "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuche es noch einmal oder kontaktiere deinen Administrator",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuche es noch einmal oder kontaktiere deine Administration",
"Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
"The old password was not correct, please try again." : "Das alte Passwort war falsch, bitte versuche es erneut.",
"The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuche es noch einmal.",
"Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Falscher privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisiere deinen privaten Schlüssel in deinen persönlichen Einstellungen, um wieder Zugriff auf die verschlüsselten Dateien zu erhalten.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselung-App ist aktiviert, aber deine Schlüssel sind nicht initialisiert. Bitte melde dich ab und wieder an.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktiviere server-seitige Verschlüsselung in den Verwaltungseinstellungen, um das Verschlüsselungsmodul nutzen zu können.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind nicht initialisiert. Bitte ab- und wieder anmelden",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte die serverseitige Verschlüsselung in den Verwaltungseinstellungen aktivieren, um das Verschlüsselungsmodul nutzen zu können.",
"Encryption app is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
"Bad Signature" : "Ungültige Signatur",
"Missing Signature" : "Fehlende Signatur",
"one-time password for server-side-encryption" : "Einmal-Passwort für serverseitige Verschlüsselung",
"Encryption password" : "Verschlüsselungskennwort",
- "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Deine Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.",
- "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Deine Dateien wurden mit dem Passwort \"%s\" verschlüsselt.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Die Administration hat die serverseitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort \"%s\" verschlüsselt.",
"Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Bitte melde dich an der Weboberfläche an, gehe zum Abschnitt \"Sicherheit\" deiner persönlichen Einstellungen und aktualisiere dein Verschlüsselungspasswort, indem du dieses Passwort in das Feld \"Altes Login-Passwort\" sowie dein aktuelles Login-Passwort eingibst.",
- "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit dir zu teilen.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte den Eigentümer der Datei kontaktieren und ihn darum bitten, die Datei noch einmal zu teilen.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit dir zu teilen.",
"Default encryption module" : "Standard-Verschlüsselungsmodul",
"Default encryption module for server-side encryption" : "Standard-Verschlüsselungsmodul für serverseitige Verschlüsselung",
"In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Um dieses Verschlüsselungsmodul nutzen zu können, musst du die serverseitige Verschlüsselung in den Verwaltungseinstellungen aktivieren. Sobald das Modul aktiviert ist, verschlüsselt es alle deine Dateien transparent. Die Verschlüsselung basiert auf AES-256-Schlüsseln.\nDas Modul ändert keine vorhandenen Dateien, nur neue Dateien werden verschlüsselt, nachdem die serverseitige Verschlüsselung aktiviert wurde. Es ist nicht möglich, die Verschlüsselung zu deaktivieren und wieder auf ein unverschlüsseltes System umzuschalten.\nBitte lies die Dokumentation, um alle Auswirkungen zu kennen, bevor du dich entscheidest, die serverseitige Verschlüsselung zu aktivieren.",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte melde dich ab und wieder an",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte melde ab- und wieder anmelden",
"Encrypt the home storage" : "Benutzerverzeichnis verschlüsseln",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Die Aktivierung dieser Option verschlüsselt alle Dateien die auf dem Hauptspeicher gespeichert sind, ansonsten werden nur Dateien auf dem externen Speicher verschlüsselt",
"Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
"Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
+ "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." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zur Verschlüsselung von Dateien verwendet wird. Er wird verwendet, um Dateien aus einem Konto wiederherzustellen, wenn das Passwort vergessen wurde.",
"Recovery key password" : "Passwort für den Wiederherstellungsschlüsse",
"Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change recovery key password:" : "Passwort für den Wiederherstellungsschlüssel ändern:",
@@ -48,17 +49,15 @@
"Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change Password" : "Passwort ändern",
"Basic encryption module" : "Basisverschlüsselungsmodul",
- "Your private key password no longer matches your log-in password." : "Das Passwort für deinen privaten Schlüssel stimmt nicht mehr mit deinem Anmelde-Passwort überein.",
+ "Your private key password no longer matches your log-in password." : "Das Passwort für den privaten Schlüssel stimmt nicht mehr mit dem Anmelde-Passwort überein.",
"Set your old private key password to your current log-in password:" : "Dein altes Passwort für den privaten Schlüssel auf dein aktuelles Anmeldepasswort setzen:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Falls du dich nicht an dein altes Passwort erinnern kannst, frage deinen Administrator, um deine Dateien wiederherzustellen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Wenn du dich nicht mehr an dein altes Passwort erinnern kannst, kannst du deine Administration bitten, deine Dateien wiederherzustellen.",
"Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Passwort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
"Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option hast du die Möglichkeit, wieder auf deine verschlüsselten Dateien zugreifen zu können, wenn du dein Passwort verloren hast.",
"Enabled" : "Aktiviert",
- "Disabled" : "Deaktiviert",
- "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 log-in password\" field and your current login-password." : "Bitte melde dich an der Weboberfläche an, gehe zum Abschnitt \"Sicherheit\" deiner persönlichen Einstellungen und aktualisiere dein Verschlüsselungspasswort, indem du dieses Passwort in das Feld \"Altes Login-Passwort\" sowie dein aktuelles Login-Passwort eingibst.",
- "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." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat."
+ "Disabled" : "Deaktiviert"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js
index be6b309b29a..94d2501a80c 100644
--- a/apps/encryption/l10n/de_DE.js
+++ b/apps/encryption/l10n/de_DE.js
@@ -4,9 +4,9 @@ OC.L10N.register(
"Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
"Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
"Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
- "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+ "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde aktiviert.",
"Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
- "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+ "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde deaktiviert.",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
"Missing parameters" : "Fehlende Parameter",
"Please provide the old recovery password" : "Bitte das alte Wiederherstellungspasswort eingeben",
@@ -23,7 +23,7 @@ OC.L10N.register(
"Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Falscher privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihren privaten Schlüssel in Ihren persönlichen Einstellungen, um wieder Zugriff auf die verschlüsselten Dateien zu erhalten.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden Sie sich ab und wieder an.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktivieren Sie die server-seitige Verschlüsselung in den Administrationseinstellungen, um das Verschlüsselungsmodul nutzen zu können.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktivieren Sie die serverseitige Verschlüsselung in den Administrationseinstellungen, um das Verschlüsselungsmodul nutzen zu können.",
"Encryption app is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
"Bad Signature" : "Falsche Signatur",
"Missing Signature" : "Fehlende Signatur",
@@ -53,15 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "Basisverschlüsselungsmodul",
"Your private key password no longer matches your log-in password." : "Das Passwort für Ihren privaten Schlüssel stimmt nicht mehr mit Ihrem Anmelde-Passwort überein.",
"Set your old private key password to your current log-in password:" : "Ihr altes Passwort für den privaten Schlüssel auf Ihr aktuelles Anmeldepasswort setzen:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Wenn Sie sich nicht mehr an Ihr altes Passwort erinnern, können Sie Ihre Administration bitten, Ihre Dateien wiederherzustellen.",
"Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Anmeldepasswort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
"Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
"Enabled" : "Aktiviert",
- "Disabled" : "Deaktiviert",
- "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 log-in password\" field and your current login-password." : "Bitte melden Sie sich an der Weboberfläche an, gehen Sie zum Abschnitt \"Sicherheit\" Ihrer persönlichen Einstellungen und aktualisieren Sie Ihr Verschlüsselungspasswort, indem Sie dieses Passwort in das Feld \"Altes Login-Passwort\" sowie Ihr aktuelles Login-Passwort eingeben.",
- "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." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat."
+ "Disabled" : "Deaktiviert"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json
index 2e402c37d1f..7add3710d66 100644
--- a/apps/encryption/l10n/de_DE.json
+++ b/apps/encryption/l10n/de_DE.json
@@ -2,9 +2,9 @@
"Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
"Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
"Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
- "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+ "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde aktiviert.",
"Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
- "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+ "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde deaktiviert.",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
"Missing parameters" : "Fehlende Parameter",
"Please provide the old recovery password" : "Bitte das alte Wiederherstellungspasswort eingeben",
@@ -21,7 +21,7 @@
"Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Falscher privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihren privaten Schlüssel in Ihren persönlichen Einstellungen, um wieder Zugriff auf die verschlüsselten Dateien zu erhalten.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden Sie sich ab und wieder an.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktivieren Sie die server-seitige Verschlüsselung in den Administrationseinstellungen, um das Verschlüsselungsmodul nutzen zu können.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktivieren Sie die serverseitige Verschlüsselung in den Administrationseinstellungen, um das Verschlüsselungsmodul nutzen zu können.",
"Encryption app is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
"Bad Signature" : "Falsche Signatur",
"Missing Signature" : "Fehlende Signatur",
@@ -51,15 +51,13 @@
"Basic encryption module" : "Basisverschlüsselungsmodul",
"Your private key password no longer matches your log-in password." : "Das Passwort für Ihren privaten Schlüssel stimmt nicht mehr mit Ihrem Anmelde-Passwort überein.",
"Set your old private key password to your current log-in password:" : "Ihr altes Passwort für den privaten Schlüssel auf Ihr aktuelles Anmeldepasswort setzen:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Wenn Sie sich nicht mehr an Ihr altes Passwort erinnern, können Sie Ihre Administration bitten, Ihre Dateien wiederherzustellen.",
"Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Anmeldepasswort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
"Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
"Enabled" : "Aktiviert",
- "Disabled" : "Deaktiviert",
- "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 log-in password\" field and your current login-password." : "Bitte melden Sie sich an der Weboberfläche an, gehen Sie zum Abschnitt \"Sicherheit\" Ihrer persönlichen Einstellungen und aktualisieren Sie Ihr Verschlüsselungspasswort, indem Sie dieses Passwort in das Feld \"Altes Login-Passwort\" sowie Ihr aktuelles Login-Passwort eingeben.",
- "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." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat."
+ "Disabled" : "Deaktiviert"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/el.js b/apps/encryption/l10n/el.js
index 307d4af7bf1..6b555d16261 100644
--- a/apps/encryption/l10n/el.js
+++ b/apps/encryption/l10n/el.js
@@ -47,14 +47,12 @@ OC.L10N.register(
"Basic encryption module" : "Βασική μονάδα κρυπτογράφησης",
"Your private key password no longer matches your log-in password." : "Ο κωδικός του ιδιωτικού κλειδιού σας δεν ταιριάζει πλέον με τον κωδικό σύνδεσής σας.",
"Set your old private key password to your current log-in password:" : "Ορίστε τον παλιό σας κωδικό ιδιωτικού κλειδιού στον τρέχοντα κωδικό σύνδεσης.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Εάν δεν θυμάστε τον παλιό σας κωδικό μπορείτε να ζητήσετε από τον διαχειριστή σας να επανακτήσει τα αρχεία σας.",
"Old log-in password" : "Παλαιό συνθηματικό εισόδου",
"Current log-in password" : "Τρέχον συνθηματικό πρόσβασης",
"Update Private Key Password" : "Ενημέρωση Προσωπικού Κλειδού Πρόσβασης",
"Enable password recovery:" : "Ενεργοποιήστε την ανάκτηση κωδικού πρόσβασης",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Η ενεργοποίηση αυτής της επιλογής θα σας επιτρέψει να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία σε περίπτωση απώλειας του κωδικού σας",
"Enabled" : "Ενεργοποιημένο",
- "Disabled" : "Απενεργοποιημένο",
- "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." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται για να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν αυτός/αυτή ξεχάσει τον κωδικό πρόσβασης."
+ "Disabled" : "Απενεργοποιημένο"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/el.json b/apps/encryption/l10n/el.json
index d78bce1bd41..bcf3189a2f7 100644
--- a/apps/encryption/l10n/el.json
+++ b/apps/encryption/l10n/el.json
@@ -45,14 +45,12 @@
"Basic encryption module" : "Βασική μονάδα κρυπτογράφησης",
"Your private key password no longer matches your log-in password." : "Ο κωδικός του ιδιωτικού κλειδιού σας δεν ταιριάζει πλέον με τον κωδικό σύνδεσής σας.",
"Set your old private key password to your current log-in password:" : "Ορίστε τον παλιό σας κωδικό ιδιωτικού κλειδιού στον τρέχοντα κωδικό σύνδεσης.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Εάν δεν θυμάστε τον παλιό σας κωδικό μπορείτε να ζητήσετε από τον διαχειριστή σας να επανακτήσει τα αρχεία σας.",
"Old log-in password" : "Παλαιό συνθηματικό εισόδου",
"Current log-in password" : "Τρέχον συνθηματικό πρόσβασης",
"Update Private Key Password" : "Ενημέρωση Προσωπικού Κλειδού Πρόσβασης",
"Enable password recovery:" : "Ενεργοποιήστε την ανάκτηση κωδικού πρόσβασης",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Η ενεργοποίηση αυτής της επιλογής θα σας επιτρέψει να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία σε περίπτωση απώλειας του κωδικού σας",
"Enabled" : "Ενεργοποιημένο",
- "Disabled" : "Απενεργοποιημένο",
- "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." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται για να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν αυτός/αυτή ξεχάσει τον κωδικό πρόσβασης."
+ "Disabled" : "Απενεργοποιημένο"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/en_GB.js b/apps/encryption/l10n/en_GB.js
index b22d09733bc..8f3408f59e7 100644
--- a/apps/encryption/l10n/en_GB.js
+++ b/apps/encryption/l10n/en_GB.js
@@ -53,15 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "Basic encryption module",
"Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
"Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "If you do not remember your old password you can ask your administrator to recover your files.",
"Old log-in password" : "Old login password",
"Current log-in password" : "Current login password",
"Update Private Key Password" : "Update Private Key Password",
"Enable password recovery:" : "Enable password recovery:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss",
"Enabled" : "Enabled",
- "Disabled" : "Disabled",
- "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 log-in password\" field and your current login-password." : "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.",
- "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." : "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."
+ "Disabled" : "Disabled"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/en_GB.json b/apps/encryption/l10n/en_GB.json
index aaf1ac3b1d2..d66c1bb51ab 100644
--- a/apps/encryption/l10n/en_GB.json
+++ b/apps/encryption/l10n/en_GB.json
@@ -51,15 +51,13 @@
"Basic encryption module" : "Basic encryption module",
"Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
"Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "If you do not remember your old password you can ask your administrator to recover your files.",
"Old log-in password" : "Old login password",
"Current log-in password" : "Current login password",
"Update Private Key Password" : "Update Private Key Password",
"Enable password recovery:" : "Enable password recovery:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss",
"Enabled" : "Enabled",
- "Disabled" : "Disabled",
- "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 log-in password\" field and your current login-password." : "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.",
- "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." : "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."
+ "Disabled" : "Disabled"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/eo.js b/apps/encryption/l10n/eo.js
index 7ec2955f2f6..36ecb37951b 100644
--- a/apps/encryption/l10n/eo.js
+++ b/apps/encryption/l10n/eo.js
@@ -45,14 +45,12 @@ OC.L10N.register(
"Basic encryption module" : "Bazĉifrada modulo",
"Your private key password no longer matches your log-in password." : "La pasvorto de via privata ŝlosilo ne plu kongruas kun via ensaluta pasvorto.",
"Set your old private key password to your current log-in password:" : "Agordi la pasvorton de via antaŭa privata ŝlosilo al via nuna ensaluta pasvorto:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se vi ne memoras vian antaŭan pasvorton, vi povas peti al via administranto restaŭri viajn dosierojn.",
"Old log-in password" : "Malnova ensaluta pasvorto",
"Current log-in password" : "Nuna ensaluta pasvorto",
"Update Private Key Password" : "Ĝisdatigi la pasvorton de la malpublika ŝlosilo",
"Enable password recovery:" : "Ŝalti restaŭron de pasvorto:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ŝalti tiun opcion ebligas al vi rehavi aliron al viaj ĉifritaj dosierojn okaze de pasvorta perdo.",
"Enabled" : "Ŝaltita",
- "Disabled" : "Malŝaltita",
- "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 restaŭroŝlosilo estas kroma ĉifroŝlosilo, kiu uziĝas por ĉifri dosierojn. Ĝi ebligas restaŭron el dosieroj de uzanto, se la uzanto forgesas sian pasvorton."
+ "Disabled" : "Malŝaltita"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/eo.json b/apps/encryption/l10n/eo.json
index 7b6810c84be..ee6bd31b4ab 100644
--- a/apps/encryption/l10n/eo.json
+++ b/apps/encryption/l10n/eo.json
@@ -43,14 +43,12 @@
"Basic encryption module" : "Bazĉifrada modulo",
"Your private key password no longer matches your log-in password." : "La pasvorto de via privata ŝlosilo ne plu kongruas kun via ensaluta pasvorto.",
"Set your old private key password to your current log-in password:" : "Agordi la pasvorton de via antaŭa privata ŝlosilo al via nuna ensaluta pasvorto:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se vi ne memoras vian antaŭan pasvorton, vi povas peti al via administranto restaŭri viajn dosierojn.",
"Old log-in password" : "Malnova ensaluta pasvorto",
"Current log-in password" : "Nuna ensaluta pasvorto",
"Update Private Key Password" : "Ĝisdatigi la pasvorton de la malpublika ŝlosilo",
"Enable password recovery:" : "Ŝalti restaŭron de pasvorto:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ŝalti tiun opcion ebligas al vi rehavi aliron al viaj ĉifritaj dosierojn okaze de pasvorta perdo.",
"Enabled" : "Ŝaltita",
- "Disabled" : "Malŝaltita",
- "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 restaŭroŝlosilo estas kroma ĉifroŝlosilo, kiu uziĝas por ĉifri dosierojn. Ĝi ebligas restaŭron el dosieroj de uzanto, se la uzanto forgesas sian pasvorton."
+ "Disabled" : "Malŝaltita"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
index bb581abf060..114aa02968f 100644
--- a/apps/encryption/l10n/es.js
+++ b/apps/encryption/l10n/es.js
@@ -39,7 +39,7 @@ OC.L10N.register(
"In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "De manera de usar este módulo de cifrado necesita activar el cifrado del lado del servidor en la configuraciones de administrador. Una vez que esté habilitado este módulo cifrará todos tus archivos de manera transparente. El cifrado está basado en llaves AES-256\nEl módulo no tocará los archivos existentes, solo los archivos nuevos serán cifrados una vez que el cifrado del lado del servidor se habilite. Además, no es posible deshabilitar el cifrado de nuevo y cambiar a un sistema sin cifrado.\nPor favor lea la documentación para que entienda todas las implicaciones antes de que decida habilitar el cifrado del lado del servidor.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
"Encrypt the home storage" : "Encriptar el almacenamiento personal",
- "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Al activar esta opción se encriptarán todos los archivos almacenados en la memoria principal, de lo contrario serán cifrados sólo los archivos de almacenamiento externo",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Al activar esta opción se encriptarán todos los archivos almacenados en la memoria principal, de lo contrario, serán cifrados sólo los archivos de almacenamiento externo",
"Enable recovery key" : "Activa la clave de recuperación",
"Disable recovery key" : "Desactiva la clave de recuperación",
"The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "La llave de recuperación es una llave de cifrado adicional utilizada para cifrar archivos. Es utilizada para recuperar los archivos de una cuenta si la contraseña fuese olvidada.",
@@ -53,15 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de cifrado básico",
"Your private key password no longer matches your log-in password." : "Su contraseña de clave privada ya no coincide con su contraseña de acceso.",
"Set your old private key password to your current log-in password:" : "Establezca la contraseña de clave privada antigua para su contraseña de inicio de sesión actual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus archivos.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña, puede pedir a su administrador que recupere sus archivos.",
"Old log-in password" : "Contraseña de acceso antigua",
"Current log-in password" : "Contraseña de acceso actual",
"Update Private Key Password" : "Actualizar contraseña de clave privada",
"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 le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 log-in password\" field and your current login-password." : "Por favor ingrese en la interfaz web, vaya a la sección \"Seguridad\" de sus ajustes personales y actualice su contraseña de cifrado ingresando esta contraseña en el campo \"Contraseña de inicio de sesión antigua\" y su contraseña actual.",
- "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 clave de recuperación es una clave de cifrado extra que se usa para cifrar archivos. Permite la recuperación de los archivos de un usuario si él o ella olvida su contraseña."
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
index 6d46f5ff4f7..9ec1c763bba 100644
--- a/apps/encryption/l10n/es.json
+++ b/apps/encryption/l10n/es.json
@@ -37,7 +37,7 @@
"In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "De manera de usar este módulo de cifrado necesita activar el cifrado del lado del servidor en la configuraciones de administrador. Una vez que esté habilitado este módulo cifrará todos tus archivos de manera transparente. El cifrado está basado en llaves AES-256\nEl módulo no tocará los archivos existentes, solo los archivos nuevos serán cifrados una vez que el cifrado del lado del servidor se habilite. Además, no es posible deshabilitar el cifrado de nuevo y cambiar a un sistema sin cifrado.\nPor favor lea la documentación para que entienda todas las implicaciones antes de que decida habilitar el cifrado del lado del servidor.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
"Encrypt the home storage" : "Encriptar el almacenamiento personal",
- "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Al activar esta opción se encriptarán todos los archivos almacenados en la memoria principal, de lo contrario serán cifrados sólo los archivos de almacenamiento externo",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Al activar esta opción se encriptarán todos los archivos almacenados en la memoria principal, de lo contrario, serán cifrados sólo los archivos de almacenamiento externo",
"Enable recovery key" : "Activa la clave de recuperación",
"Disable recovery key" : "Desactiva la clave de recuperación",
"The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "La llave de recuperación es una llave de cifrado adicional utilizada para cifrar archivos. Es utilizada para recuperar los archivos de una cuenta si la contraseña fuese olvidada.",
@@ -51,15 +51,13 @@
"Basic encryption module" : "Módulo de cifrado básico",
"Your private key password no longer matches your log-in password." : "Su contraseña de clave privada ya no coincide con su contraseña de acceso.",
"Set your old private key password to your current log-in password:" : "Establezca la contraseña de clave privada antigua para su contraseña de inicio de sesión actual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus archivos.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña, puede pedir a su administrador que recupere sus archivos.",
"Old log-in password" : "Contraseña de acceso antigua",
"Current log-in password" : "Contraseña de acceso actual",
"Update Private Key Password" : "Actualizar contraseña de clave privada",
"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 le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 log-in password\" field and your current login-password." : "Por favor ingrese en la interfaz web, vaya a la sección \"Seguridad\" de sus ajustes personales y actualice su contraseña de cifrado ingresando esta contraseña en el campo \"Contraseña de inicio de sesión antigua\" y su contraseña actual.",
- "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 clave de recuperación es una clave de cifrado extra que se usa para cifrar archivos. Permite la recuperación de los archivos de un usuario si él o ella olvida su contraseña."
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_419.js b/apps/encryption/l10n/es_419.js
index 5b497abab6e..fa5891cea44 100644
--- a/apps/encryption/l10n/es_419.js
+++ b/apps/encryption/l10n/es_419.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_419.json b/apps/encryption/l10n/es_419.json
index 17df8617df0..d948e14e11e 100644
--- a/apps/encryption/l10n/es_419.json
+++ b/apps/encryption/l10n/es_419.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_AR.js b/apps/encryption/l10n/es_AR.js
index 77a4e0e4acc..c7284faff24 100644
--- a/apps/encryption/l10n/es_AR.js
+++ b/apps/encryption/l10n/es_AR.js
@@ -43,14 +43,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Su contraseña de llave privada ya no corresónde con su contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establezca su contraseña de llave privada a su contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su contraseña anterior le puede pedir a su administrador que recupere sus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 le permitirá volver a tener acceso a sus archivos encriptados en caso de perder la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_AR.json b/apps/encryption/l10n/es_AR.json
index 01032aeb214..3dbbaf32d30 100644
--- a/apps/encryption/l10n/es_AR.json
+++ b/apps/encryption/l10n/es_AR.json
@@ -41,14 +41,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Su contraseña de llave privada ya no corresónde con su contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establezca su contraseña de llave privada a su contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su contraseña anterior le puede pedir a su administrador que recupere sus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 le permitirá volver a tener acceso a sus archivos encriptados en caso de perder la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_CL.js b/apps/encryption/l10n/es_CL.js
index 5b497abab6e..fa5891cea44 100644
--- a/apps/encryption/l10n/es_CL.js
+++ b/apps/encryption/l10n/es_CL.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_CL.json b/apps/encryption/l10n/es_CL.json
index 17df8617df0..d948e14e11e 100644
--- a/apps/encryption/l10n/es_CL.json
+++ b/apps/encryption/l10n/es_CL.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_CO.js b/apps/encryption/l10n/es_CO.js
index 5b497abab6e..fa5891cea44 100644
--- a/apps/encryption/l10n/es_CO.js
+++ b/apps/encryption/l10n/es_CO.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_CO.json b/apps/encryption/l10n/es_CO.json
index 17df8617df0..d948e14e11e 100644
--- a/apps/encryption/l10n/es_CO.json
+++ b/apps/encryption/l10n/es_CO.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_CR.js b/apps/encryption/l10n/es_CR.js
index 5b497abab6e..fa5891cea44 100644
--- a/apps/encryption/l10n/es_CR.js
+++ b/apps/encryption/l10n/es_CR.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_CR.json b/apps/encryption/l10n/es_CR.json
index 17df8617df0..d948e14e11e 100644
--- a/apps/encryption/l10n/es_CR.json
+++ b/apps/encryption/l10n/es_CR.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_DO.js b/apps/encryption/l10n/es_DO.js
index 5b497abab6e..fa5891cea44 100644
--- a/apps/encryption/l10n/es_DO.js
+++ b/apps/encryption/l10n/es_DO.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_DO.json b/apps/encryption/l10n/es_DO.json
index 17df8617df0..d948e14e11e 100644
--- a/apps/encryption/l10n/es_DO.json
+++ b/apps/encryption/l10n/es_DO.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_EC.js b/apps/encryption/l10n/es_EC.js
index 6090cea76fb..79b263f05c5 100644
--- a/apps/encryption/l10n/es_EC.js
+++ b/apps/encryption/l10n/es_EC.js
@@ -52,15 +52,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 log-in password\" field and your current login-password." : "Por favor, inicie sesión en la interfaz web, vaya a la sección \"Seguridad\" de su configuración personal y actualice su contraseña de cifrado ingresando esta contraseña en el campo \"Contraseña de inicio de sesión anterior\" y su contraseña de inicio de sesión actual.",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_EC.json b/apps/encryption/l10n/es_EC.json
index 4f3a0fc26ef..d9b037fb088 100644
--- a/apps/encryption/l10n/es_EC.json
+++ b/apps/encryption/l10n/es_EC.json
@@ -50,15 +50,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 log-in password\" field and your current login-password." : "Por favor, inicie sesión en la interfaz web, vaya a la sección \"Seguridad\" de su configuración personal y actualice su contraseña de cifrado ingresando esta contraseña en el campo \"Contraseña de inicio de sesión anterior\" y su contraseña de inicio de sesión actual.",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_GT.js b/apps/encryption/l10n/es_GT.js
index 5b497abab6e..fa5891cea44 100644
--- a/apps/encryption/l10n/es_GT.js
+++ b/apps/encryption/l10n/es_GT.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_GT.json b/apps/encryption/l10n/es_GT.json
index 17df8617df0..d948e14e11e 100644
--- a/apps/encryption/l10n/es_GT.json
+++ b/apps/encryption/l10n/es_GT.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_HN.js b/apps/encryption/l10n/es_HN.js
index 5b497abab6e..fa5891cea44 100644
--- a/apps/encryption/l10n/es_HN.js
+++ b/apps/encryption/l10n/es_HN.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_HN.json b/apps/encryption/l10n/es_HN.json
index 17df8617df0..d948e14e11e 100644
--- a/apps/encryption/l10n/es_HN.json
+++ b/apps/encryption/l10n/es_HN.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_MX.js b/apps/encryption/l10n/es_MX.js
index 49a5fcc318d..c54e15075df 100644
--- a/apps/encryption/l10n/es_MX.js
+++ b/apps/encryption/l10n/es_MX.js
@@ -46,14 +46,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_MX.json b/apps/encryption/l10n/es_MX.json
index e32332c784c..b36dc2523e8 100644
--- a/apps/encryption/l10n/es_MX.json
+++ b/apps/encryption/l10n/es_MX.json
@@ -44,14 +44,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_NI.js b/apps/encryption/l10n/es_NI.js
index 5b497abab6e..fa5891cea44 100644
--- a/apps/encryption/l10n/es_NI.js
+++ b/apps/encryption/l10n/es_NI.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_NI.json b/apps/encryption/l10n/es_NI.json
index 17df8617df0..d948e14e11e 100644
--- a/apps/encryption/l10n/es_NI.json
+++ b/apps/encryption/l10n/es_NI.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_PA.js b/apps/encryption/l10n/es_PA.js
index 5b497abab6e..fa5891cea44 100644
--- a/apps/encryption/l10n/es_PA.js
+++ b/apps/encryption/l10n/es_PA.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_PA.json b/apps/encryption/l10n/es_PA.json
index 17df8617df0..d948e14e11e 100644
--- a/apps/encryption/l10n/es_PA.json
+++ b/apps/encryption/l10n/es_PA.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_PE.js b/apps/encryption/l10n/es_PE.js
index 5b497abab6e..fa5891cea44 100644
--- a/apps/encryption/l10n/es_PE.js
+++ b/apps/encryption/l10n/es_PE.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_PE.json b/apps/encryption/l10n/es_PE.json
index 17df8617df0..d948e14e11e 100644
--- a/apps/encryption/l10n/es_PE.json
+++ b/apps/encryption/l10n/es_PE.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_PR.js b/apps/encryption/l10n/es_PR.js
index 5b497abab6e..fa5891cea44 100644
--- a/apps/encryption/l10n/es_PR.js
+++ b/apps/encryption/l10n/es_PR.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_PR.json b/apps/encryption/l10n/es_PR.json
index 17df8617df0..d948e14e11e 100644
--- a/apps/encryption/l10n/es_PR.json
+++ b/apps/encryption/l10n/es_PR.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_PY.js b/apps/encryption/l10n/es_PY.js
index 5b497abab6e..fa5891cea44 100644
--- a/apps/encryption/l10n/es_PY.js
+++ b/apps/encryption/l10n/es_PY.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_PY.json b/apps/encryption/l10n/es_PY.json
index 17df8617df0..d948e14e11e 100644
--- a/apps/encryption/l10n/es_PY.json
+++ b/apps/encryption/l10n/es_PY.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_SV.js b/apps/encryption/l10n/es_SV.js
index 5b497abab6e..fa5891cea44 100644
--- a/apps/encryption/l10n/es_SV.js
+++ b/apps/encryption/l10n/es_SV.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_SV.json b/apps/encryption/l10n/es_SV.json
index 17df8617df0..d948e14e11e 100644
--- a/apps/encryption/l10n/es_SV.json
+++ b/apps/encryption/l10n/es_SV.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/es_UY.js b/apps/encryption/l10n/es_UY.js
index 5b497abab6e..fa5891cea44 100644
--- a/apps/encryption/l10n/es_UY.js
+++ b/apps/encryption/l10n/es_UY.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/es_UY.json b/apps/encryption/l10n/es_UY.json
index 17df8617df0..d948e14e11e 100644
--- a/apps/encryption/l10n/es_UY.json
+++ b/apps/encryption/l10n/es_UY.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"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 te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
- "Disabled" : "Deshabilitado",
- "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 llave de recuperación es una llave de encripción que se usa para encriptar archivos. Permite la recuperación de los archivos del usuario si este olvida su contraseña. "
+ "Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/et_EE.js b/apps/encryption/l10n/et_EE.js
index 16f6501b8bd..70de2cc0c46 100644
--- a/apps/encryption/l10n/et_EE.js
+++ b/apps/encryption/l10n/et_EE.js
@@ -1,45 +1,56 @@
OC.L10N.register(
"encryption",
{
- "Missing recovery key password" : "Muuda taastevõtme parool",
- "Please repeat the recovery key password" : "Palun korda uut taastevõtme parooli",
- "Repeated recovery key password does not match the provided recovery key password" : "Lahtritesse sisestatud taastevõtme paroolid ei kattu",
+ "Missing recovery key password" : "Muuda taastevõtme salasõna",
+ "Please repeat the recovery key password" : "Palun korda uut taastevõtme salasõna",
+ "Repeated recovery key password does not match the provided recovery key password" : "Sisestatud taastevõtme salasõna ei kattu",
"Recovery key successfully enabled" : "Taastevõtme lubamine õnnestus",
- "Could not enable recovery key. Please check your recovery key password!" : "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!",
+ "Could not enable recovery key. Please check your recovery key password!" : "Ei suutnud taastevõtit kasutusele võtta. Palun kontrolli oma taastevõtme salasõna!",
"Recovery key successfully disabled" : "Taastevõtme keelamine õnnestus",
- "Could not disable recovery key. Please check your recovery key password!" : "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
- "Missing parameters" : "Paramttrid puuduvad",
- "Please provide the old recovery password" : "Palun sisesta vana taastevõtme parool",
- "Please provide a new recovery password" : "Palun sisesta uus taastevõtme parool",
- "Please repeat the new recovery password" : "Palun korda uut taastevõtme parooli",
- "Password successfully changed." : "Parool edukalt vahetatud.",
- "Could not change the password. Maybe the old password was not correct." : "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
+ "Could not disable recovery key. Please check your recovery key password!" : "Ei suutnud taastevõtme kasutamist lõpetada. Palun kontrolli oma taastevõtme salasõna!",
+ "Missing parameters" : "Parameetrid puuduvad",
+ "Please provide the old recovery password" : "Palun sisesta vana taastevõtme salasõna",
+ "Please provide a new recovery password" : "Palun sisesta uus taastevõtme salasõna",
+ "Please repeat the new recovery password" : "Palun korda uut taastevõtme salasõna",
+ "Password successfully changed." : "Salasõna vahetamine õnnestus.",
+ "Could not change the password. Maybe the old password was not correct." : "Ei suutnud muuta salasõna. Võib-olla on vana salasõna valesti sisestatud.",
"Recovery Key disabled" : "Taastevõti on välja lülitatud",
"Recovery Key enabled" : "Taastevõti on sisse lülitatud",
- "Could not update the private key password." : "Ei suutnud uuendada privaatse võtme parooli.",
- "The old password was not correct, please try again." : "Vana parool polnud õige, palun proovi uuesti.",
- "The current log-in password was not correct, please try again." : "Praeguse sisselogimise parool polnud õige, palun proovi uuesti.",
- "Private key password successfully updated." : "Privaatse võtme parool edukalt uuendatud.",
+ "Could not update the private key password." : "Ei suutnud uuendada privaatvõtme salasõna.",
+ "The old password was not correct, please try again." : "Vana salasõna polnud õige, palun proovi uuesti.",
+ "The current log-in password was not correct, please try again." : "Sisselogimise senine salasõna polnud õige, palun proovi uuesti.",
+ "Private key password successfully updated." : "Privaatvõtme salasõna uuendamine õnnestus.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Krüptimisrakenduse vigane privaatvõti. Taastamaks ligipääsu krüptitud failidele palun uuenda oma isiklikest seadistustest privaatvõtme salasõna.",
"Bad Signature" : "Vigane allkiri",
"Missing Signature" : "Allkiri puudub",
+ "one-time password for server-side-encryption" : "ühekordne salasõna serveripoolse krüptimise jaoks",
+ "Encryption password" : "Krüptimise salasõna",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Serveri peakasutaja lülitas sisse serveripoolse krüptimise. Sinu failid on krüptitud salasõnaga <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Serveri peakasutaja lülitas sisse serveripoolse krüptimise. Sinu failid on krüptitud salasõnaga „%s“.",
+ "Default encryption module" : "Vaikimisi krüptimismoodul",
+ "Default encryption module for server-side encryption" : "Vaikimisi krüptimismoodul serveripoolse krüptimise jaoks",
+ "Encrypt the home storage" : "Krüpti ka sisemine andmeruum",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Selle valiku kasutamisel krüptitakse failid sisemises ja välises andmeruumis. Vastasel juhul vaid välises andmeruumis.",
"Enable recovery key" : "Luba taastevõtme kasutamine",
"Disable recovery key" : "Keela taastevõtme kasutamine",
- "Recovery key password" : "Taastevõtme parool",
- "Repeat recovery key password" : "Korda taastevõtme parooli",
- "Change recovery key password:" : "Muuda taastevõtme parooli:",
- "Old recovery key password" : "Vana taastevõtme parool",
- "New recovery key password" : "Uus taastevõtme parool",
- "Repeat new recovery key password" : "Korda uut taastevõtme parooli",
- "Change Password" : "Muuda parooli",
- "Your private key password no longer matches your log-in password." : "Sinu provaatvõtme parool ei kattu enam sinu sisselogimise parooliga.",
- "Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Kui sa ei mäleta oma vana parooli, siis palu oma süsteemihalduril taastada ligipääs failidele.",
- "Old log-in password" : "Vana sisselogimise parool",
- "Current log-in password" : "Praegune sisselogimise parool",
- "Update Private Key Password" : "Uuenda privaatse võtme parooli",
- "Enable password recovery:" : "Luba parooli taaste:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Taastevõti on täiendav krüptovõti, mida kasutatakse failide krüptimisel. Kui peaksid põhilise salasõna unustama, siis saad seda failide taastamisel kasutada. Salvesta ta turvaliselt digitaalsesse salasõnalaekasse või vana kooli seifi.",
+ "Recovery key password" : "Taastevõtme salasõna",
+ "Repeat recovery key password" : "Korda taastevõtme salasõna",
+ "Change recovery key password:" : "Muuda taastevõtme salasõna:",
+ "Old recovery key password" : "Vana taastevõtme salasõna",
+ "New recovery key password" : "Uus taastevõtme salasõna",
+ "Repeat new recovery key password" : "Korda uut taastevõtme salasõna",
+ "Change Password" : "Muuda salasõna",
+ "Basic encryption module" : "Lihtkrüptimise moodul",
+ "Your private key password no longer matches your log-in password." : "Sinu privaatvõtme salasõna ei kattu enam sinu sisselogimise salasõna.",
+ "Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme salasõnaks oma praegune sisselogimise salasõna.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Kui sa ei mäleta oma vana salasõna, siis palu oma süsteemihalduril taastada ligipääs failidele.",
+ "Old log-in password" : "Sisselogimise vana salasõna",
+ "Current log-in password" : "Sisselogimise praegune salasõna",
+ "Update Private Key Password" : "Uuenda privaatvõtme salasõna",
+ "Enable password recovery:" : "Luba salasõna taastamine:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab salasõna kaotamise korral taastada ligipääsu krüptitud failidele",
"Enabled" : "Sisse lülitatud",
- "Disabled" : "Väljalülitatud"
+ "Disabled" : "Välja lülitatud"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/et_EE.json b/apps/encryption/l10n/et_EE.json
index 343ae6a9693..bd7a9d32858 100644
--- a/apps/encryption/l10n/et_EE.json
+++ b/apps/encryption/l10n/et_EE.json
@@ -1,43 +1,54 @@
{ "translations": {
- "Missing recovery key password" : "Muuda taastevõtme parool",
- "Please repeat the recovery key password" : "Palun korda uut taastevõtme parooli",
- "Repeated recovery key password does not match the provided recovery key password" : "Lahtritesse sisestatud taastevõtme paroolid ei kattu",
+ "Missing recovery key password" : "Muuda taastevõtme salasõna",
+ "Please repeat the recovery key password" : "Palun korda uut taastevõtme salasõna",
+ "Repeated recovery key password does not match the provided recovery key password" : "Sisestatud taastevõtme salasõna ei kattu",
"Recovery key successfully enabled" : "Taastevõtme lubamine õnnestus",
- "Could not enable recovery key. Please check your recovery key password!" : "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!",
+ "Could not enable recovery key. Please check your recovery key password!" : "Ei suutnud taastevõtit kasutusele võtta. Palun kontrolli oma taastevõtme salasõna!",
"Recovery key successfully disabled" : "Taastevõtme keelamine õnnestus",
- "Could not disable recovery key. Please check your recovery key password!" : "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
- "Missing parameters" : "Paramttrid puuduvad",
- "Please provide the old recovery password" : "Palun sisesta vana taastevõtme parool",
- "Please provide a new recovery password" : "Palun sisesta uus taastevõtme parool",
- "Please repeat the new recovery password" : "Palun korda uut taastevõtme parooli",
- "Password successfully changed." : "Parool edukalt vahetatud.",
- "Could not change the password. Maybe the old password was not correct." : "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
+ "Could not disable recovery key. Please check your recovery key password!" : "Ei suutnud taastevõtme kasutamist lõpetada. Palun kontrolli oma taastevõtme salasõna!",
+ "Missing parameters" : "Parameetrid puuduvad",
+ "Please provide the old recovery password" : "Palun sisesta vana taastevõtme salasõna",
+ "Please provide a new recovery password" : "Palun sisesta uus taastevõtme salasõna",
+ "Please repeat the new recovery password" : "Palun korda uut taastevõtme salasõna",
+ "Password successfully changed." : "Salasõna vahetamine õnnestus.",
+ "Could not change the password. Maybe the old password was not correct." : "Ei suutnud muuta salasõna. Võib-olla on vana salasõna valesti sisestatud.",
"Recovery Key disabled" : "Taastevõti on välja lülitatud",
"Recovery Key enabled" : "Taastevõti on sisse lülitatud",
- "Could not update the private key password." : "Ei suutnud uuendada privaatse võtme parooli.",
- "The old password was not correct, please try again." : "Vana parool polnud õige, palun proovi uuesti.",
- "The current log-in password was not correct, please try again." : "Praeguse sisselogimise parool polnud õige, palun proovi uuesti.",
- "Private key password successfully updated." : "Privaatse võtme parool edukalt uuendatud.",
+ "Could not update the private key password." : "Ei suutnud uuendada privaatvõtme salasõna.",
+ "The old password was not correct, please try again." : "Vana salasõna polnud õige, palun proovi uuesti.",
+ "The current log-in password was not correct, please try again." : "Sisselogimise senine salasõna polnud õige, palun proovi uuesti.",
+ "Private key password successfully updated." : "Privaatvõtme salasõna uuendamine õnnestus.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Krüptimisrakenduse vigane privaatvõti. Taastamaks ligipääsu krüptitud failidele palun uuenda oma isiklikest seadistustest privaatvõtme salasõna.",
"Bad Signature" : "Vigane allkiri",
"Missing Signature" : "Allkiri puudub",
+ "one-time password for server-side-encryption" : "ühekordne salasõna serveripoolse krüptimise jaoks",
+ "Encryption password" : "Krüptimise salasõna",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Serveri peakasutaja lülitas sisse serveripoolse krüptimise. Sinu failid on krüptitud salasõnaga <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Serveri peakasutaja lülitas sisse serveripoolse krüptimise. Sinu failid on krüptitud salasõnaga „%s“.",
+ "Default encryption module" : "Vaikimisi krüptimismoodul",
+ "Default encryption module for server-side encryption" : "Vaikimisi krüptimismoodul serveripoolse krüptimise jaoks",
+ "Encrypt the home storage" : "Krüpti ka sisemine andmeruum",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Selle valiku kasutamisel krüptitakse failid sisemises ja välises andmeruumis. Vastasel juhul vaid välises andmeruumis.",
"Enable recovery key" : "Luba taastevõtme kasutamine",
"Disable recovery key" : "Keela taastevõtme kasutamine",
- "Recovery key password" : "Taastevõtme parool",
- "Repeat recovery key password" : "Korda taastevõtme parooli",
- "Change recovery key password:" : "Muuda taastevõtme parooli:",
- "Old recovery key password" : "Vana taastevõtme parool",
- "New recovery key password" : "Uus taastevõtme parool",
- "Repeat new recovery key password" : "Korda uut taastevõtme parooli",
- "Change Password" : "Muuda parooli",
- "Your private key password no longer matches your log-in password." : "Sinu provaatvõtme parool ei kattu enam sinu sisselogimise parooliga.",
- "Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Kui sa ei mäleta oma vana parooli, siis palu oma süsteemihalduril taastada ligipääs failidele.",
- "Old log-in password" : "Vana sisselogimise parool",
- "Current log-in password" : "Praegune sisselogimise parool",
- "Update Private Key Password" : "Uuenda privaatse võtme parooli",
- "Enable password recovery:" : "Luba parooli taaste:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Taastevõti on täiendav krüptovõti, mida kasutatakse failide krüptimisel. Kui peaksid põhilise salasõna unustama, siis saad seda failide taastamisel kasutada. Salvesta ta turvaliselt digitaalsesse salasõnalaekasse või vana kooli seifi.",
+ "Recovery key password" : "Taastevõtme salasõna",
+ "Repeat recovery key password" : "Korda taastevõtme salasõna",
+ "Change recovery key password:" : "Muuda taastevõtme salasõna:",
+ "Old recovery key password" : "Vana taastevõtme salasõna",
+ "New recovery key password" : "Uus taastevõtme salasõna",
+ "Repeat new recovery key password" : "Korda uut taastevõtme salasõna",
+ "Change Password" : "Muuda salasõna",
+ "Basic encryption module" : "Lihtkrüptimise moodul",
+ "Your private key password no longer matches your log-in password." : "Sinu privaatvõtme salasõna ei kattu enam sinu sisselogimise salasõna.",
+ "Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme salasõnaks oma praegune sisselogimise salasõna.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Kui sa ei mäleta oma vana salasõna, siis palu oma süsteemihalduril taastada ligipääs failidele.",
+ "Old log-in password" : "Sisselogimise vana salasõna",
+ "Current log-in password" : "Sisselogimise praegune salasõna",
+ "Update Private Key Password" : "Uuenda privaatvõtme salasõna",
+ "Enable password recovery:" : "Luba salasõna taastamine:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab salasõna kaotamise korral taastada ligipääsu krüptitud failidele",
"Enabled" : "Sisse lülitatud",
- "Disabled" : "Väljalülitatud"
+ "Disabled" : "Välja lülitatud"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/eu.js b/apps/encryption/l10n/eu.js
index ebee386de69..366077168f1 100644
--- a/apps/encryption/l10n/eu.js
+++ b/apps/encryption/l10n/eu.js
@@ -42,6 +42,7 @@ OC.L10N.register(
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Aukera hau gaituz gero, biltegi orokorreko fitxategi guztiak zifratuko dira, bestela kanpo biltegian daudenak bakarrik zifratuko dira",
"Enable recovery key" : "Berreskuratze gakoa gaitu",
"Disable recovery key" : "Berreskuratze gakoa desgaitu",
+ "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." : "Berreskuratze-gakoa fitxategiak zifratzeko erabiltzen den zifratze-gako gehigarria da. Pasahitza ahazten bada kontu bateko fitxategiak berreskuratzeko erabiltzen da.",
"Recovery key password" : "Berreskuratze gako pasahitza",
"Repeat recovery key password" : "Berreskuratze gakoaren pasahitza errepikatu",
"Change recovery key password:" : "Aldatu berreskuratze gako pasahitza:",
@@ -52,15 +53,12 @@ OC.L10N.register(
"Basic encryption module" : "Oinarrizko zifratze-modulua",
"Your private key password no longer matches your log-in password." : "Zure gako pasahitza pribatua ez da dagoeneko bat etortzen zure sartzeko pasahitzarekin.",
"Set your old private key password to your current log-in password:" : "Ezarri zure gako pasahitz zaharra orain duzun sartzeko pasahitzan:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko.",
"Old log-in password" : "Sartzeko pasahitz zaharra",
"Current log-in password" : "Sartzeko oraingo pasahitza",
"Update Private Key Password" : "Eguneratu gako pasahitza pribatua",
"Enable password recovery:" : "Gaitu pasahitzaren berreskuratzea:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aukera hau gaituz, zure zifratutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan",
"Enabled" : "Gaitua",
- "Disabled" : "Ez-gaitua",
- "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 log-in password\" field and your current login-password." : "Hasi saioa web-interfazean, joan zure ezarpen pertsonaletako \"Segurtasuna\" atalera eta eguneratu zure zifratze pasahitza pasahitz hau \"Saio-hasteko pasahitz zaharra\" eremuan eta zure uneko saio-hasierako pasahitza sartuz.",
- "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." : "Berreskuratze gakoa fitxategiak zifratzeko gako gehigarri bat da. Erabiltzailearen fitxategiak berreskuratzea baimentzen du bere pasahitza galduz gero."
+ "Disabled" : "Ez-gaitua"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/eu.json b/apps/encryption/l10n/eu.json
index 2b8be5843ce..7cb7dca9b59 100644
--- a/apps/encryption/l10n/eu.json
+++ b/apps/encryption/l10n/eu.json
@@ -40,6 +40,7 @@
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Aukera hau gaituz gero, biltegi orokorreko fitxategi guztiak zifratuko dira, bestela kanpo biltegian daudenak bakarrik zifratuko dira",
"Enable recovery key" : "Berreskuratze gakoa gaitu",
"Disable recovery key" : "Berreskuratze gakoa desgaitu",
+ "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." : "Berreskuratze-gakoa fitxategiak zifratzeko erabiltzen den zifratze-gako gehigarria da. Pasahitza ahazten bada kontu bateko fitxategiak berreskuratzeko erabiltzen da.",
"Recovery key password" : "Berreskuratze gako pasahitza",
"Repeat recovery key password" : "Berreskuratze gakoaren pasahitza errepikatu",
"Change recovery key password:" : "Aldatu berreskuratze gako pasahitza:",
@@ -50,15 +51,12 @@
"Basic encryption module" : "Oinarrizko zifratze-modulua",
"Your private key password no longer matches your log-in password." : "Zure gako pasahitza pribatua ez da dagoeneko bat etortzen zure sartzeko pasahitzarekin.",
"Set your old private key password to your current log-in password:" : "Ezarri zure gako pasahitz zaharra orain duzun sartzeko pasahitzan:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko.",
"Old log-in password" : "Sartzeko pasahitz zaharra",
"Current log-in password" : "Sartzeko oraingo pasahitza",
"Update Private Key Password" : "Eguneratu gako pasahitza pribatua",
"Enable password recovery:" : "Gaitu pasahitzaren berreskuratzea:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aukera hau gaituz, zure zifratutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan",
"Enabled" : "Gaitua",
- "Disabled" : "Ez-gaitua",
- "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 log-in password\" field and your current login-password." : "Hasi saioa web-interfazean, joan zure ezarpen pertsonaletako \"Segurtasuna\" atalera eta eguneratu zure zifratze pasahitza pasahitz hau \"Saio-hasteko pasahitz zaharra\" eremuan eta zure uneko saio-hasierako pasahitza sartuz.",
- "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." : "Berreskuratze gakoa fitxategiak zifratzeko gako gehigarri bat da. Erabiltzailearen fitxategiak berreskuratzea baimentzen du bere pasahitza galduz gero."
+ "Disabled" : "Ez-gaitua"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/fa.js b/apps/encryption/l10n/fa.js
index 0bafbd3b333..4bb30c0b93f 100644
--- a/apps/encryption/l10n/fa.js
+++ b/apps/encryption/l10n/fa.js
@@ -52,15 +52,12 @@ OC.L10N.register(
"Basic encryption module" : "ماژول رمزگذاری اولیه",
"Your private key password no longer matches your log-in password." : "رمز عبور محافظت شده شما با رمز عبور وارد شده مطابقت ندارد.",
"Set your old private key password to your current log-in password:" : "رمز عبور قبلی خود را بر روی رمز ورود فعلی تنظیم کنید.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "اگر رمزعبور قدیمی را فراموش کرده اید میتوانید از مدیر خود برای بازیابی فایل هایتان درخواست نمایید.",
"Old log-in password" : "رمزعبور قدیمی",
"Current log-in password" : "رمزعبور فعلی",
"Update Private Key Password" : "به روز رسانی رمزعبور کلید خصوصی",
"Enable password recovery:" : "فعال سازی بازیابی رمزعبور:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "فعال کردن این گزینه به شما اجازه خواهد داد در صورت از دست دادن رمزعبور به فایل های رمزگذاری شده خود دسترسی داشته باشید.",
"Enabled" : "فعال شده",
- "Disabled" : "غیرفعال شده",
- "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 log-in password\" field and your current login-password." : "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 log-in password\" field and your current login-password.",
- "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." : "کلید بازیابی یک کلید رمزگذاری اضافی است که برای رمزگذاری پرونده ها استفاده می شود. اگر کاربر رمزعبور خود را فراموش کند ، امکان بازیابی پرونده های کاربر را فراهم می کند."
+ "Disabled" : "غیرفعال شده"
},
"nplurals=2; plural=(n > 1);");
diff --git a/apps/encryption/l10n/fa.json b/apps/encryption/l10n/fa.json
index 866208c7543..8e22154c859 100644
--- a/apps/encryption/l10n/fa.json
+++ b/apps/encryption/l10n/fa.json
@@ -50,15 +50,12 @@
"Basic encryption module" : "ماژول رمزگذاری اولیه",
"Your private key password no longer matches your log-in password." : "رمز عبور محافظت شده شما با رمز عبور وارد شده مطابقت ندارد.",
"Set your old private key password to your current log-in password:" : "رمز عبور قبلی خود را بر روی رمز ورود فعلی تنظیم کنید.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "اگر رمزعبور قدیمی را فراموش کرده اید میتوانید از مدیر خود برای بازیابی فایل هایتان درخواست نمایید.",
"Old log-in password" : "رمزعبور قدیمی",
"Current log-in password" : "رمزعبور فعلی",
"Update Private Key Password" : "به روز رسانی رمزعبور کلید خصوصی",
"Enable password recovery:" : "فعال سازی بازیابی رمزعبور:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "فعال کردن این گزینه به شما اجازه خواهد داد در صورت از دست دادن رمزعبور به فایل های رمزگذاری شده خود دسترسی داشته باشید.",
"Enabled" : "فعال شده",
- "Disabled" : "غیرفعال شده",
- "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 log-in password\" field and your current login-password." : "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 log-in password\" field and your current login-password.",
- "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." : "کلید بازیابی یک کلید رمزگذاری اضافی است که برای رمزگذاری پرونده ها استفاده می شود. اگر کاربر رمزعبور خود را فراموش کند ، امکان بازیابی پرونده های کاربر را فراهم می کند."
+ "Disabled" : "غیرفعال شده"
},"pluralForm" :"nplurals=2; plural=(n > 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/fi.js b/apps/encryption/l10n/fi.js
index d9f140c9d29..65eca4819a0 100644
--- a/apps/encryption/l10n/fi.js
+++ b/apps/encryption/l10n/fi.js
@@ -46,14 +46,12 @@ OC.L10N.register(
"Basic encryption module" : "Perus salausmoduuli",
"Your private key password no longer matches your log-in password." : "Salaisen avaimesi salasana ei enää vastaa kirjautumissalasanaasi.",
"Set your old private key password to your current log-in password:" : "Aseta yksityisen avaimen vanha salasana vastaamaan nykyistä kirjautumissalasanaasi:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
"Old log-in password" : "Vanha kirjautumissalasana",
"Current log-in password" : "Nykyinen kirjautumissalasana",
"Update Private Key Password" : "Päivitä yksityisen avaimen salasana",
"Enable password recovery:" : "Ota salasanan palautus käyttöön:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tämän valinnan käyttäminen mahdollistaa pääsyn salattuihin tiedostoihisi, jos salasana unohtuu",
"Enabled" : "Käytössä",
- "Disabled" : "Ei käytössä",
- "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." : "Palautusavain on ylimääräinen salausavain, jota käytetään tiedostojen salaamiseen. Sen avulla on mahdollista palauttaa käyttäjien tiedostot, vaikka käyttäjä unohtaisi oman salasanansa."
+ "Disabled" : "Ei käytössä"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/fi.json b/apps/encryption/l10n/fi.json
index 6b2249a3db4..cad9ed01b1b 100644
--- a/apps/encryption/l10n/fi.json
+++ b/apps/encryption/l10n/fi.json
@@ -44,14 +44,12 @@
"Basic encryption module" : "Perus salausmoduuli",
"Your private key password no longer matches your log-in password." : "Salaisen avaimesi salasana ei enää vastaa kirjautumissalasanaasi.",
"Set your old private key password to your current log-in password:" : "Aseta yksityisen avaimen vanha salasana vastaamaan nykyistä kirjautumissalasanaasi:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
"Old log-in password" : "Vanha kirjautumissalasana",
"Current log-in password" : "Nykyinen kirjautumissalasana",
"Update Private Key Password" : "Päivitä yksityisen avaimen salasana",
"Enable password recovery:" : "Ota salasanan palautus käyttöön:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tämän valinnan käyttäminen mahdollistaa pääsyn salattuihin tiedostoihisi, jos salasana unohtuu",
"Enabled" : "Käytössä",
- "Disabled" : "Ei käytössä",
- "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." : "Palautusavain on ylimääräinen salausavain, jota käytetään tiedostojen salaamiseen. Sen avulla on mahdollista palauttaa käyttäjien tiedostot, vaikka käyttäjä unohtaisi oman salasanansa."
+ "Disabled" : "Ei käytössä"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js
index 8ebb3474c4b..f24147117cf 100644
--- a/apps/encryption/l10n/fr.js
+++ b/apps/encryption/l10n/fr.js
@@ -53,15 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "Module de chiffrement basique",
"Your private key password no longer matches your log-in password." : "Le mot de passe de votre clé privée ne correspond plus à votre mot de passe de connexion.",
"Set your old private key password to your current log-in password:" : "Remplacez l'ancien mot de passe de votre clé privée par votre mot de passe de connexion actuel :",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez pas de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
"Old log-in password" : "Ancien mot de passe de connexion",
"Current log-in password" : "Actuel mot de passe de connexion",
"Update Private Key Password" : "Mettre à jour le mot de passe de votre clé privée",
"Enable password recovery:" : "Activer la récupération du mot de passe :",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe",
"Enabled" : "Activé",
- "Disabled" : "Désactivé",
- "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 log-in password\" field and your current login-password." : "Connectez-vous depuis l'interface web, allez dans la section \"sécurité\" de vos paramètres personnels et mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et dans votre mot de passe de connexion actuel.",
- "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 clé de récupération est une clé supplémentaire utilisée pour chiffrer les fichiers. Elle permet de récupérer les fichiers des utilisateurs s’ils oublient leur mot de passe."
+ "Disabled" : "Désactivé"
},
"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json
index 81f3a807458..99936241dd5 100644
--- a/apps/encryption/l10n/fr.json
+++ b/apps/encryption/l10n/fr.json
@@ -51,15 +51,13 @@
"Basic encryption module" : "Module de chiffrement basique",
"Your private key password no longer matches your log-in password." : "Le mot de passe de votre clé privée ne correspond plus à votre mot de passe de connexion.",
"Set your old private key password to your current log-in password:" : "Remplacez l'ancien mot de passe de votre clé privée par votre mot de passe de connexion actuel :",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez pas de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
"Old log-in password" : "Ancien mot de passe de connexion",
"Current log-in password" : "Actuel mot de passe de connexion",
"Update Private Key Password" : "Mettre à jour le mot de passe de votre clé privée",
"Enable password recovery:" : "Activer la récupération du mot de passe :",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe",
"Enabled" : "Activé",
- "Disabled" : "Désactivé",
- "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 log-in password\" field and your current login-password." : "Connectez-vous depuis l'interface web, allez dans la section \"sécurité\" de vos paramètres personnels et mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et dans votre mot de passe de connexion actuel.",
- "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 clé de récupération est une clé supplémentaire utilisée pour chiffrer les fichiers. Elle permet de récupérer les fichiers des utilisateurs s’ils oublient leur mot de passe."
+ "Disabled" : "Désactivé"
},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/ga.js b/apps/encryption/l10n/ga.js
new file mode 100644
index 00000000000..557f6319ccd
--- /dev/null
+++ b/apps/encryption/l10n/ga.js
@@ -0,0 +1,65 @@
+OC.L10N.register(
+ "encryption",
+ {
+ "Missing recovery key password" : "Pasfhocal eochair athshlánaithe in easnamh",
+ "Please repeat the recovery key password" : "Déan pasfhocal an eochair athshlánaithe arís le do thoil",
+ "Repeated recovery key password does not match the provided recovery key password" : "Ní mheaitseálann pasfhocal na heochrach athshlánaithe arís agus arís eile an focal faire eochrach athshlánaithe a soláthraíodh",
+ "Recovery key successfully enabled" : "D'éirigh leis an eochair athshlánaithe a chumasú",
+ "Could not enable recovery key. Please check your recovery key password!" : "Níorbh fhéidir eochair athshlánaithe a chumasú. Seiceáil do phasfhocal eochair athshlánaithe le do thoil!",
+ "Recovery key successfully disabled" : "D'éirigh leis an eochair athshlánaithe a dhíchumasú",
+ "Could not disable recovery key. Please check your recovery key password!" : "Níorbh fhéidir an eochair athshlánaithe a dhíchumasú. Seiceáil do phasfhocal eochair athshlánaithe le do thoil!",
+ "Missing parameters" : "Paraiméadair ar iarraidh",
+ "Please provide the old recovery password" : "Tabhair an sean-phasfhocal athshlánaithe le do thoil",
+ "Please provide a new recovery password" : "Tabhair pasfhocal athshlánaithe nua le do thoil",
+ "Please repeat the new recovery password" : "Cuir an pasfhocal athshlánaithe nua arís le do thoil",
+ "Password successfully changed." : "D'éirigh le pasfhocal a athrú.",
+ "Could not change the password. Maybe the old password was not correct." : "Níorbh fhéidir an pasfhocal a athrú. B’fhéidir nach raibh an seanfhocal faire ceart.",
+ "Recovery Key disabled" : "Díchumasaíodh an Eochair Athshlánaithe",
+ "Recovery Key enabled" : "Eochair Aisghabhála cumasaithe",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Níorbh fhéidir an eochair athshlánaithe a chumasú, bain triail eile as nó déan teagmháil le do riarthóir le do thoil",
+ "Could not update the private key password." : "Níorbh fhéidir pasfhocal an eochair phríobháideach a nuashonrú.",
+ "The old password was not correct, please try again." : "Ní raibh an seanfhocal faire ceart, bain triail eile as.",
+ "The current log-in password was not correct, please try again." : "Ní raibh an pasfhocal logála isteach reatha ceart, bain triail eile as le do thoil.",
+ "Private key password successfully updated." : "D'éirigh le pasfhocal eochrach phríobháideach a nuashonrú.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Eochair phríobháideach neamhbhailí don aip criptithe. Nuashonraigh do phasfhocal eochair phríobháideach i do shocruithe pearsanta chun rochtain ar do chomhaid chriptithe a aisghabháil le do thoil.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Tá an aip chriptiúcháin cumasaithe, ach níl d'eochracha tosaithe. Logáil amach agus logáil isteach arís le do thoil.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Cumasaigh criptiú taobh an fhreastalaí sna socruithe riaracháin le do thoil chun an modúl criptithe a úsáid.",
+ "Encryption app is enabled and ready" : "Tá aip criptithe cumasaithe agus réidh",
+ "Bad Signature" : "Droch shíniú",
+ "Missing Signature" : "Síniú ar Iarraidh",
+ "one-time password for server-side-encryption" : "pasfhocal aonuaire le haghaidh criptithe freastalaí-taobh",
+ "Encryption password" : "Pasfhocal criptithe",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Chuir an riarachán ar chumas criptiú taobh an fhreastalaí. Criptíodh do chomhaid leis an bhfocal faire 1%s1.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Chuir an riarachán ar chumas criptiú taobh an fhreastalaí. Criptíodh do chomhaid leis an bhfocal faire \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Logáil isteach sa chomhéadan gréasáin le do thoil, téigh go dtí an rannán \"Slándáil\" de do shocruithe pearsanta agus nuashonraigh do phasfhocal criptithe tríd an bhfocal faire seo a chur isteach sa réimse \"Sean-phasfhocal logála isteach\" agus do phasfhocal logála isteach reatha.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ní féidir an comhad seo a dhíchriptiú, is dócha gur comhad roinnte é seo. Iarr ar úinéir an chomhaid an comhad a athroinnt leat le do thoil.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ní féidir an comhad seo a léamh, is dócha gur comhad roinnte é seo. Iarr ar úinéir an chomhaid an comhad a athroinnt leat le do thoil.",
+ "Default encryption module" : "Modúl criptithe réamhshocraithe",
+ "Default encryption module for server-side encryption" : "Modúl criptithe réamhshocraithe le haghaidh criptithe ar thaobh an fhreastalaí",
+ "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." : "Chun an modúl criptithe seo a úsáid ní mór duit criptiú taobh an fhreastalaí a chumasú sna socruithe riaracháin. Nuair a bheidh an modúl seo cumasaithe, déanfaidh sé do chomhaid go léir a chriptiú go trédhearcach. Tá an criptiú bunaithe ar eochracha AES 256.\nNí dhéanfaidh an modúl teagmháil le comhaid atá ann cheana féin, ní dhéanfar ach comhaid nua a chriptiú tar éis criptiú taobh an fhreastalaí a chumasú. Ní féidir ach an oiread an criptiú a dhíchumasú arís agus athrú ar ais go córas neamhchriptithe.\nLéigh an doiciméadú le do thoil chun na himpleachtaí go léir a fhios agat sula gcinnfidh tú criptiú taobh an fhreastalaí a chumasú.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Tá aip criptiúcháin cumasaithe ach níl d'eochracha tosaithe, logáil amach agus logáil isteach arís le do thoil",
+ "Encrypt the home storage" : "Criptigh an stóráil sa bhaile",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Má dhéantar an rogha seo a chumasú, criptítear gach comhad atá stóráilte ar an bpríomhstóráil, nó ní dhéanfar ach comhaid ar stóráil sheachtrach a chriptiú",
+ "Enable recovery key" : "Cumasaigh eochair athshlánaithe",
+ "Disable recovery key" : "Díchumasaigh eochair athshlánaithe",
+ "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." : "Is eochair chriptiúcháin bhreise í an eochair athshlánaithe a úsáidtear chun comhaid a chriptiú. Úsáidtear é chun comhaid a aisghabháil ó chuntas má dhéantar dearmad ar an bhfocal faire.",
+ "Recovery key password" : "Pasfhocal eochair athshlánaithe",
+ "Repeat recovery key password" : "Déan an eochairfhocal athshlánaithe arís",
+ "Change recovery key password:" : "Athraigh pasfhocal an eochair athshlánaithe:",
+ "Old recovery key password" : "Sean phasfhocal eochair athshlánaithe",
+ "New recovery key password" : "Pasfhocal eochair athshlánaithe nua",
+ "Repeat new recovery key password" : "Déan pasfhocal eochair athshlánaithe nua arís",
+ "Change Password" : "Athraigh do phasfhocal",
+ "Basic encryption module" : "Bun-mhodúl criptithe",
+ "Your private key password no longer matches your log-in password." : "Ní mheaitseálann do phasfhocal eochrach príobháidí do phasfhocal logáil-isteach a thuilleadh.",
+ "Set your old private key password to your current log-in password:" : "Socraigh do shean phasfhocal eochair phríobháideach le do phasfhocal logáil-isteach reatha:",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Mura cuimhin leat do sheanphasfhocal is féidir leat iarraidh ar do riarthóir do chuid comhad a athshlánú.",
+ "Old log-in password" : "Sean phasfhocal logáil isteach",
+ "Current log-in password" : "Pasfhocal logáil isteach reatha",
+ "Update Private Key Password" : "Nuashonraigh Pasfhocal Eochair Phríobháideach",
+ "Enable password recovery:" : "Cumasaigh aisghabháil pasfhocail:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Má chumasaíonn tú an rogha seo beidh tú in ann rochtain a fháil ar do chomhaid chriptithe arís ar eagla go gcailltear pasfhocal",
+ "Enabled" : "Cumasaithe",
+ "Disabled" : "Faoi mhíchumas"
+},
+"nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);");
diff --git a/apps/encryption/l10n/ga.json b/apps/encryption/l10n/ga.json
new file mode 100644
index 00000000000..c2313b11540
--- /dev/null
+++ b/apps/encryption/l10n/ga.json
@@ -0,0 +1,63 @@
+{ "translations": {
+ "Missing recovery key password" : "Pasfhocal eochair athshlánaithe in easnamh",
+ "Please repeat the recovery key password" : "Déan pasfhocal an eochair athshlánaithe arís le do thoil",
+ "Repeated recovery key password does not match the provided recovery key password" : "Ní mheaitseálann pasfhocal na heochrach athshlánaithe arís agus arís eile an focal faire eochrach athshlánaithe a soláthraíodh",
+ "Recovery key successfully enabled" : "D'éirigh leis an eochair athshlánaithe a chumasú",
+ "Could not enable recovery key. Please check your recovery key password!" : "Níorbh fhéidir eochair athshlánaithe a chumasú. Seiceáil do phasfhocal eochair athshlánaithe le do thoil!",
+ "Recovery key successfully disabled" : "D'éirigh leis an eochair athshlánaithe a dhíchumasú",
+ "Could not disable recovery key. Please check your recovery key password!" : "Níorbh fhéidir an eochair athshlánaithe a dhíchumasú. Seiceáil do phasfhocal eochair athshlánaithe le do thoil!",
+ "Missing parameters" : "Paraiméadair ar iarraidh",
+ "Please provide the old recovery password" : "Tabhair an sean-phasfhocal athshlánaithe le do thoil",
+ "Please provide a new recovery password" : "Tabhair pasfhocal athshlánaithe nua le do thoil",
+ "Please repeat the new recovery password" : "Cuir an pasfhocal athshlánaithe nua arís le do thoil",
+ "Password successfully changed." : "D'éirigh le pasfhocal a athrú.",
+ "Could not change the password. Maybe the old password was not correct." : "Níorbh fhéidir an pasfhocal a athrú. B’fhéidir nach raibh an seanfhocal faire ceart.",
+ "Recovery Key disabled" : "Díchumasaíodh an Eochair Athshlánaithe",
+ "Recovery Key enabled" : "Eochair Aisghabhála cumasaithe",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Níorbh fhéidir an eochair athshlánaithe a chumasú, bain triail eile as nó déan teagmháil le do riarthóir le do thoil",
+ "Could not update the private key password." : "Níorbh fhéidir pasfhocal an eochair phríobháideach a nuashonrú.",
+ "The old password was not correct, please try again." : "Ní raibh an seanfhocal faire ceart, bain triail eile as.",
+ "The current log-in password was not correct, please try again." : "Ní raibh an pasfhocal logála isteach reatha ceart, bain triail eile as le do thoil.",
+ "Private key password successfully updated." : "D'éirigh le pasfhocal eochrach phríobháideach a nuashonrú.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Eochair phríobháideach neamhbhailí don aip criptithe. Nuashonraigh do phasfhocal eochair phríobháideach i do shocruithe pearsanta chun rochtain ar do chomhaid chriptithe a aisghabháil le do thoil.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Tá an aip chriptiúcháin cumasaithe, ach níl d'eochracha tosaithe. Logáil amach agus logáil isteach arís le do thoil.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Cumasaigh criptiú taobh an fhreastalaí sna socruithe riaracháin le do thoil chun an modúl criptithe a úsáid.",
+ "Encryption app is enabled and ready" : "Tá aip criptithe cumasaithe agus réidh",
+ "Bad Signature" : "Droch shíniú",
+ "Missing Signature" : "Síniú ar Iarraidh",
+ "one-time password for server-side-encryption" : "pasfhocal aonuaire le haghaidh criptithe freastalaí-taobh",
+ "Encryption password" : "Pasfhocal criptithe",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Chuir an riarachán ar chumas criptiú taobh an fhreastalaí. Criptíodh do chomhaid leis an bhfocal faire 1%s1.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Chuir an riarachán ar chumas criptiú taobh an fhreastalaí. Criptíodh do chomhaid leis an bhfocal faire \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Logáil isteach sa chomhéadan gréasáin le do thoil, téigh go dtí an rannán \"Slándáil\" de do shocruithe pearsanta agus nuashonraigh do phasfhocal criptithe tríd an bhfocal faire seo a chur isteach sa réimse \"Sean-phasfhocal logála isteach\" agus do phasfhocal logála isteach reatha.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ní féidir an comhad seo a dhíchriptiú, is dócha gur comhad roinnte é seo. Iarr ar úinéir an chomhaid an comhad a athroinnt leat le do thoil.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ní féidir an comhad seo a léamh, is dócha gur comhad roinnte é seo. Iarr ar úinéir an chomhaid an comhad a athroinnt leat le do thoil.",
+ "Default encryption module" : "Modúl criptithe réamhshocraithe",
+ "Default encryption module for server-side encryption" : "Modúl criptithe réamhshocraithe le haghaidh criptithe ar thaobh an fhreastalaí",
+ "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." : "Chun an modúl criptithe seo a úsáid ní mór duit criptiú taobh an fhreastalaí a chumasú sna socruithe riaracháin. Nuair a bheidh an modúl seo cumasaithe, déanfaidh sé do chomhaid go léir a chriptiú go trédhearcach. Tá an criptiú bunaithe ar eochracha AES 256.\nNí dhéanfaidh an modúl teagmháil le comhaid atá ann cheana féin, ní dhéanfar ach comhaid nua a chriptiú tar éis criptiú taobh an fhreastalaí a chumasú. Ní féidir ach an oiread an criptiú a dhíchumasú arís agus athrú ar ais go córas neamhchriptithe.\nLéigh an doiciméadú le do thoil chun na himpleachtaí go léir a fhios agat sula gcinnfidh tú criptiú taobh an fhreastalaí a chumasú.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Tá aip criptiúcháin cumasaithe ach níl d'eochracha tosaithe, logáil amach agus logáil isteach arís le do thoil",
+ "Encrypt the home storage" : "Criptigh an stóráil sa bhaile",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Má dhéantar an rogha seo a chumasú, criptítear gach comhad atá stóráilte ar an bpríomhstóráil, nó ní dhéanfar ach comhaid ar stóráil sheachtrach a chriptiú",
+ "Enable recovery key" : "Cumasaigh eochair athshlánaithe",
+ "Disable recovery key" : "Díchumasaigh eochair athshlánaithe",
+ "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." : "Is eochair chriptiúcháin bhreise í an eochair athshlánaithe a úsáidtear chun comhaid a chriptiú. Úsáidtear é chun comhaid a aisghabháil ó chuntas má dhéantar dearmad ar an bhfocal faire.",
+ "Recovery key password" : "Pasfhocal eochair athshlánaithe",
+ "Repeat recovery key password" : "Déan an eochairfhocal athshlánaithe arís",
+ "Change recovery key password:" : "Athraigh pasfhocal an eochair athshlánaithe:",
+ "Old recovery key password" : "Sean phasfhocal eochair athshlánaithe",
+ "New recovery key password" : "Pasfhocal eochair athshlánaithe nua",
+ "Repeat new recovery key password" : "Déan pasfhocal eochair athshlánaithe nua arís",
+ "Change Password" : "Athraigh do phasfhocal",
+ "Basic encryption module" : "Bun-mhodúl criptithe",
+ "Your private key password no longer matches your log-in password." : "Ní mheaitseálann do phasfhocal eochrach príobháidí do phasfhocal logáil-isteach a thuilleadh.",
+ "Set your old private key password to your current log-in password:" : "Socraigh do shean phasfhocal eochair phríobháideach le do phasfhocal logáil-isteach reatha:",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Mura cuimhin leat do sheanphasfhocal is féidir leat iarraidh ar do riarthóir do chuid comhad a athshlánú.",
+ "Old log-in password" : "Sean phasfhocal logáil isteach",
+ "Current log-in password" : "Pasfhocal logáil isteach reatha",
+ "Update Private Key Password" : "Nuashonraigh Pasfhocal Eochair Phríobháideach",
+ "Enable password recovery:" : "Cumasaigh aisghabháil pasfhocail:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Má chumasaíonn tú an rogha seo beidh tú in ann rochtain a fháil ar do chomhaid chriptithe arís ar eagla go gcailltear pasfhocal",
+ "Enabled" : "Cumasaithe",
+ "Disabled" : "Faoi mhíchumas"
+},"pluralForm" :"nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);"
+} \ No newline at end of file
diff --git a/apps/encryption/l10n/gl.js b/apps/encryption/l10n/gl.js
index ee25a992278..52b453360c0 100644
--- a/apps/encryption/l10n/gl.js
+++ b/apps/encryption/l10n/gl.js
@@ -42,6 +42,7 @@ OC.L10N.register(
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ao activar esta opción cífranse todos os ficheiros almacenados no almacenamento principal, senón só se cifran os ficheiros do almacenamento externo.",
"Enable recovery key" : "Activar a chave de recuperación",
"Disable recovery key" : "Desactivar a chave de recuperación",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "A chave de recuperación é unha chave de cifrado adicional que se usa para cifrar ficheiros. Utilízase para recuperar ficheiros dunha conta se se esquece o contrasinal.",
"Recovery key password" : "Contrasinal da chave de recuperación",
"Repeat recovery key password" : "Repita o contrasinal da chave de recuperación",
"Change recovery key password:" : "Cambiar o contrasinal da chave de la recuperación:",
@@ -52,15 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de cifrado básico",
"Your private key password no longer matches your log-in password." : "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso.",
"Set your old private key password to your current log-in password:" : "Estabeleza o seu contrasinal antigo da chave privada ao seu contrasinal de acceso actual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu antigo contrasinal pode pedirllo á administración desta instancia. para recuperar os seus ficheiros.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu contrasinal antigo pode pedirllo á administración desta instancia. para recuperar os seus ficheiros.",
"Old log-in password" : "Contrasinal antigo de acceso",
"Current log-in password" : "Contrasinal actual de acceso",
"Update Private Key Password" : "Actualizar o contrasinal da chave privada",
"Enable password recovery:" : "Activar o contrasinal de recuperación:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ao activar esta opción permitiráselle volver obter acceso aos ficheiros cifrados no caso de perda do contrasinal",
"Enabled" : "Activado",
- "Disabled" : "Desactivado",
- "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 log-in password\" field and your current login-password." : "Acceda na interface web, vaia á sección «Seguranza» dos seus axustes persoais e actualice o seu contrasinal de cifrado introducindo este contrasinal no campo «Contrasinal antigo de acceso» e o seu contrasinal de acceso actual.",
- "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." : "A chave de recuperación é unha chave de cifrado adicional que se utiliza para cifrar ficheiros. Permite a recuperación de ficheiros dun usuario se o usuario esquece o seu contrasinal."
+ "Disabled" : "Desactivado"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/gl.json b/apps/encryption/l10n/gl.json
index 9279410ec5d..916b92af67a 100644
--- a/apps/encryption/l10n/gl.json
+++ b/apps/encryption/l10n/gl.json
@@ -40,6 +40,7 @@
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ao activar esta opción cífranse todos os ficheiros almacenados no almacenamento principal, senón só se cifran os ficheiros do almacenamento externo.",
"Enable recovery key" : "Activar a chave de recuperación",
"Disable recovery key" : "Desactivar a chave de recuperación",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "A chave de recuperación é unha chave de cifrado adicional que se usa para cifrar ficheiros. Utilízase para recuperar ficheiros dunha conta se se esquece o contrasinal.",
"Recovery key password" : "Contrasinal da chave de recuperación",
"Repeat recovery key password" : "Repita o contrasinal da chave de recuperación",
"Change recovery key password:" : "Cambiar o contrasinal da chave de la recuperación:",
@@ -50,15 +51,13 @@
"Basic encryption module" : "Módulo de cifrado básico",
"Your private key password no longer matches your log-in password." : "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso.",
"Set your old private key password to your current log-in password:" : "Estabeleza o seu contrasinal antigo da chave privada ao seu contrasinal de acceso actual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu antigo contrasinal pode pedirllo á administración desta instancia. para recuperar os seus ficheiros.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu contrasinal antigo pode pedirllo á administración desta instancia. para recuperar os seus ficheiros.",
"Old log-in password" : "Contrasinal antigo de acceso",
"Current log-in password" : "Contrasinal actual de acceso",
"Update Private Key Password" : "Actualizar o contrasinal da chave privada",
"Enable password recovery:" : "Activar o contrasinal de recuperación:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ao activar esta opción permitiráselle volver obter acceso aos ficheiros cifrados no caso de perda do contrasinal",
"Enabled" : "Activado",
- "Disabled" : "Desactivado",
- "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 log-in password\" field and your current login-password." : "Acceda na interface web, vaia á sección «Seguranza» dos seus axustes persoais e actualice o seu contrasinal de cifrado introducindo este contrasinal no campo «Contrasinal antigo de acceso» e o seu contrasinal de acceso actual.",
- "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." : "A chave de recuperación é unha chave de cifrado adicional que se utiliza para cifrar ficheiros. Permite a recuperación de ficheiros dun usuario se o usuario esquece o seu contrasinal."
+ "Disabled" : "Desactivado"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/he.js b/apps/encryption/l10n/he.js
index 768d8d2e85b..90acc921c73 100644
--- a/apps/encryption/l10n/he.js
+++ b/apps/encryption/l10n/he.js
@@ -45,14 +45,12 @@ OC.L10N.register(
"Basic encryption module" : "מודול הצפנה בסיסי",
"Your private key password no longer matches your log-in password." : "סיסמת המפתח האישי שלך כבר אינה מתאימה לסיסמת ההתחברות שלך.",
"Set your old private key password to your current log-in password:" : "יש להחליף את סיסמת המפתח האישי הישנה בסיסמת ההתחברות הנוכחית:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "אם הסיסמא הישנה נשכחה ניתן לפנות למנהל על מנת שישחזר את הקבצים שלך.",
"Old log-in password" : "סיסמת התחברות ישנה",
"Current log-in password" : "סיסמת התחברות נוכחית",
"Update Private Key Password" : "עדכון סיסמת המפתח האישי",
"Enable password recovery:" : "מאפשר שחזור סיסמא:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "הפעלת אפשרות זו תאפשר לך לקבל מחדש גישה לקבצים המוצפנים שלך במקרה שסיסמא נשכחת",
"Enabled" : "מופעל",
- "Disabled" : "מנוטרל",
- "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." : "מפתח השחזור הנו מפתח הצפנה נוסף לשימוש לצורך הצפנת הקבצים. הוא מאפשר את שחזור קבצי המשתמש אם המשתמש שוכח את הסיסמא שלו."
+ "Disabled" : "מנוטרל"
},
"nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;");
diff --git a/apps/encryption/l10n/he.json b/apps/encryption/l10n/he.json
index 26272a5f0ea..551cd192cdf 100644
--- a/apps/encryption/l10n/he.json
+++ b/apps/encryption/l10n/he.json
@@ -43,14 +43,12 @@
"Basic encryption module" : "מודול הצפנה בסיסי",
"Your private key password no longer matches your log-in password." : "סיסמת המפתח האישי שלך כבר אינה מתאימה לסיסמת ההתחברות שלך.",
"Set your old private key password to your current log-in password:" : "יש להחליף את סיסמת המפתח האישי הישנה בסיסמת ההתחברות הנוכחית:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "אם הסיסמא הישנה נשכחה ניתן לפנות למנהל על מנת שישחזר את הקבצים שלך.",
"Old log-in password" : "סיסמת התחברות ישנה",
"Current log-in password" : "סיסמת התחברות נוכחית",
"Update Private Key Password" : "עדכון סיסמת המפתח האישי",
"Enable password recovery:" : "מאפשר שחזור סיסמא:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "הפעלת אפשרות זו תאפשר לך לקבל מחדש גישה לקבצים המוצפנים שלך במקרה שסיסמא נשכחת",
"Enabled" : "מופעל",
- "Disabled" : "מנוטרל",
- "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." : "מפתח השחזור הנו מפתח הצפנה נוסף לשימוש לצורך הצפנת הקבצים. הוא מאפשר את שחזור קבצי המשתמש אם המשתמש שוכח את הסיסמא שלו."
+ "Disabled" : "מנוטרל"
},"pluralForm" :"nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/hr.js b/apps/encryption/l10n/hr.js
index 65fb4f81974..8a209bfb650 100644
--- a/apps/encryption/l10n/hr.js
+++ b/apps/encryption/l10n/hr.js
@@ -47,14 +47,12 @@ OC.L10N.register(
"Basic encryption module" : "Osnovni modul za šifriranje",
"Your private key password no longer matches your log-in password." : "Zaporka vašeg privatnog ključa više se ne podudara s vašom zaporkom za prijavu.",
"Set your old private key password to your current log-in password:" : "Promijenite svoju staru zaporku privatnog ključa u postojeću zaporku za prijavu:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ako se ne sjećate svoje stare zaporke, zatražite od administratora da oporavi vaše datoteke.",
"Old log-in password" : "Stara zaporka za prijavu",
"Current log-in password" : "Aktualna zaporka za prijavu",
"Update Private Key Password" : "Ažuriraj zaporku privatnog ključa",
"Enable password recovery:" : "Omogući oporavak zaporke:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "U slučaju gubitka zaporke, aktiviranje ove mogućnosti ponovno će vam pribaviti pristup vašim šifriranim datotekama",
"Enabled" : "Omogućeno",
- "Disabled" : "Onemogućeno",
- "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." : "Ključ za oporavak dodatni je ključ za šifriranje koji se upotrebljava za šifriranje datoteka. Omogućuje oporavak datoteka kada korisnik zaboravi svoju zaporku."
+ "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/hr.json b/apps/encryption/l10n/hr.json
index 4481bd24092..ee122cb881b 100644
--- a/apps/encryption/l10n/hr.json
+++ b/apps/encryption/l10n/hr.json
@@ -45,14 +45,12 @@
"Basic encryption module" : "Osnovni modul za šifriranje",
"Your private key password no longer matches your log-in password." : "Zaporka vašeg privatnog ključa više se ne podudara s vašom zaporkom za prijavu.",
"Set your old private key password to your current log-in password:" : "Promijenite svoju staru zaporku privatnog ključa u postojeću zaporku za prijavu:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ako se ne sjećate svoje stare zaporke, zatražite od administratora da oporavi vaše datoteke.",
"Old log-in password" : "Stara zaporka za prijavu",
"Current log-in password" : "Aktualna zaporka za prijavu",
"Update Private Key Password" : "Ažuriraj zaporku privatnog ključa",
"Enable password recovery:" : "Omogući oporavak zaporke:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "U slučaju gubitka zaporke, aktiviranje ove mogućnosti ponovno će vam pribaviti pristup vašim šifriranim datotekama",
"Enabled" : "Omogućeno",
- "Disabled" : "Onemogućeno",
- "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." : "Ključ za oporavak dodatni je ključ za šifriranje koji se upotrebljava za šifriranje datoteka. Omogućuje oporavak datoteka kada korisnik zaboravi svoju zaporku."
+ "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/hu.js b/apps/encryption/l10n/hu.js
index 6becb3226d6..cb8f07952a4 100644
--- a/apps/encryption/l10n/hu.js
+++ b/apps/encryption/l10n/hu.js
@@ -42,6 +42,7 @@ OC.L10N.register(
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "A lehetőség engedélyezésekor minden fájlt titkosít a fő tárolóban, egyébként csak a külső tárolókon lévő fájlok lesznek titkosítva",
"Enable recovery key" : "Helyreállítási kulcs engedélyezése",
"Disable recovery key" : "Helyreállítási kulcs letiltása",
+ "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 helyreállítási kulcs egy további titkosítási kulcs fájlok titkosításához. Arra szolgál, hogy egy fiókból vissza lehessen állítani a fájlokat, ha a jelszót elfelejtették.",
"Recovery key password" : "Helyreállítási kulcs jelszava",
"Repeat recovery key password" : "Ismételje meg a heylreállítási kulcs jelszavát",
"Change recovery key password:" : "Helyreállítási kulcs jelszavának módosítása:",
@@ -52,15 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "Alapvető titkosítási modul",
"Your private key password no longer matches your log-in password." : "A titkos kulcsa jelszava már nem egyezik meg a bejelentkezési jelszavával. ",
"Set your old private key password to your current log-in password:" : "A régi privát kulcsának jelszavának beállítása a jelenlegi bejelentkezési jelszavára:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára, akkor megkérheti a rendszergazdát, hogy állítsa helyre a fájljait.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára, akkor megkérheti a rendszergazdát, hogy állítsa helyre a fájljait.",
"Old log-in password" : "Régi bejelentkezési jelszó",
"Current log-in password" : "Jelenlegi bejelentkezési jelszó",
"Update Private Key Password" : "Titkos kulcs jelszavának frissítése",
"Enable password recovery:" : "Jelszó-helyreállítás engedélyezése:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "A beállítás lehetővé teszi, hogy visszanyerje a titkosított fájlok tartalmát, ha elfelejtette a jelszavát",
"Enabled" : "Engedélyezve",
- "Disabled" : "Letiltva",
- "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 log-in password\" field and your current login-password." : "Jelentkezzen be a webes felületre, ugorjon a személyes beállításai „Biztonság” szakaszához, és frissítse a titkosítási jelszavát úgy, hogy megadja ezt a jelszót a „Régi bejelentkezési jelszó” mezőben, majd megadja a jelenlegi bejelentkezési jelszavát.",
- "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." : "A helyreállítási kulcs egy a fájlok titkosítására szolgáló további titkosítási kulcs. A segítségével vissza lehet állítani a fájlokat, ha felhasználó elfelejtette a jelszavát."
+ "Disabled" : "Letiltva"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/hu.json b/apps/encryption/l10n/hu.json
index f18717f97c3..cd394f8fad1 100644
--- a/apps/encryption/l10n/hu.json
+++ b/apps/encryption/l10n/hu.json
@@ -40,6 +40,7 @@
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "A lehetőség engedélyezésekor minden fájlt titkosít a fő tárolóban, egyébként csak a külső tárolókon lévő fájlok lesznek titkosítva",
"Enable recovery key" : "Helyreállítási kulcs engedélyezése",
"Disable recovery key" : "Helyreállítási kulcs letiltása",
+ "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 helyreállítási kulcs egy további titkosítási kulcs fájlok titkosításához. Arra szolgál, hogy egy fiókból vissza lehessen állítani a fájlokat, ha a jelszót elfelejtették.",
"Recovery key password" : "Helyreállítási kulcs jelszava",
"Repeat recovery key password" : "Ismételje meg a heylreállítási kulcs jelszavát",
"Change recovery key password:" : "Helyreállítási kulcs jelszavának módosítása:",
@@ -50,15 +51,13 @@
"Basic encryption module" : "Alapvető titkosítási modul",
"Your private key password no longer matches your log-in password." : "A titkos kulcsa jelszava már nem egyezik meg a bejelentkezési jelszavával. ",
"Set your old private key password to your current log-in password:" : "A régi privát kulcsának jelszavának beállítása a jelenlegi bejelentkezési jelszavára:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára, akkor megkérheti a rendszergazdát, hogy állítsa helyre a fájljait.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára, akkor megkérheti a rendszergazdát, hogy állítsa helyre a fájljait.",
"Old log-in password" : "Régi bejelentkezési jelszó",
"Current log-in password" : "Jelenlegi bejelentkezési jelszó",
"Update Private Key Password" : "Titkos kulcs jelszavának frissítése",
"Enable password recovery:" : "Jelszó-helyreállítás engedélyezése:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "A beállítás lehetővé teszi, hogy visszanyerje a titkosított fájlok tartalmát, ha elfelejtette a jelszavát",
"Enabled" : "Engedélyezve",
- "Disabled" : "Letiltva",
- "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 log-in password\" field and your current login-password." : "Jelentkezzen be a webes felületre, ugorjon a személyes beállításai „Biztonság” szakaszához, és frissítse a titkosítási jelszavát úgy, hogy megadja ezt a jelszót a „Régi bejelentkezési jelszó” mezőben, majd megadja a jelenlegi bejelentkezési jelszavát.",
- "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." : "A helyreállítási kulcs egy a fájlok titkosítására szolgáló további titkosítási kulcs. A segítségével vissza lehet állítani a fájlokat, ha felhasználó elfelejtette a jelszavát."
+ "Disabled" : "Letiltva"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/ia.js b/apps/encryption/l10n/ia.js
deleted file mode 100644
index 27932deb15e..00000000000
--- a/apps/encryption/l10n/ia.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "The share will expire on %s." : "Le compartir expirara le %s.",
- "Cheers!" : "Acclamationes!"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/ia.json b/apps/encryption/l10n/ia.json
deleted file mode 100644
index a935ab07c57..00000000000
--- a/apps/encryption/l10n/ia.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
- "The share will expire on %s." : "Le compartir expirara le %s.",
- "Cheers!" : "Acclamationes!"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/id.js b/apps/encryption/l10n/id.js
index c03654e8cfa..fbd5fb3818d 100644
--- a/apps/encryption/l10n/id.js
+++ b/apps/encryption/l10n/id.js
@@ -48,14 +48,12 @@ OC.L10N.register(
"Basic encryption module" : "Modul enkripsi dasar",
"Your private key password no longer matches your log-in password." : "Kata sandi kunci private Anda tidak lagi cocok dengan kata sandi masuk Anda.",
"Set your old private key password to your current log-in password:" : "Setel kata sandi kunci private Anda untuk kata sandi masuk Anda saat ini:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat kata sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
"Old log-in password" : "Kata sandi masuk yang lama",
"Current log-in password" : "Kata sandi masuk saat ini",
"Update Private Key Password" : "Perbarui Kata Sandi Kunci Private",
"Enable password recovery:" : "Aktifkan kata sandi pemulihan:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan kata sandi",
"Enabled" : "Diaktifkan",
- "Disabled" : "Dinonaktifkan",
- "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." : "Kunci pemulihan adalah kunci enkripsi tambahan yang digunakan untuk mengenkripsi berkas. Kunci pemulihan memungkinkan untuk memulihkan berkas pengguna ketika pengguna tersebut melupakan kata sandi mereka."
+ "Disabled" : "Dinonaktifkan"
},
"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/id.json b/apps/encryption/l10n/id.json
index 6a03e686c63..5135c20a39c 100644
--- a/apps/encryption/l10n/id.json
+++ b/apps/encryption/l10n/id.json
@@ -46,14 +46,12 @@
"Basic encryption module" : "Modul enkripsi dasar",
"Your private key password no longer matches your log-in password." : "Kata sandi kunci private Anda tidak lagi cocok dengan kata sandi masuk Anda.",
"Set your old private key password to your current log-in password:" : "Setel kata sandi kunci private Anda untuk kata sandi masuk Anda saat ini:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat kata sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
"Old log-in password" : "Kata sandi masuk yang lama",
"Current log-in password" : "Kata sandi masuk saat ini",
"Update Private Key Password" : "Perbarui Kata Sandi Kunci Private",
"Enable password recovery:" : "Aktifkan kata sandi pemulihan:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan kata sandi",
"Enabled" : "Diaktifkan",
- "Disabled" : "Dinonaktifkan",
- "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." : "Kunci pemulihan adalah kunci enkripsi tambahan yang digunakan untuk mengenkripsi berkas. Kunci pemulihan memungkinkan untuk memulihkan berkas pengguna ketika pengguna tersebut melupakan kata sandi mereka."
+ "Disabled" : "Dinonaktifkan"
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/is.js b/apps/encryption/l10n/is.js
index d0baa6a421d..202d478d6e8 100644
--- a/apps/encryption/l10n/is.js
+++ b/apps/encryption/l10n/is.js
@@ -45,14 +45,12 @@ OC.L10N.register(
"Basic encryption module" : "Grunn-dulritunareining",
"Your private key password no longer matches your log-in password." : "Lykilorð einkalykilsins þíns samsvarar ekki lengur innskráningarlykilorðinu þínu.",
"Set your old private key password to your current log-in password:" : "Settu eldra lykilorð einkalykilsins þíns á að vera það sama og núgildandi innskráningarlykilorðið þitt:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " Ef þú manst ekki gamla lykilorðið þitt geturðu beðið kerfisstjórann þinn um að endurheimta skrárnar þínar.",
"Old log-in password" : "Gamla innskráningarlykilorðið",
"Current log-in password" : "Núgildandi innskráningarlykilorð",
"Update Private Key Password" : "Uppfæra lykilorð einkalykils:",
"Enable password recovery:" : "Virkja endurheimtingu lykilorðs:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ef þessi kostur er virkur gerir það þér kleift að endurheimta aðgang að skránum þínum ef þú tapar lykilorðinu",
"Enabled" : "Virkt",
- "Disabled" : "Óvirkt",
- "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." : "Endurheimtingarlykill er auka-dulritunarlykill sem er notaður til að dulrita skrár. Hann gefur möguleika á að endurheimta skrár ef notandi gleymir lykilorðinu sínu."
+ "Disabled" : "Óvirkt"
},
"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/encryption/l10n/is.json b/apps/encryption/l10n/is.json
index 75f78ab9af2..05e0faff580 100644
--- a/apps/encryption/l10n/is.json
+++ b/apps/encryption/l10n/is.json
@@ -43,14 +43,12 @@
"Basic encryption module" : "Grunn-dulritunareining",
"Your private key password no longer matches your log-in password." : "Lykilorð einkalykilsins þíns samsvarar ekki lengur innskráningarlykilorðinu þínu.",
"Set your old private key password to your current log-in password:" : "Settu eldra lykilorð einkalykilsins þíns á að vera það sama og núgildandi innskráningarlykilorðið þitt:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " Ef þú manst ekki gamla lykilorðið þitt geturðu beðið kerfisstjórann þinn um að endurheimta skrárnar þínar.",
"Old log-in password" : "Gamla innskráningarlykilorðið",
"Current log-in password" : "Núgildandi innskráningarlykilorð",
"Update Private Key Password" : "Uppfæra lykilorð einkalykils:",
"Enable password recovery:" : "Virkja endurheimtingu lykilorðs:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ef þessi kostur er virkur gerir það þér kleift að endurheimta aðgang að skránum þínum ef þú tapar lykilorðinu",
"Enabled" : "Virkt",
- "Disabled" : "Óvirkt",
- "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." : "Endurheimtingarlykill er auka-dulritunarlykill sem er notaður til að dulrita skrár. Hann gefur möguleika á að endurheimta skrár ef notandi gleymir lykilorðinu sínu."
+ "Disabled" : "Óvirkt"
},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/it.js b/apps/encryption/l10n/it.js
index 00214bfe232..fbf0c59569d 100644
--- a/apps/encryption/l10n/it.js
+++ b/apps/encryption/l10n/it.js
@@ -48,14 +48,12 @@ OC.L10N.register(
"Basic encryption module" : "Modulo di cifratura base",
"Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
"Set your old private key password to your current log-in password:" : "Imposta la vecchia password della chiave privata sull'attuale password di accesso:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
"Old log-in password" : "Vecchia password di accesso",
"Current log-in password" : "Password di accesso attuale",
"Update Private Key Password" : "Aggiorna la password della chiave privata",
"Enable password recovery:" : "Abilita il ripristino della password:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password",
"Enabled" : "Abilitata",
- "Disabled" : "Disabilitata",
- "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 chiave di ripristino è una chiave di cifratura aggiuntiva utilizzata per cifrare i file. Consente di ripristinare i file di un utente se l'utente dimentica la propria password."
+ "Disabled" : "Disabilitata"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/it.json b/apps/encryption/l10n/it.json
index 74ddaf3e65c..c94c84cac0f 100644
--- a/apps/encryption/l10n/it.json
+++ b/apps/encryption/l10n/it.json
@@ -46,14 +46,12 @@
"Basic encryption module" : "Modulo di cifratura base",
"Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
"Set your old private key password to your current log-in password:" : "Imposta la vecchia password della chiave privata sull'attuale password di accesso:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
"Old log-in password" : "Vecchia password di accesso",
"Current log-in password" : "Password di accesso attuale",
"Update Private Key Password" : "Aggiorna la password della chiave privata",
"Enable password recovery:" : "Abilita il ripristino della password:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password",
"Enabled" : "Abilitata",
- "Disabled" : "Disabilitata",
- "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 chiave di ripristino è una chiave di cifratura aggiuntiva utilizzata per cifrare i file. Consente di ripristinare i file di un utente se l'utente dimentica la propria password."
+ "Disabled" : "Disabilitata"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/ja.js b/apps/encryption/l10n/ja.js
index ba252cfd3c6..c5ab178a44c 100644
--- a/apps/encryption/l10n/ja.js
+++ b/apps/encryption/l10n/ja.js
@@ -31,15 +31,18 @@ OC.L10N.register(
"Encryption password" : "暗号化パスワード",
"The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "管理者がサーバーサイド暗号化を有効化しました。あなたのファイルはパスワードで暗号化されています<strong>%s</strong>。",
"The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "管理者がサーバーサイド暗号化を有効化しました。あなたのファイルはパスワードで暗号化されています%s。",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Webインターフェースにログインし、個人設定の「セキュリティ」セクションに移動し、「旧ログインパスワード」フィールドにこのパスワードと現在のログインパスワードを入力して、暗号化パスワードを更新してください。",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを読み取ることができません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
"Default encryption module" : "デフォルトの暗号化モジュール",
"Default encryption module for server-side encryption" : "サーバーサイド暗号化のデフォルト暗号化モジュール",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "この暗号化モジュールを使用するには、管理設定でサーバー側の暗号化を有効にする必要があります。有効にすると、このモジュールはすべてのファイルを透過的に暗号化します。暗号化はAES 256キーに基づいています。\nこのモジュールは既存のファイルには影響を与えません。サーバ側の暗号化が有効になった後、新しいファイルのみが暗号化されます。また、暗号化を再度無効にして、暗号化されていないシステムに戻すこともできません。\nサーバー側の暗号化を有効にする前に、ドキュメントを読んですべての影響を把握してください。",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
"Encrypt the home storage" : "メインストレージ暗号化",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "このオプションを有効にすると、外部ストレージ接続ストレージだけが暗号化されるのではなく、メインストレージのファイルすべてが暗号化されます。",
"Enable recovery key" : "復旧キーを有効にする",
"Disable recovery key" : "復旧キーを無効にする",
+ "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." : "復旧キーは、ファイルの暗号化に使用される追加の暗号鍵です。パスワードを忘れた場合に、アカウントからファイルを復旧するために使用されます。",
"Recovery key password" : "復旧キーのパスワード",
"Repeat recovery key password" : "復旧キーのパスワードをもう一度入力",
"Change recovery key password:" : "復旧キーのパスワードを変更:",
@@ -50,14 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "基本暗号化モジュール",
"Your private key password no longer matches your log-in password." : "もはや秘密鍵はログインパスワードと一致しません。",
"Set your old private key password to your current log-in password:" : "古い秘密鍵のパスワードを現在のログインパスワードに設定:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合は、管理者にファイルの復元を依頼することができます。",
"Old log-in password" : "古いログインパスワード",
"Current log-in password" : "現在のログインパスワード",
"Update Private Key Password" : "秘密鍵のパスワードを更新",
"Enable password recovery:" : "パスワードリカバリを有効に:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "このオプションを有効にすると、パスワードを紛失した場合も、暗号化されたファイルに再度アクセスすることができるようになります。",
"Enabled" : "有効",
- "Disabled" : "無効",
- "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." : "復旧キーは、ファイルの暗号化に使う特別な暗号化キーです。ユーザーがパスワードを忘れてしまった場合には、リカバリキーを使ってユーザーのファイルを復元することができます。"
+ "Disabled" : "無効"
},
"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/ja.json b/apps/encryption/l10n/ja.json
index 51affc83d99..9ec6e00da5a 100644
--- a/apps/encryption/l10n/ja.json
+++ b/apps/encryption/l10n/ja.json
@@ -29,15 +29,18 @@
"Encryption password" : "暗号化パスワード",
"The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "管理者がサーバーサイド暗号化を有効化しました。あなたのファイルはパスワードで暗号化されています<strong>%s</strong>。",
"The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "管理者がサーバーサイド暗号化を有効化しました。あなたのファイルはパスワードで暗号化されています%s。",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Webインターフェースにログインし、個人設定の「セキュリティ」セクションに移動し、「旧ログインパスワード」フィールドにこのパスワードと現在のログインパスワードを入力して、暗号化パスワードを更新してください。",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを読み取ることができません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
"Default encryption module" : "デフォルトの暗号化モジュール",
"Default encryption module for server-side encryption" : "サーバーサイド暗号化のデフォルト暗号化モジュール",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "この暗号化モジュールを使用するには、管理設定でサーバー側の暗号化を有効にする必要があります。有効にすると、このモジュールはすべてのファイルを透過的に暗号化します。暗号化はAES 256キーに基づいています。\nこのモジュールは既存のファイルには影響を与えません。サーバ側の暗号化が有効になった後、新しいファイルのみが暗号化されます。また、暗号化を再度無効にして、暗号化されていないシステムに戻すこともできません。\nサーバー側の暗号化を有効にする前に、ドキュメントを読んですべての影響を把握してください。",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
"Encrypt the home storage" : "メインストレージ暗号化",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "このオプションを有効にすると、外部ストレージ接続ストレージだけが暗号化されるのではなく、メインストレージのファイルすべてが暗号化されます。",
"Enable recovery key" : "復旧キーを有効にする",
"Disable recovery key" : "復旧キーを無効にする",
+ "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." : "復旧キーは、ファイルの暗号化に使用される追加の暗号鍵です。パスワードを忘れた場合に、アカウントからファイルを復旧するために使用されます。",
"Recovery key password" : "復旧キーのパスワード",
"Repeat recovery key password" : "復旧キーのパスワードをもう一度入力",
"Change recovery key password:" : "復旧キーのパスワードを変更:",
@@ -48,14 +51,13 @@
"Basic encryption module" : "基本暗号化モジュール",
"Your private key password no longer matches your log-in password." : "もはや秘密鍵はログインパスワードと一致しません。",
"Set your old private key password to your current log-in password:" : "古い秘密鍵のパスワードを現在のログインパスワードに設定:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合は、管理者にファイルの復元を依頼することができます。",
"Old log-in password" : "古いログインパスワード",
"Current log-in password" : "現在のログインパスワード",
"Update Private Key Password" : "秘密鍵のパスワードを更新",
"Enable password recovery:" : "パスワードリカバリを有効に:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "このオプションを有効にすると、パスワードを紛失した場合も、暗号化されたファイルに再度アクセスすることができるようになります。",
"Enabled" : "有効",
- "Disabled" : "無効",
- "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." : "復旧キーは、ファイルの暗号化に使う特別な暗号化キーです。ユーザーがパスワードを忘れてしまった場合には、リカバリキーを使ってユーザーのファイルを復元することができます。"
+ "Disabled" : "無効"
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/ka.js b/apps/encryption/l10n/ka.js
index 6d8e50dd450..e3d3c92883b 100644
--- a/apps/encryption/l10n/ka.js
+++ b/apps/encryption/l10n/ka.js
@@ -52,15 +52,12 @@ OC.L10N.register(
"Basic encryption module" : "Basic encryption module",
"Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
"Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
"Old log-in password" : "Old log-in password",
"Current log-in password" : "Current log-in password",
"Update Private Key Password" : "Update Private Key Password",
"Enable password recovery:" : "Enable password recovery:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss",
"Enabled" : "Enabled",
- "Disabled" : "Disabled",
- "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 log-in password\" field and your current login-password." : "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 log-in password\" field and your current login-password.",
- "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." : "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."
+ "Disabled" : "Disabled"
},
"nplurals=2; plural=(n!=1);");
diff --git a/apps/encryption/l10n/ka.json b/apps/encryption/l10n/ka.json
index 45ead78dbb1..24ce10a4037 100644
--- a/apps/encryption/l10n/ka.json
+++ b/apps/encryption/l10n/ka.json
@@ -50,15 +50,12 @@
"Basic encryption module" : "Basic encryption module",
"Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
"Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
"Old log-in password" : "Old log-in password",
"Current log-in password" : "Current log-in password",
"Update Private Key Password" : "Update Private Key Password",
"Enable password recovery:" : "Enable password recovery:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss",
"Enabled" : "Enabled",
- "Disabled" : "Disabled",
- "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 log-in password\" field and your current login-password." : "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 log-in password\" field and your current login-password.",
- "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." : "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."
+ "Disabled" : "Disabled"
},"pluralForm" :"nplurals=2; plural=(n!=1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/ka_GE.js b/apps/encryption/l10n/ka_GE.js
index 9c1238fe697..19c98a14d27 100644
--- a/apps/encryption/l10n/ka_GE.js
+++ b/apps/encryption/l10n/ka_GE.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "მარტივი შიფრაციის მოდული",
"Your private key password no longer matches your log-in password." : "თქვენი პირადი გასაღების პაროლი აღარ ემთხვევა ლოგინის პაროლს.",
"Set your old private key password to your current log-in password:" : "დააყენეთ თქვენი ძველი პირადი გასაღების პაროლი ამჟამინდელ ლოგინის პაროლზე:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "თუ არ გახსოვთ თქვენი ძველი პაროლი, შეგიძლიათ მისი აღდგენა სთხოვოთ ადმინისტრატორს.",
"Old log-in password" : "ძველი ლოგინის პაროლი",
"Current log-in password" : "ამჟამინდელი ლოგინის პაროლი",
"Update Private Key Password" : "განაახლეთ პირადი გასაღების პაროლი",
"Enable password recovery:" : "აამოქმედეთ პაროლის აღდგენა:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "ამ არჩევნის ამოქმედება, პაროლის დაკარგვის შემთხვევაში, საშუალებას მოგცემთ ახლიდან მოიპოვოთ წვდომა თქვენს დაშიფრულ ფაილებზე",
"Enabled" : "მოქმედია",
- "Disabled" : "არაა მოქმედი",
- "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." : "აღდგენის გასაღები დამატებითი შიფრაციის გასაღებია, რომელიც გამოიყენებიან ფაილების დასაშიფრად. ეს იძლევა მომხმარებლის ფაილის აღდგენის უფლებას, იმ შემთხვევაში თუ მას დაავიწყდება პაროლი."
+ "Disabled" : "არაა მოქმედი"
},
"nplurals=2; plural=(n!=1);");
diff --git a/apps/encryption/l10n/ka_GE.json b/apps/encryption/l10n/ka_GE.json
index dc540bedfc5..4cb120325ce 100644
--- a/apps/encryption/l10n/ka_GE.json
+++ b/apps/encryption/l10n/ka_GE.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "მარტივი შიფრაციის მოდული",
"Your private key password no longer matches your log-in password." : "თქვენი პირადი გასაღების პაროლი აღარ ემთხვევა ლოგინის პაროლს.",
"Set your old private key password to your current log-in password:" : "დააყენეთ თქვენი ძველი პირადი გასაღების პაროლი ამჟამინდელ ლოგინის პაროლზე:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "თუ არ გახსოვთ თქვენი ძველი პაროლი, შეგიძლიათ მისი აღდგენა სთხოვოთ ადმინისტრატორს.",
"Old log-in password" : "ძველი ლოგინის პაროლი",
"Current log-in password" : "ამჟამინდელი ლოგინის პაროლი",
"Update Private Key Password" : "განაახლეთ პირადი გასაღების პაროლი",
"Enable password recovery:" : "აამოქმედეთ პაროლის აღდგენა:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "ამ არჩევნის ამოქმედება, პაროლის დაკარგვის შემთხვევაში, საშუალებას მოგცემთ ახლიდან მოიპოვოთ წვდომა თქვენს დაშიფრულ ფაილებზე",
"Enabled" : "მოქმედია",
- "Disabled" : "არაა მოქმედი",
- "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." : "აღდგენის გასაღები დამატებითი შიფრაციის გასაღებია, რომელიც გამოიყენებიან ფაილების დასაშიფრად. ეს იძლევა მომხმარებლის ფაილის აღდგენის უფლებას, იმ შემთხვევაში თუ მას დაავიწყდება პაროლი."
+ "Disabled" : "არაა მოქმედი"
},"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/ko.js b/apps/encryption/l10n/ko.js
index d42de3dd06f..11e9d88466f 100644
--- a/apps/encryption/l10n/ko.js
+++ b/apps/encryption/l10n/ko.js
@@ -53,15 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "기본 암호화 모듈",
"Your private key password no longer matches your log-in password." : "개인 키 암호와 로그인 암호가 일치하지 않습니다.",
"Set your old private key password to your current log-in password:" : "기존 개인 키 암호를 로그인 암호와 동일하게 설정하십시오:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " 이전 암호가 기억나지 않으면 시스템 관리자에게 파일 복구를 요청하십시오.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "기존 암호가 기억나지 않는다면 관리자에게 파일을 복구하도록 요청할 수 있습니다.",
"Old log-in password" : "이전 로그인 암호",
"Current log-in password" : "현재 로그인 암호",
"Update Private Key Password" : "개인 키 암호 업데이트",
"Enable password recovery:" : "암호 복구 사용:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "이 옵션을 사용하면 암호를 잊었을 때 암호화된 파일에 다시 접근할 수 있습니다",
"Enabled" : "활성화",
- "Disabled" : "비활성화",
- "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 log-in password\" field and your current login-password." : "웹 인터페이스에 로그인하여 개인 설정의 \"보안\"으로 이동하고, \"이전 로그인 암호\" 필드에 위 암호를 입력한 후, 현재 로그인 암호를 입력하여 암호화 암호를 갱신하십시오. ",
- "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." : "복구 키는 파일을 암호화하는 추가 키입니다. 사용자가 암호를 잊었을 때 복구할 수 있도록 해 줍니다."
+ "Disabled" : "비활성화"
},
"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/ko.json b/apps/encryption/l10n/ko.json
index 1e83ee639e4..108dac6c6f6 100644
--- a/apps/encryption/l10n/ko.json
+++ b/apps/encryption/l10n/ko.json
@@ -51,15 +51,13 @@
"Basic encryption module" : "기본 암호화 모듈",
"Your private key password no longer matches your log-in password." : "개인 키 암호와 로그인 암호가 일치하지 않습니다.",
"Set your old private key password to your current log-in password:" : "기존 개인 키 암호를 로그인 암호와 동일하게 설정하십시오:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " 이전 암호가 기억나지 않으면 시스템 관리자에게 파일 복구를 요청하십시오.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "기존 암호가 기억나지 않는다면 관리자에게 파일을 복구하도록 요청할 수 있습니다.",
"Old log-in password" : "이전 로그인 암호",
"Current log-in password" : "현재 로그인 암호",
"Update Private Key Password" : "개인 키 암호 업데이트",
"Enable password recovery:" : "암호 복구 사용:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "이 옵션을 사용하면 암호를 잊었을 때 암호화된 파일에 다시 접근할 수 있습니다",
"Enabled" : "활성화",
- "Disabled" : "비활성화",
- "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 log-in password\" field and your current login-password." : "웹 인터페이스에 로그인하여 개인 설정의 \"보안\"으로 이동하고, \"이전 로그인 암호\" 필드에 위 암호를 입력한 후, 현재 로그인 암호를 입력하여 암호화 암호를 갱신하십시오. ",
- "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." : "복구 키는 파일을 암호화하는 추가 키입니다. 사용자가 암호를 잊었을 때 복구할 수 있도록 해 줍니다."
+ "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/lt_LT.js b/apps/encryption/l10n/lt_LT.js
index 04396aba692..cb32f15eb44 100644
--- a/apps/encryption/l10n/lt_LT.js
+++ b/apps/encryption/l10n/lt_LT.js
@@ -47,14 +47,12 @@ OC.L10N.register(
"Basic encryption module" : "Pagrindinis šifravimo modulis",
"Your private key password no longer matches your log-in password." : "Jūsų privačiojo rakto slaptažodis daugiau nebeatitinka jūsų prisijungimo slaptažodžio.",
"Set your old private key password to your current log-in password:" : "Nustatykite savo senąjį privačiojo rakto slaptažodį į savo dabartinį prisijungimo slaptažodį:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti sistemos administratoriaus atkurti jūsų duomenis.",
"Old log-in password" : "Senas prisijungimo slaptažodis",
"Current log-in password" : "Dabartinis prisijungimo slaptažodis",
"Update Private Key Password" : "Atnaujinti privačiojo rakto slaptažodį",
"Enable password recovery:" : "Įjungti slaptažodžio atkūrimą:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Šios parinkties įjungimas leis jums iš naujo gauti prieigą prie savo užšifruotų duomenų tuo atveju, jei prarasite slaptažodį",
"Enabled" : "Įjungta",
- "Disabled" : "Išjungta",
- "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." : "Atkūrimo raktas yra papildomas šifravimo raktas, kuris naudojamas failų šifravimui. Jis leidžia atkurti naudotojo failus tuo atveju, jei naudotojas pamirš savo slaptažodį."
+ "Disabled" : "Išjungta"
},
"nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);");
diff --git a/apps/encryption/l10n/lt_LT.json b/apps/encryption/l10n/lt_LT.json
index b4e95d2a2dc..776583e9428 100644
--- a/apps/encryption/l10n/lt_LT.json
+++ b/apps/encryption/l10n/lt_LT.json
@@ -45,14 +45,12 @@
"Basic encryption module" : "Pagrindinis šifravimo modulis",
"Your private key password no longer matches your log-in password." : "Jūsų privačiojo rakto slaptažodis daugiau nebeatitinka jūsų prisijungimo slaptažodžio.",
"Set your old private key password to your current log-in password:" : "Nustatykite savo senąjį privačiojo rakto slaptažodį į savo dabartinį prisijungimo slaptažodį:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti sistemos administratoriaus atkurti jūsų duomenis.",
"Old log-in password" : "Senas prisijungimo slaptažodis",
"Current log-in password" : "Dabartinis prisijungimo slaptažodis",
"Update Private Key Password" : "Atnaujinti privačiojo rakto slaptažodį",
"Enable password recovery:" : "Įjungti slaptažodžio atkūrimą:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Šios parinkties įjungimas leis jums iš naujo gauti prieigą prie savo užšifruotų duomenų tuo atveju, jei prarasite slaptažodį",
"Enabled" : "Įjungta",
- "Disabled" : "Išjungta",
- "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." : "Atkūrimo raktas yra papildomas šifravimo raktas, kuris naudojamas failų šifravimui. Jis leidžia atkurti naudotojo failus tuo atveju, jei naudotojas pamirš savo slaptažodį."
+ "Disabled" : "Išjungta"
},"pluralForm" :"nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/lv.js b/apps/encryption/l10n/lv.js
index fdeb035d59b..b44cc20db29 100644
--- a/apps/encryption/l10n/lv.js
+++ b/apps/encryption/l10n/lv.js
@@ -2,24 +2,24 @@ OC.L10N.register(
"encryption",
{
"Missing recovery key password" : "Pazudusi atkopšanas atslēgas parole",
- "Please repeat the recovery key password" : "Lūdzu atkārtot atgūšanas atslēgas paroli",
+ "Please repeat the recovery key password" : "Lūgums atkārtot atkopes atslēgas paroli",
"Repeated recovery key password does not match the provided recovery key password" : "Atkārtota atkopšanas atslēgas parole nesakrīt ar izsniegto atkopšanas atslēgu paroli",
"Recovery key successfully enabled" : "Atkopšanas atslēga ir veiksmīgi iespējota",
- "Could not enable recovery key. Please check your recovery key password!" : "Atkopšanas atslēgu nevarēja iespējot. Lūdzu, pārbaudiet atkopšanas atslēgas paroli!",
+ "Could not enable recovery key. Please check your recovery key password!" : "Atkopes atslēgu nevarēja iespējot. Lūgums pārbaudīt atkopes atslēgas paroli.",
"Recovery key successfully disabled" : "Atkopšanas atslēga ir veiksmīgi deaktivizēta",
- "Could not disable recovery key. Please check your recovery key password!" : "Atkopšanas atslēgu nevarēja atspējot. Lūdzu, pārbaudiet atkopšanas atslēgas paroli!",
+ "Could not disable recovery key. Please check your recovery key password!" : "Atkopes atslēgu nevarēja atspējot. Lūgums pārbaudīt atkopes atslēgas paroli.",
"Missing parameters" : "Trūkstošos parametrs",
- "Please provide the old recovery password" : "Lūdzu, norādiet iepriekšējo atkopšanas paroli",
- "Please provide a new recovery password" : "Lūdzu, ievadiet jaunu paroli",
- "Please repeat the new recovery password" : "Lūdzu, atkārtojiet jauno atkopšanas paroli",
+ "Please provide the old recovery password" : "Lūgums norādīt iepriekšējo atkopes paroli",
+ "Please provide a new recovery password" : "Lūgums norādīt jaunu atkopes paroli",
+ "Please repeat the new recovery password" : "Lūgums atkārtot jauno atkopes paroli",
"Password successfully changed." : "Parole veiksmīgi nomainīta.",
"Could not change the password. Maybe the old password was not correct." : "Nevarēja mainīt paroli. Varbūt vecā parole nav pareiza.",
"Recovery Key disabled" : "Atkopšanas atslēga deaktivizēta",
"Recovery Key enabled" : "Atkopšanas atslēga aktivizēta",
- "Could not enable the recovery key, please try again or contact your administrator" : "Nevarēja iespējot atkopšanas atslēga, lūdzu, mēģiniet vēlreiz vai sazinieties ar administratoru",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Nevarēja iespējot atkopšanas atslēgu. Lūgums mēģināt vēlreiz vai sazināties ar pārvaldītāju",
"Could not update the private key password." : "Nevarēja atjaunināt privātās atslēgas paroli.",
- "The old password was not correct, please try again." : "Vecā parole nav pareiza, lūdzu, mēģiniet vēlreiz.",
- "The current log-in password was not correct, please try again." : "Pašreizējā pieteikšanās parole nebija pareiza, lūdzu, mēģiniet vēlreiz.",
+ "The old password was not correct, please try again." : "Vecā parole nebija pareiza, lūgums mēģināt vēlreiz.",
+ "The current log-in password was not correct, please try again." : "Pašreizējā pieteikšanās parole nebija pareiza, lūgums mēģināt vēlreiz.",
"Private key password successfully updated." : "Privātās atslēgas parole ir veiksmīgi atjaunināta.",
"Encryption app is enabled and ready" : "Šifrēšanas lietotne ir iespējota un gatava",
"Bad Signature" : "Nederīgs paraksts",
diff --git a/apps/encryption/l10n/lv.json b/apps/encryption/l10n/lv.json
index fed61a0c660..42787888d86 100644
--- a/apps/encryption/l10n/lv.json
+++ b/apps/encryption/l10n/lv.json
@@ -1,23 +1,23 @@
{ "translations": {
"Missing recovery key password" : "Pazudusi atkopšanas atslēgas parole",
- "Please repeat the recovery key password" : "Lūdzu atkārtot atgūšanas atslēgas paroli",
+ "Please repeat the recovery key password" : "Lūgums atkārtot atkopes atslēgas paroli",
"Repeated recovery key password does not match the provided recovery key password" : "Atkārtota atkopšanas atslēgas parole nesakrīt ar izsniegto atkopšanas atslēgu paroli",
"Recovery key successfully enabled" : "Atkopšanas atslēga ir veiksmīgi iespējota",
- "Could not enable recovery key. Please check your recovery key password!" : "Atkopšanas atslēgu nevarēja iespējot. Lūdzu, pārbaudiet atkopšanas atslēgas paroli!",
+ "Could not enable recovery key. Please check your recovery key password!" : "Atkopes atslēgu nevarēja iespējot. Lūgums pārbaudīt atkopes atslēgas paroli.",
"Recovery key successfully disabled" : "Atkopšanas atslēga ir veiksmīgi deaktivizēta",
- "Could not disable recovery key. Please check your recovery key password!" : "Atkopšanas atslēgu nevarēja atspējot. Lūdzu, pārbaudiet atkopšanas atslēgas paroli!",
+ "Could not disable recovery key. Please check your recovery key password!" : "Atkopes atslēgu nevarēja atspējot. Lūgums pārbaudīt atkopes atslēgas paroli.",
"Missing parameters" : "Trūkstošos parametrs",
- "Please provide the old recovery password" : "Lūdzu, norādiet iepriekšējo atkopšanas paroli",
- "Please provide a new recovery password" : "Lūdzu, ievadiet jaunu paroli",
- "Please repeat the new recovery password" : "Lūdzu, atkārtojiet jauno atkopšanas paroli",
+ "Please provide the old recovery password" : "Lūgums norādīt iepriekšējo atkopes paroli",
+ "Please provide a new recovery password" : "Lūgums norādīt jaunu atkopes paroli",
+ "Please repeat the new recovery password" : "Lūgums atkārtot jauno atkopes paroli",
"Password successfully changed." : "Parole veiksmīgi nomainīta.",
"Could not change the password. Maybe the old password was not correct." : "Nevarēja mainīt paroli. Varbūt vecā parole nav pareiza.",
"Recovery Key disabled" : "Atkopšanas atslēga deaktivizēta",
"Recovery Key enabled" : "Atkopšanas atslēga aktivizēta",
- "Could not enable the recovery key, please try again or contact your administrator" : "Nevarēja iespējot atkopšanas atslēga, lūdzu, mēģiniet vēlreiz vai sazinieties ar administratoru",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Nevarēja iespējot atkopšanas atslēgu. Lūgums mēģināt vēlreiz vai sazināties ar pārvaldītāju",
"Could not update the private key password." : "Nevarēja atjaunināt privātās atslēgas paroli.",
- "The old password was not correct, please try again." : "Vecā parole nav pareiza, lūdzu, mēģiniet vēlreiz.",
- "The current log-in password was not correct, please try again." : "Pašreizējā pieteikšanās parole nebija pareiza, lūdzu, mēģiniet vēlreiz.",
+ "The old password was not correct, please try again." : "Vecā parole nebija pareiza, lūgums mēģināt vēlreiz.",
+ "The current log-in password was not correct, please try again." : "Pašreizējā pieteikšanās parole nebija pareiza, lūgums mēģināt vēlreiz.",
"Private key password successfully updated." : "Privātās atslēgas parole ir veiksmīgi atjaunināta.",
"Encryption app is enabled and ready" : "Šifrēšanas lietotne ir iespējota un gatava",
"Bad Signature" : "Nederīgs paraksts",
diff --git a/apps/encryption/l10n/mk.js b/apps/encryption/l10n/mk.js
deleted file mode 100644
index 0de345e5c1e..00000000000
--- a/apps/encryption/l10n/mk.js
+++ /dev/null
@@ -1,17 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Missing recovery key password" : "Недостасува лозинката за клучевите за обновување",
- "Password successfully changed." : "Лозинката е успешно променета.",
- "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
- "Bad Signature" : "Лош потпис",
- "Missing Signature" : "Недостасува потписот",
- "Cheers!" : "Поздрав!",
- "Change Password" : "Смени лозинка",
- "Old log-in password" : "Старата лозинка за најавување",
- "Current log-in password" : "Тековната лозинка за најавување",
- "Enable password recovery:" : "Овозможи го обновувањето на лозинката:",
- "Enabled" : "Овозможен",
- "Disabled" : "Оневозможен"
-},
-"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/apps/encryption/l10n/mk.json b/apps/encryption/l10n/mk.json
deleted file mode 100644
index 537815b7aa3..00000000000
--- a/apps/encryption/l10n/mk.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{ "translations": {
- "Missing recovery key password" : "Недостасува лозинката за клучевите за обновување",
- "Password successfully changed." : "Лозинката е успешно променета.",
- "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
- "Bad Signature" : "Лош потпис",
- "Missing Signature" : "Недостасува потписот",
- "Cheers!" : "Поздрав!",
- "Change Password" : "Смени лозинка",
- "Old log-in password" : "Старата лозинка за најавување",
- "Current log-in password" : "Тековната лозинка за најавување",
- "Enable password recovery:" : "Овозможи го обновувањето на лозинката:",
- "Enabled" : "Овозможен",
- "Disabled" : "Оневозможен"
-},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/nb.js b/apps/encryption/l10n/nb.js
index dd0cbd879eb..65206e9e3a6 100644
--- a/apps/encryption/l10n/nb.js
+++ b/apps/encryption/l10n/nb.js
@@ -53,15 +53,12 @@ OC.L10N.register(
"Basic encryption module" : "Grunnleggende krypteringsmodul",
"Your private key password no longer matches your log-in password." : "Passordet for din private nøkkel stemmer ikke lenger med påloggingspassordet ditt.",
"Set your old private key password to your current log-in password:" : "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine.",
"Old log-in password" : "Gammelt påloggingspassord",
"Current log-in password" : "Nåværende påloggingspassord",
"Update Private Key Password" : "Oppdater passord for privat nøkkel",
"Enable password recovery:" : "Aktiver gjenoppretting av passord:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt.",
"Enabled" : "Aktivert",
- "Disabled" : "Inaktiv",
- "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 log-in password\" field and your current login-password." : "Vennligst logg inn på webgrensesnittet, gå til delen \"Sikkerhet\" i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å skrive inn dette passordet i feltet \"Gammelt påloggingspassord\" og ditt nåværende påloggingspassord.",
- "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." : "Gjenopprettingsnøkkelen er en ekstra krypteringsnøkkel som brukes til å kryptere filer. Den tillater gjenoppretting av en brukers filer i tilfelle brukeren glemmer passordet sitt."
+ "Disabled" : "Inaktiv"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/nb.json b/apps/encryption/l10n/nb.json
index 69ae5008eb6..9f15088cc14 100644
--- a/apps/encryption/l10n/nb.json
+++ b/apps/encryption/l10n/nb.json
@@ -51,15 +51,12 @@
"Basic encryption module" : "Grunnleggende krypteringsmodul",
"Your private key password no longer matches your log-in password." : "Passordet for din private nøkkel stemmer ikke lenger med påloggingspassordet ditt.",
"Set your old private key password to your current log-in password:" : "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine.",
"Old log-in password" : "Gammelt påloggingspassord",
"Current log-in password" : "Nåværende påloggingspassord",
"Update Private Key Password" : "Oppdater passord for privat nøkkel",
"Enable password recovery:" : "Aktiver gjenoppretting av passord:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt.",
"Enabled" : "Aktivert",
- "Disabled" : "Inaktiv",
- "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 log-in password\" field and your current login-password." : "Vennligst logg inn på webgrensesnittet, gå til delen \"Sikkerhet\" i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å skrive inn dette passordet i feltet \"Gammelt påloggingspassord\" og ditt nåværende påloggingspassord.",
- "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." : "Gjenopprettingsnøkkelen er en ekstra krypteringsnøkkel som brukes til å kryptere filer. Den tillater gjenoppretting av en brukers filer i tilfelle brukeren glemmer passordet sitt."
+ "Disabled" : "Inaktiv"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/nl.js b/apps/encryption/l10n/nl.js
index e52e1e1265d..967ff31dc12 100644
--- a/apps/encryption/l10n/nl.js
+++ b/apps/encryption/l10n/nl.js
@@ -21,22 +21,28 @@ OC.L10N.register(
"The old password was not correct, please try again." : "Het oude wachtwoord was onjuist, probeer het opnieuw.",
"The current log-in password was not correct, please try again." : "Het huidige inlogwachtwoord was niet juist, probeer het opnieuw.",
"Private key password successfully updated." : "Privésleutel succesvol bijgewerkt.",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige privésleutel voor de crypto app. Werk het privésleutel wachtwoord bij in je persoonlijke instellingen om opnieuw toegang te krijgen tot je versleutelde bestanden.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Crypto app is ingeschakeld, maar je sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Activeer de server-encryptie in de beheerdersinstellingen om de encryptiemodule te kunnen gebruiken.",
- "Encryption app is enabled and ready" : "Encryptie app is ingeschakeld en gereed",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige persoonlijke sleutel voor de versleutelingsapp. Werk de persoonlijke wachtwoordsleutel bij in je persoonlijke instellingen om opnieuw toegang te krijgen tot je versleutelde bestanden.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Versleutelingsapp is ingeschakeld, maar je sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Schakel versleuteling aan de serverzijde in de beheerdersinstellingen in om de versleutelingsmodule te gebruiken.",
+ "Encryption app is enabled and ready" : "Versleutelingsapp is ingeschakeld en gereed",
"Bad Signature" : "Verkeerde handtekening",
"Missing Signature" : "Missende ondertekening",
- "one-time password for server-side-encryption" : "eenmalig wachtwoord voor server-side versleuteling",
+ "one-time password for server-side-encryption" : "eenmalig wachtwoord voor versleuteling aan de serverzijde",
+ "Encryption password" : "Versleutelingswachtwoord",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "De beheerder heeft versleuteling aan de serverzijde mogelijk gemaakt. Je bestanden zijn gecodeerd met behulp van het wachtwoord <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "De beheerder heeft versleuteling aan de serverzijde mogelijk gemaakt. Je bestanden zijn gecodeerd met behulp van het wachtwoord \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Log in op de webinterface, ga naar het gedeelte 'Beveiliging' van je persoonlijke instellingen en update je coderingswachtwoord door dit wachtwoord in te voeren in het veld 'Oud inlogwachtwoord' en je huidige inlogwachtwoord.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met je te delen.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet lezen, waarschijnlijk is het een gedeeld bestand. Vraag de eigenaar om het bestand opnieuw met je te delen.",
- "Default encryption module" : "Standaard cryptomodule",
- "Default encryption module for server-side encryption" : "Standaard cryptomodule voor server-side versleuteling",
+ "Default encryption module" : "Standaard versleutelingsmodule",
+ "Default encryption module for server-side encryption" : "Standaard module voor versleuteling aan de serverzijde",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Om deze versleutelingsmodule te kunnen gebruiken, moet je versleuteling aan de serverzijde inschakelen in de beheerdersinstellingen. Eenmaal ingeschakeld zal deze module al je bestanden transparant versleutelen. De versleuteling is gebaseerd op AES 256-sleutels.\nDe module doet niets met bestaande bestanden, alleen nieuwe bestanden worden gecodeerd nadat versleuteling aan de serverzijde is ingeschakeld. Het is ook niet mogelijk om de codering weer uit te schakelen en terug te schakelen naar een niet-gecodeerd systeem.\nLees de documentatie om alle implicaties te kennen voordat je besluit versleuteling aan de serverzijde in te schakelen.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is ingeschakeld, maar je sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
"Encrypt the home storage" : "Versleutel de eigen serveropslag",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Het inschakelen van deze optie zorgt voor versleutelen van alle bestanden op de hoofdopslag, anders worden alleen bestanden op externe opslag versleuteld",
"Enable recovery key" : "Activeer herstelsleutel",
"Disable recovery key" : "Deactiveer herstelsleutel",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "De herstelsleutel is een extra coderingssleutel die wordt gebruikt om bestanden te versleutelen. Het wordt gebruikt om bestanden van een account te herstellen als het wachtwoord wordt vergeten.",
"Recovery key password" : "Wachtwoord herstelsleulel",
"Repeat recovery key password" : "Herhaal wachtwoord herstelsleutel",
"Change recovery key password:" : "Wijzig wachtwoord herstelsleutel:",
@@ -44,17 +50,16 @@ OC.L10N.register(
"New recovery key password" : "Nieuwe wachtwoord herstelsleutel",
"Repeat new recovery key password" : "Herhaal nieuwe wachtwoord herstelsleutel",
"Change Password" : "Wijzigen wachtwoord",
- "Basic encryption module" : "Basis versleutelingsmodule",
+ "Basic encryption module" : "Basis-versleutelingsmodule",
"Your private key password no longer matches your log-in password." : "Het wachtwoord van je privésleutel komt niet meer overeen met je inlogwachtwoord.",
"Set your old private key password to your current log-in password:" : "Stel het wachtwoord van je oude privésleutel in op je huidige inlogwachtwoord.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Als je je oude wachtwoord niet meer weet, kun je de beheerder vragen je bestanden terug te halen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Als je je oude wachtwoord niet meer weet, kun je de beheerder vragen je bestanden te herstellen.",
"Old log-in password" : "Oude wachtwoord",
"Current log-in password" : "Huidige wachtwoord",
"Update Private Key Password" : "Bijwerken wachtwoord Privésleutel",
"Enable password recovery:" : "Activeren wachtwoord herstel:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Het activeren van deze optie maakt het mogelijk om je versleutelde bestanden te benaderen als je wachtwoord kwijt is",
"Enabled" : "Ingeschakeld",
- "Disabled" : "Uitgeschakeld",
- "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." : "De herstelsleutel is een extra cryptografische sleutel die wordt gebruikt om bestanden te versleutelen. Die maakt het mogelijk bestanden te herstellen als de gebruiker zijn of haar wachtwoord vergeet."
+ "Disabled" : "Uitgeschakeld"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/nl.json b/apps/encryption/l10n/nl.json
index 5f7a3ae0392..b1b5e0f9d31 100644
--- a/apps/encryption/l10n/nl.json
+++ b/apps/encryption/l10n/nl.json
@@ -19,22 +19,28 @@
"The old password was not correct, please try again." : "Het oude wachtwoord was onjuist, probeer het opnieuw.",
"The current log-in password was not correct, please try again." : "Het huidige inlogwachtwoord was niet juist, probeer het opnieuw.",
"Private key password successfully updated." : "Privésleutel succesvol bijgewerkt.",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige privésleutel voor de crypto app. Werk het privésleutel wachtwoord bij in je persoonlijke instellingen om opnieuw toegang te krijgen tot je versleutelde bestanden.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Crypto app is ingeschakeld, maar je sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Activeer de server-encryptie in de beheerdersinstellingen om de encryptiemodule te kunnen gebruiken.",
- "Encryption app is enabled and ready" : "Encryptie app is ingeschakeld en gereed",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige persoonlijke sleutel voor de versleutelingsapp. Werk de persoonlijke wachtwoordsleutel bij in je persoonlijke instellingen om opnieuw toegang te krijgen tot je versleutelde bestanden.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Versleutelingsapp is ingeschakeld, maar je sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Schakel versleuteling aan de serverzijde in de beheerdersinstellingen in om de versleutelingsmodule te gebruiken.",
+ "Encryption app is enabled and ready" : "Versleutelingsapp is ingeschakeld en gereed",
"Bad Signature" : "Verkeerde handtekening",
"Missing Signature" : "Missende ondertekening",
- "one-time password for server-side-encryption" : "eenmalig wachtwoord voor server-side versleuteling",
+ "one-time password for server-side-encryption" : "eenmalig wachtwoord voor versleuteling aan de serverzijde",
+ "Encryption password" : "Versleutelingswachtwoord",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "De beheerder heeft versleuteling aan de serverzijde mogelijk gemaakt. Je bestanden zijn gecodeerd met behulp van het wachtwoord <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "De beheerder heeft versleuteling aan de serverzijde mogelijk gemaakt. Je bestanden zijn gecodeerd met behulp van het wachtwoord \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Log in op de webinterface, ga naar het gedeelte 'Beveiliging' van je persoonlijke instellingen en update je coderingswachtwoord door dit wachtwoord in te voeren in het veld 'Oud inlogwachtwoord' en je huidige inlogwachtwoord.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met je te delen.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet lezen, waarschijnlijk is het een gedeeld bestand. Vraag de eigenaar om het bestand opnieuw met je te delen.",
- "Default encryption module" : "Standaard cryptomodule",
- "Default encryption module for server-side encryption" : "Standaard cryptomodule voor server-side versleuteling",
+ "Default encryption module" : "Standaard versleutelingsmodule",
+ "Default encryption module for server-side encryption" : "Standaard module voor versleuteling aan de serverzijde",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Om deze versleutelingsmodule te kunnen gebruiken, moet je versleuteling aan de serverzijde inschakelen in de beheerdersinstellingen. Eenmaal ingeschakeld zal deze module al je bestanden transparant versleutelen. De versleuteling is gebaseerd op AES 256-sleutels.\nDe module doet niets met bestaande bestanden, alleen nieuwe bestanden worden gecodeerd nadat versleuteling aan de serverzijde is ingeschakeld. Het is ook niet mogelijk om de codering weer uit te schakelen en terug te schakelen naar een niet-gecodeerd systeem.\nLees de documentatie om alle implicaties te kennen voordat je besluit versleuteling aan de serverzijde in te schakelen.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is ingeschakeld, maar je sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
"Encrypt the home storage" : "Versleutel de eigen serveropslag",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Het inschakelen van deze optie zorgt voor versleutelen van alle bestanden op de hoofdopslag, anders worden alleen bestanden op externe opslag versleuteld",
"Enable recovery key" : "Activeer herstelsleutel",
"Disable recovery key" : "Deactiveer herstelsleutel",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "De herstelsleutel is een extra coderingssleutel die wordt gebruikt om bestanden te versleutelen. Het wordt gebruikt om bestanden van een account te herstellen als het wachtwoord wordt vergeten.",
"Recovery key password" : "Wachtwoord herstelsleulel",
"Repeat recovery key password" : "Herhaal wachtwoord herstelsleutel",
"Change recovery key password:" : "Wijzig wachtwoord herstelsleutel:",
@@ -42,17 +48,16 @@
"New recovery key password" : "Nieuwe wachtwoord herstelsleutel",
"Repeat new recovery key password" : "Herhaal nieuwe wachtwoord herstelsleutel",
"Change Password" : "Wijzigen wachtwoord",
- "Basic encryption module" : "Basis versleutelingsmodule",
+ "Basic encryption module" : "Basis-versleutelingsmodule",
"Your private key password no longer matches your log-in password." : "Het wachtwoord van je privésleutel komt niet meer overeen met je inlogwachtwoord.",
"Set your old private key password to your current log-in password:" : "Stel het wachtwoord van je oude privésleutel in op je huidige inlogwachtwoord.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Als je je oude wachtwoord niet meer weet, kun je de beheerder vragen je bestanden terug te halen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Als je je oude wachtwoord niet meer weet, kun je de beheerder vragen je bestanden te herstellen.",
"Old log-in password" : "Oude wachtwoord",
"Current log-in password" : "Huidige wachtwoord",
"Update Private Key Password" : "Bijwerken wachtwoord Privésleutel",
"Enable password recovery:" : "Activeren wachtwoord herstel:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Het activeren van deze optie maakt het mogelijk om je versleutelde bestanden te benaderen als je wachtwoord kwijt is",
"Enabled" : "Ingeschakeld",
- "Disabled" : "Uitgeschakeld",
- "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." : "De herstelsleutel is een extra cryptografische sleutel die wordt gebruikt om bestanden te versleutelen. Die maakt het mogelijk bestanden te herstellen als de gebruiker zijn of haar wachtwoord vergeet."
+ "Disabled" : "Uitgeschakeld"
},"pluralForm" :"nplurals=2; plural=(n != 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/pl.js b/apps/encryption/l10n/pl.js
index b029074aa05..67e73e93630 100644
--- a/apps/encryption/l10n/pl.js
+++ b/apps/encryption/l10n/pl.js
@@ -53,15 +53,12 @@ OC.L10N.register(
"Basic encryption module" : "Podstawowy moduł szyfrowania",
"Your private key password no longer matches your log-in password." : "Hasło Twojego klucza prywatnego nie pasuje już do Twojego hasła logowania.",
"Set your old private key password to your current log-in password:" : "Ustaw stare hasło klucza prywatnego na aktualne hasło logowania:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki.",
"Old log-in password" : "Stare hasło logowania",
"Current log-in password" : "Bieżące hasło logowania",
"Update Private Key Password" : "Aktualizacja hasła klucza prywatnego",
"Enable password recovery:" : "Włącz hasło odzyskiwania:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła",
"Enabled" : "Włączone",
- "Disabled" : "Wyłączone",
- "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 log-in password\" field and your current login-password." : "Zaloguj się poprzez interfejs WEB, przejdź do zakładki \"ochrona\" w Twoich ustawieniach oraz zaktualizuj Twoje hasło szyfrowania wpisując je w pole \"stare hasło logowania\" i Twoje aktualne hasło do logowania.",
- "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." : "Kluczem do odzyskiwania jest dodatkowy klucz szyfrujący, który służy do szyfrowania plików. Umożliwia on odzyskanie plików użytkownika, jeśli użytkownik zapomni swoje hasło."
+ "Disabled" : "Wyłączone"
},
"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);");
diff --git a/apps/encryption/l10n/pl.json b/apps/encryption/l10n/pl.json
index 80f2dbec149..07ade8d5052 100644
--- a/apps/encryption/l10n/pl.json
+++ b/apps/encryption/l10n/pl.json
@@ -51,15 +51,12 @@
"Basic encryption module" : "Podstawowy moduł szyfrowania",
"Your private key password no longer matches your log-in password." : "Hasło Twojego klucza prywatnego nie pasuje już do Twojego hasła logowania.",
"Set your old private key password to your current log-in password:" : "Ustaw stare hasło klucza prywatnego na aktualne hasło logowania:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki.",
"Old log-in password" : "Stare hasło logowania",
"Current log-in password" : "Bieżące hasło logowania",
"Update Private Key Password" : "Aktualizacja hasła klucza prywatnego",
"Enable password recovery:" : "Włącz hasło odzyskiwania:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła",
"Enabled" : "Włączone",
- "Disabled" : "Wyłączone",
- "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 log-in password\" field and your current login-password." : "Zaloguj się poprzez interfejs WEB, przejdź do zakładki \"ochrona\" w Twoich ustawieniach oraz zaktualizuj Twoje hasło szyfrowania wpisując je w pole \"stare hasło logowania\" i Twoje aktualne hasło do logowania.",
- "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." : "Kluczem do odzyskiwania jest dodatkowy klucz szyfrujący, który służy do szyfrowania plików. Umożliwia on odzyskanie plików użytkownika, jeśli użytkownik zapomni swoje hasło."
+ "Disabled" : "Wyłączone"
},"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/pt_BR.js b/apps/encryption/l10n/pt_BR.js
index 0cc51937a0a..889683d62a3 100644
--- a/apps/encryption/l10n/pt_BR.js
+++ b/apps/encryption/l10n/pt_BR.js
@@ -29,20 +29,20 @@ OC.L10N.register(
"Missing Signature" : "Assinatura faltante",
"one-time password for server-side-encryption" : "senha de uso único para criptografia do lado do servidor",
"Encryption password" : "Senha de criptografia",
- "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "A administração habilitou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha <strong>%s</strong>.",
- "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "A administração habilitou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha \"%s\".",
- "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Faça login na interface da web, vá para a seção \"Segurança\" de suas configurações pessoais e atualize sua senha de criptografia inserindo esta senha no campo \"Senha de login antiga\" e sua senha de login atual.",
- "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível descriptografar este arquivo, provavelmente é um arquivo compartilhado. Por favor solicite ao dono do arquivo para recompartilhá-lo com você.",
- "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível ler este arquivo pois provavelmente é um arquivo compartilhado. Por favor, peça ao dono do arquivo para recompartilhá-lo com você.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "A administração ativou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "A administração ativou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Por favor, faça login na interface web, vá para a seção \"Segurança\" de suas configurações pessoais e atualize sua senha de criptografia inserindo esta senha no campo \"Senha de login antiga\" e sua senha de login atual.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível descriptografar este arquivo, provavelmente é um arquivo compartilhado. Por favor, solicite ao proprietário do arquivo para recompartilhá-lo com você.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível ler este arquivo, provavelmente é um arquivo compartilhado. Por favor, solicite ao proprietário do arquivo para recompartilhá-lo com você.",
"Default encryption module" : "Módulo de criptografia padrão",
"Default encryption module for server-side encryption" : "Módulo de criptografia padrão para criptografia do lado do servidor",
- "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Para usar este módulo de criptografia, você precisa habilitar a criptografia do lado do servidor nas configurações de administração. Uma vez ativado, este módulo criptografará todos os seus arquivos de forma transparente. A criptografia é baseada em chaves AES 256.\nO módulo não tocará nos arquivos existentes, apenas novos arquivos serão criptografados após a criptografia do lado do servidor ser habilitada. Também não é possível desabilitar a criptografia novamente e voltar para um sistema não criptografado.\nLeia a documentação para saber todas as implicações antes de decidir habilitar a criptografia do lado do servidor.",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Para usar este módulo de criptografia, você precisa ativar a criptografia do lado do servidor nas configurações de administração. Quando ativado, este módulo criptografará todos os seus arquivos de forma transparente. A criptografia é baseada em chaves AES 256.\nO módulo não tocará nos arquivos existentes, apenas novos arquivos serão criptografados após a criptografia do lado do servidor for ativada. Também não é possível desabilitar a criptografia novamente e voltar para um sistema não criptografado.\nLeia a documentação para conhecer todas as implicações antes de decidir ativar a criptografia do lado do servidor.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "O aplicativo de criptografia está habilitado, mas suas chaves não foram inicializadas. Por favor, saia e entre novamente.",
"Encrypt the home storage" : "Criptografar a pasta de armazenamento home",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ativar essa opção irá criptografar todos os arquivos do armazenamento principal, caso contrário, apenas arquivos no armazenamento externo serão criptografados",
"Enable recovery key" : "Ativar chave de recuperação",
"Disable recovery key" : "Dasabilitar chave de recuperação",
- "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "A chave de recuperação é uma chave de criptografia adicional usada para criptografar arquivos. É usado para recuperar arquivos de uma conta caso a senha seja esquecida.",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "A chave de recuperação é uma chave de criptografia adicional usada para criptografar arquivos. É usado para recuperar arquivos de uma conta se a senha for esquecida.",
"Recovery key password" : "Senha da chave de recuperação",
"Repeat recovery key password" : "Repita a senha da chave de recuperação",
"Change recovery key password:" : "Mudar a senha da chave de recuperação:",
@@ -53,15 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de criptografia básico",
"Your private key password no longer matches your log-in password." : "A sua senha de chave privada não corresponde a sua senha de login.",
"Set your old private key password to your current log-in password:" : "Defina a sua senha antiga da chave privada para sua senha de login atual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se você não se lembra de sua senha antiga você pode pedir ao administrador que recupere seus arquivos.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Se não se lembrar da senha antiga, peça ao administrador para recuperar seus arquivos.",
"Old log-in password" : "Senha antiga de login",
"Current log-in password" : "Senha atual de login",
"Update Private Key Password" : "Atualizar senha da chave privada",
"Enable password recovery:" : "Ativar recuperação de senha:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ativar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos criptografados em caso de perda de senha",
"Enabled" : "Habilitado",
- "Disabled" : "Desabilitado",
- "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 log-in 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.",
- "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." : "A chave de recuperação é uma chave de criptografia extra que é utilizada para criptografar arquivos. Ela permite a recuperação de arquivos se um usuário esquecer sua senha."
+ "Disabled" : "Desabilitado"
},
"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/pt_BR.json b/apps/encryption/l10n/pt_BR.json
index 3d1dc416d6f..202915f2284 100644
--- a/apps/encryption/l10n/pt_BR.json
+++ b/apps/encryption/l10n/pt_BR.json
@@ -27,20 +27,20 @@
"Missing Signature" : "Assinatura faltante",
"one-time password for server-side-encryption" : "senha de uso único para criptografia do lado do servidor",
"Encryption password" : "Senha de criptografia",
- "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "A administração habilitou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha <strong>%s</strong>.",
- "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "A administração habilitou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha \"%s\".",
- "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Faça login na interface da web, vá para a seção \"Segurança\" de suas configurações pessoais e atualize sua senha de criptografia inserindo esta senha no campo \"Senha de login antiga\" e sua senha de login atual.",
- "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível descriptografar este arquivo, provavelmente é um arquivo compartilhado. Por favor solicite ao dono do arquivo para recompartilhá-lo com você.",
- "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível ler este arquivo pois provavelmente é um arquivo compartilhado. Por favor, peça ao dono do arquivo para recompartilhá-lo com você.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "A administração ativou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "A administração ativou a criptografia do lado do servidor. Seus arquivos foram criptografados usando a senha \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Por favor, faça login na interface web, vá para a seção \"Segurança\" de suas configurações pessoais e atualize sua senha de criptografia inserindo esta senha no campo \"Senha de login antiga\" e sua senha de login atual.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível descriptografar este arquivo, provavelmente é um arquivo compartilhado. Por favor, solicite ao proprietário do arquivo para recompartilhá-lo com você.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não foi possível ler este arquivo, provavelmente é um arquivo compartilhado. Por favor, solicite ao proprietário do arquivo para recompartilhá-lo com você.",
"Default encryption module" : "Módulo de criptografia padrão",
"Default encryption module for server-side encryption" : "Módulo de criptografia padrão para criptografia do lado do servidor",
- "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Para usar este módulo de criptografia, você precisa habilitar a criptografia do lado do servidor nas configurações de administração. Uma vez ativado, este módulo criptografará todos os seus arquivos de forma transparente. A criptografia é baseada em chaves AES 256.\nO módulo não tocará nos arquivos existentes, apenas novos arquivos serão criptografados após a criptografia do lado do servidor ser habilitada. Também não é possível desabilitar a criptografia novamente e voltar para um sistema não criptografado.\nLeia a documentação para saber todas as implicações antes de decidir habilitar a criptografia do lado do servidor.",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Para usar este módulo de criptografia, você precisa ativar a criptografia do lado do servidor nas configurações de administração. Quando ativado, este módulo criptografará todos os seus arquivos de forma transparente. A criptografia é baseada em chaves AES 256.\nO módulo não tocará nos arquivos existentes, apenas novos arquivos serão criptografados após a criptografia do lado do servidor for ativada. Também não é possível desabilitar a criptografia novamente e voltar para um sistema não criptografado.\nLeia a documentação para conhecer todas as implicações antes de decidir ativar a criptografia do lado do servidor.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "O aplicativo de criptografia está habilitado, mas suas chaves não foram inicializadas. Por favor, saia e entre novamente.",
"Encrypt the home storage" : "Criptografar a pasta de armazenamento home",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ativar essa opção irá criptografar todos os arquivos do armazenamento principal, caso contrário, apenas arquivos no armazenamento externo serão criptografados",
"Enable recovery key" : "Ativar chave de recuperação",
"Disable recovery key" : "Dasabilitar chave de recuperação",
- "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "A chave de recuperação é uma chave de criptografia adicional usada para criptografar arquivos. É usado para recuperar arquivos de uma conta caso a senha seja esquecida.",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "A chave de recuperação é uma chave de criptografia adicional usada para criptografar arquivos. É usado para recuperar arquivos de uma conta se a senha for esquecida.",
"Recovery key password" : "Senha da chave de recuperação",
"Repeat recovery key password" : "Repita a senha da chave de recuperação",
"Change recovery key password:" : "Mudar a senha da chave de recuperação:",
@@ -51,15 +51,13 @@
"Basic encryption module" : "Módulo de criptografia básico",
"Your private key password no longer matches your log-in password." : "A sua senha de chave privada não corresponde a sua senha de login.",
"Set your old private key password to your current log-in password:" : "Defina a sua senha antiga da chave privada para sua senha de login atual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se você não se lembra de sua senha antiga você pode pedir ao administrador que recupere seus arquivos.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Se não se lembrar da senha antiga, peça ao administrador para recuperar seus arquivos.",
"Old log-in password" : "Senha antiga de login",
"Current log-in password" : "Senha atual de login",
"Update Private Key Password" : "Atualizar senha da chave privada",
"Enable password recovery:" : "Ativar recuperação de senha:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ativar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos criptografados em caso de perda de senha",
"Enabled" : "Habilitado",
- "Disabled" : "Desabilitado",
- "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 log-in 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.",
- "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." : "A chave de recuperação é uma chave de criptografia extra que é utilizada para criptografar arquivos. Ela permite a recuperação de arquivos se um usuário esquecer sua senha."
+ "Disabled" : "Desabilitado"
},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/pt_PT.js b/apps/encryption/l10n/pt_PT.js
index d905ef7df3e..0e5e9c6811a 100644
--- a/apps/encryption/l10n/pt_PT.js
+++ b/apps/encryption/l10n/pt_PT.js
@@ -21,16 +21,16 @@ OC.L10N.register(
"The old password was not correct, please try again." : "A palavra-passe antiga não estava correta, por favor, tente de novo.",
"The current log-in password was not correct, please try again." : "A palavra-passe de iniciar a sessão atual não estava correta, por favor, tente de novo.",
"Private key password successfully updated." : "A palavra-passe da chave privada foi atualizada com sucesso. ",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida para a aplicação de cifra. Por favor actualize a sua chave privada nas definições pessoais para recuperar acesso aos seus ficheiros cifrados.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Aplicação de cifra está activa, mas as suas chaves não estão inicializaras. Por favor, faça logout e autentique-se novamente.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Por favor active cifragem no servidor nas definições de administrador para usar o módulo de cifra.",
- "Encryption app is enabled and ready" : "Aplicação de cifra activa e pronta a usar",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida para a aplicação de cifra. Por favor atualize a sua chave privada nas definições pessoais para recuperar acesso aos seus ficheiros cifrados.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "A aplicação de encriptação está ativada, mas as suas chaves não foram inicializadas. Termine a sessão e inicie sessão novamente.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Para poder utilizar o módulo de encriptação, ative a encriptação do lado do servidor nas definições de administração.",
+ "Encryption app is enabled and ready" : "A aplicação de encriptação está ativada e pronta",
"Bad Signature" : "Má Assinatura",
"Missing Signature" : "Assinatura em Falta",
"one-time password for server-side-encryption" : "palavra-passe de utilização única para a encriptação do lado do servidor",
"Default encryption module" : "Módulo de cifra padrão",
"Default encryption module for server-side encryption" : "Módulo de encriptação predefinido para encriptação do lado do servidor",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicação de cifra está activa, mas as suas chaves não estão inicializaras. Por favor, faça logout e autentique-se novamente.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicação de encriptação está ativada mas as suas chaves não foram inicializadas, termine a sessão e inicie sessão novamente",
"Encrypt the home storage" : "Encriptar o armazenamento do início",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ativando esta opção todos os ficheiros armazenados no armazenamento principal serão encriptados, senão serão encriptados todos os ficheiros no armazenamento externo",
"Enable recovery key" : "Ativar a chave de recuperação",
@@ -45,14 +45,12 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de cifra básica",
"Your private key password no longer matches your log-in password." : "A palavra-passe da sua chave privada já não coincide com a palavra-passe da sua sessão.",
"Set your old private key password to your current log-in password:" : "Defina a sua palavra-passe antiga da chave privada para a sua palavra-passe atual da sessão:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se não se lembra da palavra-passe antiga pode pedir ao seu administrador para recuperar os seus ficheiros. ",
"Old log-in password" : "Palavra-passe antiga da sessão",
"Current log-in password" : "Palavra-passe atual da sessão",
"Update Private Key Password" : "Atualizar Palavra-passe da Chave Privada ",
"Enable password recovery:" : "Ativar a recuperação da palavra-passe:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ao ativar esta opção, irá fazer com que volte a obter o acesso aos seus ficheiros encriptados, se perder a palavra-passe",
"Enabled" : "Ativada",
- "Disabled" : "Desativada",
- "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." : "A chave de recuperação é uma chave de encriptação extra que é utilizada para encriptar os ficheiros. Esta permite a recuperação dos ficheiros do utilizador se este esquecer a sua senha."
+ "Disabled" : "Desativada"
},
"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/encryption/l10n/pt_PT.json b/apps/encryption/l10n/pt_PT.json
index 523f9812af2..fac953c91b1 100644
--- a/apps/encryption/l10n/pt_PT.json
+++ b/apps/encryption/l10n/pt_PT.json
@@ -19,16 +19,16 @@
"The old password was not correct, please try again." : "A palavra-passe antiga não estava correta, por favor, tente de novo.",
"The current log-in password was not correct, please try again." : "A palavra-passe de iniciar a sessão atual não estava correta, por favor, tente de novo.",
"Private key password successfully updated." : "A palavra-passe da chave privada foi atualizada com sucesso. ",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida para a aplicação de cifra. Por favor actualize a sua chave privada nas definições pessoais para recuperar acesso aos seus ficheiros cifrados.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Aplicação de cifra está activa, mas as suas chaves não estão inicializaras. Por favor, faça logout e autentique-se novamente.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Por favor active cifragem no servidor nas definições de administrador para usar o módulo de cifra.",
- "Encryption app is enabled and ready" : "Aplicação de cifra activa e pronta a usar",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida para a aplicação de cifra. Por favor atualize a sua chave privada nas definições pessoais para recuperar acesso aos seus ficheiros cifrados.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "A aplicação de encriptação está ativada, mas as suas chaves não foram inicializadas. Termine a sessão e inicie sessão novamente.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Para poder utilizar o módulo de encriptação, ative a encriptação do lado do servidor nas definições de administração.",
+ "Encryption app is enabled and ready" : "A aplicação de encriptação está ativada e pronta",
"Bad Signature" : "Má Assinatura",
"Missing Signature" : "Assinatura em Falta",
"one-time password for server-side-encryption" : "palavra-passe de utilização única para a encriptação do lado do servidor",
"Default encryption module" : "Módulo de cifra padrão",
"Default encryption module for server-side encryption" : "Módulo de encriptação predefinido para encriptação do lado do servidor",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicação de cifra está activa, mas as suas chaves não estão inicializaras. Por favor, faça logout e autentique-se novamente.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicação de encriptação está ativada mas as suas chaves não foram inicializadas, termine a sessão e inicie sessão novamente",
"Encrypt the home storage" : "Encriptar o armazenamento do início",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ativando esta opção todos os ficheiros armazenados no armazenamento principal serão encriptados, senão serão encriptados todos os ficheiros no armazenamento externo",
"Enable recovery key" : "Ativar a chave de recuperação",
@@ -43,14 +43,12 @@
"Basic encryption module" : "Módulo de cifra básica",
"Your private key password no longer matches your log-in password." : "A palavra-passe da sua chave privada já não coincide com a palavra-passe da sua sessão.",
"Set your old private key password to your current log-in password:" : "Defina a sua palavra-passe antiga da chave privada para a sua palavra-passe atual da sessão:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se não se lembra da palavra-passe antiga pode pedir ao seu administrador para recuperar os seus ficheiros. ",
"Old log-in password" : "Palavra-passe antiga da sessão",
"Current log-in password" : "Palavra-passe atual da sessão",
"Update Private Key Password" : "Atualizar Palavra-passe da Chave Privada ",
"Enable password recovery:" : "Ativar a recuperação da palavra-passe:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ao ativar esta opção, irá fazer com que volte a obter o acesso aos seus ficheiros encriptados, se perder a palavra-passe",
"Enabled" : "Ativada",
- "Disabled" : "Desativada",
- "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." : "A chave de recuperação é uma chave de encriptação extra que é utilizada para encriptar os ficheiros. Esta permite a recuperação dos ficheiros do utilizador se este esquecer a sua senha."
+ "Disabled" : "Desativada"
},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/ru.js b/apps/encryption/l10n/ru.js
index da229bd362c..0dfc75febf7 100644
--- a/apps/encryption/l10n/ru.js
+++ b/apps/encryption/l10n/ru.js
@@ -42,6 +42,7 @@ OC.L10N.register(
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "При включении данного параметра будут зашифрованы все файлы, хранящиеся в основном хранилище. В противном случае шифруются только файлы на внешних хранилищах.",
"Enable recovery key" : "Включить ключ восстановления",
"Disable recovery key" : "Отключить ключ восстановления",
+ "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." : "Ключ восстановления - это дополнительный ключ шифрования, используемый для шифрования файлов. Он используется для восстановления файлов из учетной записи, если пароль забыт.",
"Recovery key password" : "Пароль ключа восстановления",
"Repeat recovery key password" : "Повторите пароль ключа восстановления",
"Change recovery key password:" : "Смена пароля ключа восстановления:",
@@ -52,15 +53,12 @@ OC.L10N.register(
"Basic encryption module" : "Базовый модуль шифрования",
"Your private key password no longer matches your log-in password." : "Пароль закрытого ключа больше не соответствует паролю вашей учетной записи.",
"Set your old private key password to your current log-in password:" : "Замените старый пароль закрытого ключа на текущий пароль учётной записи.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы",
"Old log-in password" : "Старый пароль учётной записи",
"Current log-in password" : "Текущий пароль учётной записи",
"Update Private Key Password" : "Обновить пароль закрытого ключа",
"Enable password recovery:" : "Включить восстановление пароля:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля",
"Enabled" : "Включено",
- "Disabled" : "Отключено",
- "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 log-in password\" field and your current login-password." : "Пожалуйста, войдите в веб-интерфейс, перейдите в раздел \"Безопасность\" ваших личных настроек и обновите свой пароль шифрования, введя этот пароль в поле \"Старый пароль для входа\" и ваш текущий логин/пароль.",
- "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." : "Ключ восстановления - это дополнительный ключ, который используется для шифрования файлов. Он позволяет восстановить пользовательские файлы в случае утери пароля."
+ "Disabled" : "Отключено"
},
"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/apps/encryption/l10n/ru.json b/apps/encryption/l10n/ru.json
index b6df79a8c73..8fd6a52d1b6 100644
--- a/apps/encryption/l10n/ru.json
+++ b/apps/encryption/l10n/ru.json
@@ -40,6 +40,7 @@
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "При включении данного параметра будут зашифрованы все файлы, хранящиеся в основном хранилище. В противном случае шифруются только файлы на внешних хранилищах.",
"Enable recovery key" : "Включить ключ восстановления",
"Disable recovery key" : "Отключить ключ восстановления",
+ "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." : "Ключ восстановления - это дополнительный ключ шифрования, используемый для шифрования файлов. Он используется для восстановления файлов из учетной записи, если пароль забыт.",
"Recovery key password" : "Пароль ключа восстановления",
"Repeat recovery key password" : "Повторите пароль ключа восстановления",
"Change recovery key password:" : "Смена пароля ключа восстановления:",
@@ -50,15 +51,12 @@
"Basic encryption module" : "Базовый модуль шифрования",
"Your private key password no longer matches your log-in password." : "Пароль закрытого ключа больше не соответствует паролю вашей учетной записи.",
"Set your old private key password to your current log-in password:" : "Замените старый пароль закрытого ключа на текущий пароль учётной записи.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы",
"Old log-in password" : "Старый пароль учётной записи",
"Current log-in password" : "Текущий пароль учётной записи",
"Update Private Key Password" : "Обновить пароль закрытого ключа",
"Enable password recovery:" : "Включить восстановление пароля:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля",
"Enabled" : "Включено",
- "Disabled" : "Отключено",
- "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 log-in password\" field and your current login-password." : "Пожалуйста, войдите в веб-интерфейс, перейдите в раздел \"Безопасность\" ваших личных настроек и обновите свой пароль шифрования, введя этот пароль в поле \"Старый пароль для входа\" и ваш текущий логин/пароль.",
- "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." : "Ключ восстановления - это дополнительный ключ, который используется для шифрования файлов. Он позволяет восстановить пользовательские файлы в случае утери пароля."
+ "Disabled" : "Отключено"
},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/sc.js b/apps/encryption/l10n/sc.js
index 7b52b324222..3e304bf9b75 100644
--- a/apps/encryption/l10n/sc.js
+++ b/apps/encryption/l10n/sc.js
@@ -46,15 +46,13 @@ OC.L10N.register(
"Change Password" : "Càmbia crae",
"Basic encryption module" : "Mòdulu de tzifradura base",
"Your private key password no longer matches your log-in password." : " Sa crae privada non currispondet prus cun sa crae de intrada.",
- "Set your old private key password to your current log-in password:" : " Imposta sa crae betza de sa crae privada in sa crae de intrada atuale:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si non t'ammentas sa crae betza ddi podes pedire a s'amministradore tuo de ti recuperare is archìvios.",
+ "Set your old private key password to your current log-in password:" : "Cunfigura sa crae privada betza comente crae de intrada atuale:",
"Old log-in password" : "Crae betza de intrada",
"Current log-in password" : " Crae de intrada atuale",
"Update Private Key Password" : " Agiorna sa crae de sa crae privada",
"Enable password recovery:" : "Abìlita su riprìstinu de sa crae:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "S'abilitatzione di custu sèberu t'at a permìtere de torrare a intrare a is archìvios in casu chi nche perdas sa crae",
"Enabled" : "Ativada",
- "Disabled" : "Disativada",
- "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." : "Sa crae de riprìstinu est una crae de tzifradura in agiunta impreada pro tzifrare is archìvios. Cunsentit de ripristinare is archìvios si s'utente si nch'irmènticat sa crae."
+ "Disabled" : "Disativada"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/sc.json b/apps/encryption/l10n/sc.json
index d0505928638..8e92fa18aa2 100644
--- a/apps/encryption/l10n/sc.json
+++ b/apps/encryption/l10n/sc.json
@@ -44,15 +44,13 @@
"Change Password" : "Càmbia crae",
"Basic encryption module" : "Mòdulu de tzifradura base",
"Your private key password no longer matches your log-in password." : " Sa crae privada non currispondet prus cun sa crae de intrada.",
- "Set your old private key password to your current log-in password:" : " Imposta sa crae betza de sa crae privada in sa crae de intrada atuale:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si non t'ammentas sa crae betza ddi podes pedire a s'amministradore tuo de ti recuperare is archìvios.",
+ "Set your old private key password to your current log-in password:" : "Cunfigura sa crae privada betza comente crae de intrada atuale:",
"Old log-in password" : "Crae betza de intrada",
"Current log-in password" : " Crae de intrada atuale",
"Update Private Key Password" : " Agiorna sa crae de sa crae privada",
"Enable password recovery:" : "Abìlita su riprìstinu de sa crae:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "S'abilitatzione di custu sèberu t'at a permìtere de torrare a intrare a is archìvios in casu chi nche perdas sa crae",
"Enabled" : "Ativada",
- "Disabled" : "Disativada",
- "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." : "Sa crae de riprìstinu est una crae de tzifradura in agiunta impreada pro tzifrare is archìvios. Cunsentit de ripristinare is archìvios si s'utente si nch'irmènticat sa crae."
+ "Disabled" : "Disativada"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/sk.js b/apps/encryption/l10n/sk.js
index 3582587b5fc..768183a8057 100644
--- a/apps/encryption/l10n/sk.js
+++ b/apps/encryption/l10n/sk.js
@@ -53,15 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "Základný šifrovací modul",
"Your private key password no longer matches your log-in password." : "Heslo vášho súkromného kľúča sa nezhoduje v vašim prihlasovacím heslom.",
"Set your old private key password to your current log-in password:" : "Zmeňte si vaše staré heslo súkromného kľúča na rovnaké, aké je vaše aktuálne prihlasovacie heslo:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie svojich súborov.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie vašich súborov.",
"Old log-in password" : "Staré prihlasovacie heslo",
"Current log-in password" : "Súčasné prihlasovacie heslo",
"Update Private Key Password" : "Aktualizovať heslo súkromného kľúča",
"Enable password recovery:" : "Povoliť obnovu hesla:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo",
"Enabled" : "Povolené",
- "Disabled" : "Zakázané",
- "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 log-in password\" field and your current login-password." : "Prosím, prihláste sa do webového rozhrania, prejdite do sekcie \"Bezpečnosť\" vo vašich osobných nastaveniach a aktualizujte svoje šifrovacie heslo zadávaním tohto hesla do poľa \"Staré prihlasovacie heslo\" a vaše aktuálne prihlasovacie heslo.",
- "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." : "Záchranný kľúč je ďalší šifrovací kľúč, ktorý sa používa na šifrovanie súborov. Umožňuje záchranu súborov používateľa ak zabudne svoje heslo."
+ "Disabled" : "Zakázané"
},
"nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);");
diff --git a/apps/encryption/l10n/sk.json b/apps/encryption/l10n/sk.json
index 009f09e279c..03b35bd517a 100644
--- a/apps/encryption/l10n/sk.json
+++ b/apps/encryption/l10n/sk.json
@@ -51,15 +51,13 @@
"Basic encryption module" : "Základný šifrovací modul",
"Your private key password no longer matches your log-in password." : "Heslo vášho súkromného kľúča sa nezhoduje v vašim prihlasovacím heslom.",
"Set your old private key password to your current log-in password:" : "Zmeňte si vaše staré heslo súkromného kľúča na rovnaké, aké je vaše aktuálne prihlasovacie heslo:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie svojich súborov.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie vašich súborov.",
"Old log-in password" : "Staré prihlasovacie heslo",
"Current log-in password" : "Súčasné prihlasovacie heslo",
"Update Private Key Password" : "Aktualizovať heslo súkromného kľúča",
"Enable password recovery:" : "Povoliť obnovu hesla:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo",
"Enabled" : "Povolené",
- "Disabled" : "Zakázané",
- "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 log-in password\" field and your current login-password." : "Prosím, prihláste sa do webového rozhrania, prejdite do sekcie \"Bezpečnosť\" vo vašich osobných nastaveniach a aktualizujte svoje šifrovacie heslo zadávaním tohto hesla do poľa \"Staré prihlasovacie heslo\" a vaše aktuálne prihlasovacie heslo.",
- "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." : "Záchranný kľúč je ďalší šifrovací kľúč, ktorý sa používa na šifrovanie súborov. Umožňuje záchranu súborov používateľa ak zabudne svoje heslo."
+ "Disabled" : "Zakázané"
},"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/sl.js b/apps/encryption/l10n/sl.js
index 0b28f87952e..c80afd08937 100644
--- a/apps/encryption/l10n/sl.js
+++ b/apps/encryption/l10n/sl.js
@@ -47,14 +47,12 @@ OC.L10N.register(
"Basic encryption module" : "Osnovni modul za šifriranje",
"Your private key password no longer matches your log-in password." : "Zasebno geslo ni več skladno s prijavnim geslom.",
"Set your old private key password to your current log-in password:" : "Nastavite star zasebni ključ na trenutno prijavno geslo:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "V kolikor se gesla ne spomnite več, lahko vaše datoteke obnovi le skrbnik sistema.",
"Old log-in password" : "Staro geslo",
"Current log-in password" : "Trenutno geslo",
"Update Private Key Password" : "Posodobi geslo zasebnega ključa",
"Enable password recovery:" : "Omogoči obnovitev gesla:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Nastavitev te možnosti omogoča ponovno pridobitev dostopa do šifriranih datotek, v primeru, da geslo pozabite.",
"Enabled" : "Omogočeno",
- "Disabled" : "Onemogočeno",
- "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." : "Obnovitveni ključ je dodatni šifrirni ključ, ki se uporablja pri šifriranju datotek. Omogoča obnovitev uporabnikovih datotek, če uporabnih pozabi svoje geslo za dostop."
+ "Disabled" : "Onemogočeno"
},
"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/encryption/l10n/sl.json b/apps/encryption/l10n/sl.json
index 58f7ff703f5..8e45a8d2cab 100644
--- a/apps/encryption/l10n/sl.json
+++ b/apps/encryption/l10n/sl.json
@@ -45,14 +45,12 @@
"Basic encryption module" : "Osnovni modul za šifriranje",
"Your private key password no longer matches your log-in password." : "Zasebno geslo ni več skladno s prijavnim geslom.",
"Set your old private key password to your current log-in password:" : "Nastavite star zasebni ključ na trenutno prijavno geslo:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "V kolikor se gesla ne spomnite več, lahko vaše datoteke obnovi le skrbnik sistema.",
"Old log-in password" : "Staro geslo",
"Current log-in password" : "Trenutno geslo",
"Update Private Key Password" : "Posodobi geslo zasebnega ključa",
"Enable password recovery:" : "Omogoči obnovitev gesla:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Nastavitev te možnosti omogoča ponovno pridobitev dostopa do šifriranih datotek, v primeru, da geslo pozabite.",
"Enabled" : "Omogočeno",
- "Disabled" : "Onemogočeno",
- "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." : "Obnovitveni ključ je dodatni šifrirni ključ, ki se uporablja pri šifriranju datotek. Omogoča obnovitev uporabnikovih datotek, če uporabnih pozabi svoje geslo za dostop."
+ "Disabled" : "Onemogočeno"
},"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/sq.js b/apps/encryption/l10n/sq.js
index bbdad8796ff..9cf72f1c61f 100644
--- a/apps/encryption/l10n/sq.js
+++ b/apps/encryption/l10n/sq.js
@@ -44,14 +44,12 @@ OC.L10N.register(
"Basic encryption module" : "Modul i thjeshtë fshehtëzimesh",
"Your private key password no longer matches your log-in password." : "Fjalëkalimi juaj për kyçe privatë s’përputhet më me fjalëkalimin për hyrjet.",
"Set your old private key password to your current log-in password:" : "Fjalëkalimit të vjetër të kyçit privat jepini vlerën e fjalëkalimit tuaj të tanishëm për hyrjet:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " Nëse s’e mbani mend fjalëkalimin tuaj të vjetër, mund t’i kërkoni përgjegjësit tuaj të rimarrë kartelat tuaja.",
"Old log-in password" : "Fjalëkalimi i vjetër për hyrjet",
"Current log-in password" : "Fjalëkalimi i tanishëm për hyrjet",
"Update Private Key Password" : "Përditësoni Fjalëkalim Kyçi Privat",
"Enable password recovery:" : "Aktivizo rimarrje fjalëkalimesh:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivizimi i kësaj mundësie do t’ju lejojë të rifitoni hyrje te kartelat tuaja të fshehtëzuara në rast humbjeje fjalëkalimi",
"Enabled" : "E aktivizuar",
- "Disabled" : "E çaktivizuar",
- "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." : "Kyçi i rimarrjeve është një kyç ekstra fshehtëzimesh që përdoret për të fshehtëzuar kartela. Ai lejon rimarrjen e një kartele të përdoruesit, nëse përdoruesi harron fjalëkalimin e vet."
+ "Disabled" : "E çaktivizuar"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/sq.json b/apps/encryption/l10n/sq.json
index 106550f135f..5e3473173e6 100644
--- a/apps/encryption/l10n/sq.json
+++ b/apps/encryption/l10n/sq.json
@@ -42,14 +42,12 @@
"Basic encryption module" : "Modul i thjeshtë fshehtëzimesh",
"Your private key password no longer matches your log-in password." : "Fjalëkalimi juaj për kyçe privatë s’përputhet më me fjalëkalimin për hyrjet.",
"Set your old private key password to your current log-in password:" : "Fjalëkalimit të vjetër të kyçit privat jepini vlerën e fjalëkalimit tuaj të tanishëm për hyrjet:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " Nëse s’e mbani mend fjalëkalimin tuaj të vjetër, mund t’i kërkoni përgjegjësit tuaj të rimarrë kartelat tuaja.",
"Old log-in password" : "Fjalëkalimi i vjetër për hyrjet",
"Current log-in password" : "Fjalëkalimi i tanishëm për hyrjet",
"Update Private Key Password" : "Përditësoni Fjalëkalim Kyçi Privat",
"Enable password recovery:" : "Aktivizo rimarrje fjalëkalimesh:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivizimi i kësaj mundësie do t’ju lejojë të rifitoni hyrje te kartelat tuaja të fshehtëzuara në rast humbjeje fjalëkalimi",
"Enabled" : "E aktivizuar",
- "Disabled" : "E çaktivizuar",
- "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." : "Kyçi i rimarrjeve është një kyç ekstra fshehtëzimesh që përdoret për të fshehtëzuar kartela. Ai lejon rimarrjen e një kartele të përdoruesit, nëse përdoruesi harron fjalëkalimin e vet."
+ "Disabled" : "E çaktivizuar"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/sr.js b/apps/encryption/l10n/sr.js
index 6f2d7ba213e..702c5973a34 100644
--- a/apps/encryption/l10n/sr.js
+++ b/apps/encryption/l10n/sr.js
@@ -53,15 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "Основни модул за шифровање",
"Your private key password no longer matches your log-in password." : "Лозинка вашег личног кључа више није иста као ваша лозинка за пријаву.",
"Set your old private key password to your current log-in password:" : "Поставите стару лозинку личног кључа као тренутну лозинку за пријаву:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
"Old log-in password" : "Стара лозинка за пријаву",
"Current log-in password" : "Тренутна лозинка за пријаву",
"Update Private Key Password" : "Ажурирај лозинку личног кључа",
"Enable password recovery:" : "Укључи опоравак лозинке:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Укључивање ове опције омогућиће поновно добијање приступа вашим шифрованим фајловима у случају губитка лозинке",
"Enabled" : "укључено",
- "Disabled" : "искључено",
- "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 log-in password\" field and your current login-password." : "Молимо вас да се пријавите на веб интерфејс, одете на одељак „Безбедност” ваших личник подешавања и ажурирате своју лозинку за шифровање уносећи ову лозинку у поље „Стара лозинка за пријаву” и своју текућу лозинку за пријаву.",
- "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." : "Кључ за опоравак је додатни шифрарски кључ који се користи за шифровање фајлова. Он омогућава опоравак корисничких фајлова ако корисник заборави своју лозинку."
+ "Disabled" : "искључено"
},
"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.json b/apps/encryption/l10n/sr.json
index f90aa09d621..a3002397263 100644
--- a/apps/encryption/l10n/sr.json
+++ b/apps/encryption/l10n/sr.json
@@ -51,15 +51,13 @@
"Basic encryption module" : "Основни модул за шифровање",
"Your private key password no longer matches your log-in password." : "Лозинка вашег личног кључа више није иста као ваша лозинка за пријаву.",
"Set your old private key password to your current log-in password:" : "Поставите стару лозинку личног кључа као тренутну лозинку за пријаву:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
"Old log-in password" : "Стара лозинка за пријаву",
"Current log-in password" : "Тренутна лозинка за пријаву",
"Update Private Key Password" : "Ажурирај лозинку личног кључа",
"Enable password recovery:" : "Укључи опоравак лозинке:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Укључивање ове опције омогућиће поновно добијање приступа вашим шифрованим фајловима у случају губитка лозинке",
"Enabled" : "укључено",
- "Disabled" : "искључено",
- "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 log-in password\" field and your current login-password." : "Молимо вас да се пријавите на веб интерфејс, одете на одељак „Безбедност” ваших личник подешавања и ажурирате своју лозинку за шифровање уносећи ову лозинку у поље „Стара лозинка за пријаву” и своју текућу лозинку за пријаву.",
- "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." : "Кључ за опоравак је додатни шифрарски кључ који се користи за шифровање фајлова. Он омогућава опоравак корисничких фајлова ако корисник заборави своју лозинку."
+ "Disabled" : "искључено"
},"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/sr@latin.js b/apps/encryption/l10n/sr@latin.js
deleted file mode 100644
index d784912394c..00000000000
--- a/apps/encryption/l10n/sr@latin.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za Aplikaciju za šifrovanje. Molimo da osvežite vašu lozinku privatnog ključa u ličnim podešavanjima kako bi dobili pristup šifrovanim fajlovima.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.",
- "The share will expire on %s." : "Deljeni sadržaj će isteći: %s",
- "Cheers!" : "U zdravlje!",
- "Disabled" : "Onemogućeno"
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/encryption/l10n/sr@latin.json b/apps/encryption/l10n/sr@latin.json
deleted file mode 100644
index cb3a38ecf72..00000000000
--- a/apps/encryption/l10n/sr@latin.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
- "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za Aplikaciju za šifrovanje. Molimo da osvežite vašu lozinku privatnog ključa u ličnim podešavanjima kako bi dobili pristup šifrovanim fajlovima.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.",
- "The share will expire on %s." : "Deljeni sadržaj će isteći: %s",
- "Cheers!" : "U zdravlje!",
- "Disabled" : "Onemogućeno"
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/sv.js b/apps/encryption/l10n/sv.js
index 3d7c7cd22bb..0804e976a48 100644
--- a/apps/encryption/l10n/sv.js
+++ b/apps/encryption/l10n/sv.js
@@ -53,15 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "Kryptering",
"Your private key password no longer matches your log-in password." : "Ditt lösenord för din privata nyckel matchar inte längre ditt inloggningslösenord.",
"Set your old private key password to your current log-in password:" : "Sätt ditt gamla privatnyckellösenord till ditt aktuella inloggningslösenord:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
"Old log-in password" : "Gammalt inloggningslösenord",
"Current log-in password" : "Nuvarande inloggningslösenord",
"Update Private Key Password" : "Uppdatera lösenordet för din privata nyckel",
"Enable password recovery:" : "Aktivera lösenordsåterställning:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Om du aktiverar det här alternativet kan du återställa åtkomst till dina krypterade filer vid lösenordsförlust",
"Enabled" : "Aktiverad",
- "Disabled" : "Inaktiverad",
- "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 log-in password\" field and your current login-password." : "Logga in i webbgränssnittet, gå till \"Säkerhet\" i dina personliga inställningar och uppdatera ditt krypteringslösenord genom att ange detta lösenord i fältet \"Gammalt inloggningslösenord\" samt ditt nuvarande inloggningslösenord.",
- "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." : "Återställningsnyckeln är en extra krypteringsnyckel som används för att kryptera filer. Den gör det möjligt att återställa en användares filer om användaren glömmer sitt lösenord."
+ "Disabled" : "Inaktiverad"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/sv.json b/apps/encryption/l10n/sv.json
index fd98517b5cb..2715863250b 100644
--- a/apps/encryption/l10n/sv.json
+++ b/apps/encryption/l10n/sv.json
@@ -51,15 +51,13 @@
"Basic encryption module" : "Kryptering",
"Your private key password no longer matches your log-in password." : "Ditt lösenord för din privata nyckel matchar inte längre ditt inloggningslösenord.",
"Set your old private key password to your current log-in password:" : "Sätt ditt gamla privatnyckellösenord till ditt aktuella inloggningslösenord:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
"Old log-in password" : "Gammalt inloggningslösenord",
"Current log-in password" : "Nuvarande inloggningslösenord",
"Update Private Key Password" : "Uppdatera lösenordet för din privata nyckel",
"Enable password recovery:" : "Aktivera lösenordsåterställning:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Om du aktiverar det här alternativet kan du återställa åtkomst till dina krypterade filer vid lösenordsförlust",
"Enabled" : "Aktiverad",
- "Disabled" : "Inaktiverad",
- "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 log-in password\" field and your current login-password." : "Logga in i webbgränssnittet, gå till \"Säkerhet\" i dina personliga inställningar och uppdatera ditt krypteringslösenord genom att ange detta lösenord i fältet \"Gammalt inloggningslösenord\" samt ditt nuvarande inloggningslösenord.",
- "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." : "Återställningsnyckeln är en extra krypteringsnyckel som används för att kryptera filer. Den gör det möjligt att återställa en användares filer om användaren glömmer sitt lösenord."
+ "Disabled" : "Inaktiverad"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/sw.js b/apps/encryption/l10n/sw.js
new file mode 100644
index 00000000000..47dd00c5388
--- /dev/null
+++ b/apps/encryption/l10n/sw.js
@@ -0,0 +1,65 @@
+OC.L10N.register(
+ "encryption",
+ {
+ "Missing recovery key password" : "Nenosiri la ufunguo wa kurejesha halipo",
+ "Please repeat the recovery key password" : "Tafadhali rudia nenosiri la ufunguo wa kurejesha",
+ "Repeated recovery key password does not match the provided recovery key password" : "Nenosiri linalorudiwa la ufunguo wa kurejesha halilingani na nenosiri ulilopewa la ufunguo wa urejeshaji",
+ "Recovery key successfully enabled" : "Ufunguo wa kurejesha umewezeshwa",
+ "Could not enable recovery key. Please check your recovery key password!" : "Haikuweza kuwasha ufunguo wa kurejesha akaunti. Tafadhali angalia nenosiri lako la ufunguo wa kurejesha akaunti!",
+ "Recovery key successfully disabled" : "Ufunguo wa kurejesha umezimwa",
+ "Could not disable recovery key. Please check your recovery key password!" : "Haikuweza kuzima ufunguo wa kurejesha. Tafadhali angalia nenosiri lako la ufunguo wa kurejesha akaunti!",
+ "Missing parameters" : "Vigezo vinavyokosekana",
+ "Please provide the old recovery password" : "Tafadhali toa nenosiri la zamani la urejeshi",
+ "Please provide a new recovery password" : " Tafadhali toa nenosiri jipya la kurejesha akaunti",
+ "Please repeat the new recovery password" : "Tafadhali rudia nenosiri jipya la kurejesha akaunti",
+ "Password successfully changed." : "Nenosiri limebadilishwa kikamilifu",
+ "Could not change the password. Maybe the old password was not correct." : "Haikuweza kubadilisha nenosiri. Labda nenosiri la zamani halikuwa sahihi.",
+ "Recovery Key disabled" : "Ufunguo wa Urejeshaji umezimwa",
+ "Recovery Key enabled" : "Ufunguo wa Urejeshaji umewashwa",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Haikuweza kuwasha ufunguo wa kurejesha ufikiaji wa akaunti, tafadhali jaribu tena au wasiliana na msimamizi wako",
+ "Could not update the private key password." : "Haikuweza kusasisha nenosiri la ufunguo wa faragha.",
+ "The old password was not correct, please try again." : "Nenosiri la zamani halikuwa sahihi, tafadhali jaribu tena.",
+ "The current log-in password was not correct, please try again." : "Nenosiri la sasa la kuingia halikuwa sahihi, tafadhali jaribu tena.",
+ "Private key password successfully updated." : "Nenosiri la ufunguo wa faragha limesasishwa.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ufunguo wa faragha si sahihi kwa programu ya usimbaji fiche. Tafadhali sasisha nenosiri lako la ufunguo wa faragha katika mipangilio yako ya kibinafsi ili kurejesha ufikiaji wa faili zako zilizosimbwa.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Programu ya Usimbaji fiche imewashwa, lakini funguo zako hazijaanzishwa. Tafadhali ondoka na uingie tena.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Tafadhali wezesha usimbaji fiche wa upande wa seva katika mipangilio ya msimamizi ili kutumia sehemu ya usimbaji.",
+ "Encryption app is enabled and ready" : "Programu ya usimbaji fiche imewashwa na iko tayari",
+ "Bad Signature" : "Sahihi mbaya",
+ "Missing Signature" : "Inakosa Sahihi",
+ "one-time password for server-side-encryption" : "nenosiri la wakati mmoja la usimbaji fiche wa upande wa seva",
+ "Encryption password" : "Nenosiri la usimbaji fiche",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Utawala uliwezesha usimbaji fiche wa upande wa seva. Faili zako zilisimbwa kwa njia fiche kwa kutumia nenosiri <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Utawala uliwezesha usimbaji fiche wa upande wa seva. Faili zako zilisimbwa kwa njia fiche kwa kutumia nenosiri \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Tafadhali ingia kwenye kiolesura cha wavuti, nenda kwenye sehemu ya \"Usalama\" ya mipangilio yako ya kibinafsi na usasishe nenosiri lako la usimbaji kwa kuingiza nenosiri hili kwenye sehemu ya \"Nenosiri la zamani la kuingia\" na nenosiri lako la sasa la kuingia.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Haiwezi kusimbua faili hii, pengine hii ni faili iliyoshirikiwa. Tafadhali mwombe mwenye faili kushiriki upya faili nawe.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Haiwezi kusoma faili hii, labda hii ni faili iliyoshirikiwa. Tafadhali mwombe mwenye faili kushiriki upya faili nawe.",
+ "Default encryption module" : " Moduli chaguo-msingi ya usimbaji fiche",
+ "Default encryption module for server-side encryption" : "Sehemu chaguo-msingi ya usimbaji fiche kwa usimbaji wa upande wa seva",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Ili kutumia sehemu hii ya usimbaji fiche unahitaji kuwezesha usimbaji fiche wa upande wa seva katika mipangilio ya msimamizi. Mara baada ya kuwezeshwa sehemu hii itasimba kwa njia fiche faili zako zote kwa uwazi. Usimbaji fiche unategemea funguo za AES 256.\nSehemu hii haitagusa faili zilizopo, ni faili mpya pekee zitakazosimbwa kwa njia fiche baada ya usimbaji fiche wa upande wa seva kuwashwa. Pia haiwezekani kuzima usimbaji fiche tena na kurudi kwenye mfumo ambao haujasimbwa.\nTafadhali soma hati ili kujua athari zote kabla ya kuamua kuwezesha usimbaji fiche wa upande wa seva.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Programu ya usimbaji fiche imewashwa lakini funguo zako hazijaanzishwa, tafadhali toka na uingie tena",
+ "Encrypt the home storage" : "Simba hifadhi ya nyumbani kwa njia fiche",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Kuwasha chaguo hili husimba kwa njia fiche faili zote zilizohifadhiwa kwenye hifadhi kuu, vinginevyo faili zilizo kwenye hifadhi ya nje pekee ndizo zitasimbwa kwa njia fiche",
+ "Enable recovery key" : "Washa ufunguo wa kurejesha",
+ "Disable recovery key" : "Zima ufunguo wa kurejesha",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Ufunguo wa kurejesha ni ufunguo wa ziada wa usimbaji fiche unaotumiwa kusimba faili kwa njia fiche. Inatumika kurejesha faili kutoka kwa akaunti ikiwa nenosiri limesahau.",
+ "Recovery key password" : "Nenosiri la ufunguo wa kurejesha",
+ "Repeat recovery key password" : "Rudia nenosiri la ufunguo wa kurejesha",
+ "Change recovery key password:" : "Badilisha nenosiri la ufunguo wa kurejesha:",
+ "Old recovery key password" : " Nenosiri la zamani la ufunguo wa kurejesha",
+ "New recovery key password" : "Nenosiri mpya la ufunguo wa kurejesha akaunti",
+ "Repeat new recovery key password" : "Rudia ufunguo mpya wa uokoaji",
+ "Change Password" : "Badili nenosiri",
+ "Basic encryption module" : "Moduli ya msingi ya usimbaji fiche",
+ "Your private key password no longer matches your log-in password." : "Nenosiri lako la ufunguo wa faragha halilingani tena na nenosiri lako la kuingia.",
+ "Set your old private key password to your current log-in password:" : "Weka nenosiri lako la zamani la ufunguo wa kibinafsi kwa nenosiri lako la sasa la kuingia:",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ikiwa hukumbuki nenosiri lako la zamani unaweza kumwomba msimamizi wako kurejesha faili zako.",
+ "Old log-in password" : "Nenosiri la zamani la kuingia",
+ "Current log-in password" : "Nenosiri la sasa la kuingia",
+ "Update Private Key Password" : "Sasisha Nenosiri la Ufunguo wa Kibinafsi",
+ "Enable password recovery:" : "Washa urejeshaji wa nenosiri:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Kuwasha chaguo hili kutakuruhusu kupata tena ufikiaji wa faili zako zilizosimbwa ikiwa utapoteza nenosiri",
+ "Enabled" : "Washwa",
+ "Disabled" : "Zimwa"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/sw.json b/apps/encryption/l10n/sw.json
new file mode 100644
index 00000000000..0e19c9cb3f2
--- /dev/null
+++ b/apps/encryption/l10n/sw.json
@@ -0,0 +1,63 @@
+{ "translations": {
+ "Missing recovery key password" : "Nenosiri la ufunguo wa kurejesha halipo",
+ "Please repeat the recovery key password" : "Tafadhali rudia nenosiri la ufunguo wa kurejesha",
+ "Repeated recovery key password does not match the provided recovery key password" : "Nenosiri linalorudiwa la ufunguo wa kurejesha halilingani na nenosiri ulilopewa la ufunguo wa urejeshaji",
+ "Recovery key successfully enabled" : "Ufunguo wa kurejesha umewezeshwa",
+ "Could not enable recovery key. Please check your recovery key password!" : "Haikuweza kuwasha ufunguo wa kurejesha akaunti. Tafadhali angalia nenosiri lako la ufunguo wa kurejesha akaunti!",
+ "Recovery key successfully disabled" : "Ufunguo wa kurejesha umezimwa",
+ "Could not disable recovery key. Please check your recovery key password!" : "Haikuweza kuzima ufunguo wa kurejesha. Tafadhali angalia nenosiri lako la ufunguo wa kurejesha akaunti!",
+ "Missing parameters" : "Vigezo vinavyokosekana",
+ "Please provide the old recovery password" : "Tafadhali toa nenosiri la zamani la urejeshi",
+ "Please provide a new recovery password" : " Tafadhali toa nenosiri jipya la kurejesha akaunti",
+ "Please repeat the new recovery password" : "Tafadhali rudia nenosiri jipya la kurejesha akaunti",
+ "Password successfully changed." : "Nenosiri limebadilishwa kikamilifu",
+ "Could not change the password. Maybe the old password was not correct." : "Haikuweza kubadilisha nenosiri. Labda nenosiri la zamani halikuwa sahihi.",
+ "Recovery Key disabled" : "Ufunguo wa Urejeshaji umezimwa",
+ "Recovery Key enabled" : "Ufunguo wa Urejeshaji umewashwa",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Haikuweza kuwasha ufunguo wa kurejesha ufikiaji wa akaunti, tafadhali jaribu tena au wasiliana na msimamizi wako",
+ "Could not update the private key password." : "Haikuweza kusasisha nenosiri la ufunguo wa faragha.",
+ "The old password was not correct, please try again." : "Nenosiri la zamani halikuwa sahihi, tafadhali jaribu tena.",
+ "The current log-in password was not correct, please try again." : "Nenosiri la sasa la kuingia halikuwa sahihi, tafadhali jaribu tena.",
+ "Private key password successfully updated." : "Nenosiri la ufunguo wa faragha limesasishwa.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ufunguo wa faragha si sahihi kwa programu ya usimbaji fiche. Tafadhali sasisha nenosiri lako la ufunguo wa faragha katika mipangilio yako ya kibinafsi ili kurejesha ufikiaji wa faili zako zilizosimbwa.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Programu ya Usimbaji fiche imewashwa, lakini funguo zako hazijaanzishwa. Tafadhali ondoka na uingie tena.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Tafadhali wezesha usimbaji fiche wa upande wa seva katika mipangilio ya msimamizi ili kutumia sehemu ya usimbaji.",
+ "Encryption app is enabled and ready" : "Programu ya usimbaji fiche imewashwa na iko tayari",
+ "Bad Signature" : "Sahihi mbaya",
+ "Missing Signature" : "Inakosa Sahihi",
+ "one-time password for server-side-encryption" : "nenosiri la wakati mmoja la usimbaji fiche wa upande wa seva",
+ "Encryption password" : "Nenosiri la usimbaji fiche",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Utawala uliwezesha usimbaji fiche wa upande wa seva. Faili zako zilisimbwa kwa njia fiche kwa kutumia nenosiri <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Utawala uliwezesha usimbaji fiche wa upande wa seva. Faili zako zilisimbwa kwa njia fiche kwa kutumia nenosiri \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Tafadhali ingia kwenye kiolesura cha wavuti, nenda kwenye sehemu ya \"Usalama\" ya mipangilio yako ya kibinafsi na usasishe nenosiri lako la usimbaji kwa kuingiza nenosiri hili kwenye sehemu ya \"Nenosiri la zamani la kuingia\" na nenosiri lako la sasa la kuingia.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Haiwezi kusimbua faili hii, pengine hii ni faili iliyoshirikiwa. Tafadhali mwombe mwenye faili kushiriki upya faili nawe.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Haiwezi kusoma faili hii, labda hii ni faili iliyoshirikiwa. Tafadhali mwombe mwenye faili kushiriki upya faili nawe.",
+ "Default encryption module" : " Moduli chaguo-msingi ya usimbaji fiche",
+ "Default encryption module for server-side encryption" : "Sehemu chaguo-msingi ya usimbaji fiche kwa usimbaji wa upande wa seva",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Ili kutumia sehemu hii ya usimbaji fiche unahitaji kuwezesha usimbaji fiche wa upande wa seva katika mipangilio ya msimamizi. Mara baada ya kuwezeshwa sehemu hii itasimba kwa njia fiche faili zako zote kwa uwazi. Usimbaji fiche unategemea funguo za AES 256.\nSehemu hii haitagusa faili zilizopo, ni faili mpya pekee zitakazosimbwa kwa njia fiche baada ya usimbaji fiche wa upande wa seva kuwashwa. Pia haiwezekani kuzima usimbaji fiche tena na kurudi kwenye mfumo ambao haujasimbwa.\nTafadhali soma hati ili kujua athari zote kabla ya kuamua kuwezesha usimbaji fiche wa upande wa seva.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Programu ya usimbaji fiche imewashwa lakini funguo zako hazijaanzishwa, tafadhali toka na uingie tena",
+ "Encrypt the home storage" : "Simba hifadhi ya nyumbani kwa njia fiche",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Kuwasha chaguo hili husimba kwa njia fiche faili zote zilizohifadhiwa kwenye hifadhi kuu, vinginevyo faili zilizo kwenye hifadhi ya nje pekee ndizo zitasimbwa kwa njia fiche",
+ "Enable recovery key" : "Washa ufunguo wa kurejesha",
+ "Disable recovery key" : "Zima ufunguo wa kurejesha",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Ufunguo wa kurejesha ni ufunguo wa ziada wa usimbaji fiche unaotumiwa kusimba faili kwa njia fiche. Inatumika kurejesha faili kutoka kwa akaunti ikiwa nenosiri limesahau.",
+ "Recovery key password" : "Nenosiri la ufunguo wa kurejesha",
+ "Repeat recovery key password" : "Rudia nenosiri la ufunguo wa kurejesha",
+ "Change recovery key password:" : "Badilisha nenosiri la ufunguo wa kurejesha:",
+ "Old recovery key password" : " Nenosiri la zamani la ufunguo wa kurejesha",
+ "New recovery key password" : "Nenosiri mpya la ufunguo wa kurejesha akaunti",
+ "Repeat new recovery key password" : "Rudia ufunguo mpya wa uokoaji",
+ "Change Password" : "Badili nenosiri",
+ "Basic encryption module" : "Moduli ya msingi ya usimbaji fiche",
+ "Your private key password no longer matches your log-in password." : "Nenosiri lako la ufunguo wa faragha halilingani tena na nenosiri lako la kuingia.",
+ "Set your old private key password to your current log-in password:" : "Weka nenosiri lako la zamani la ufunguo wa kibinafsi kwa nenosiri lako la sasa la kuingia:",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ikiwa hukumbuki nenosiri lako la zamani unaweza kumwomba msimamizi wako kurejesha faili zako.",
+ "Old log-in password" : "Nenosiri la zamani la kuingia",
+ "Current log-in password" : "Nenosiri la sasa la kuingia",
+ "Update Private Key Password" : "Sasisha Nenosiri la Ufunguo wa Kibinafsi",
+ "Enable password recovery:" : "Washa urejeshaji wa nenosiri:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Kuwasha chaguo hili kutakuruhusu kupata tena ufikiaji wa faili zako zilizosimbwa ikiwa utapoteza nenosiri",
+ "Enabled" : "Washwa",
+ "Disabled" : "Zimwa"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+} \ No newline at end of file
diff --git a/apps/encryption/l10n/th.js b/apps/encryption/l10n/th.js
index f09597fe31e..a735f1bff1f 100644
--- a/apps/encryption/l10n/th.js
+++ b/apps/encryption/l10n/th.js
@@ -37,14 +37,12 @@ OC.L10N.register(
"Change Password" : "เปลี่ยนรหัสผ่าน",
"Your private key password no longer matches your log-in password." : "รหัสผ่านคีย์ส่วนตัวของคุณ ไม่ตรงกับรหัสผ่านที่ใช้เข้าสู่ระบบของคุณอีกต่อไป",
"Set your old private key password to your current log-in password:" : "ตั้งรหัสผ่านคีย์ส่วนตัวเก่าของคุณเป็นรหัสผ่านเข้าสู่ระบบปัจจุบันของคุณ:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "ถ้าคุณลืมรหัสผ่านเก่าของคุณ คุณสามารถขอให้ผู้ดูแลระบบกู้คืนไฟล์ของคุณ",
"Old log-in password" : "รหัสผ่านเข้าสู่ระบบเดิม",
"Current log-in password" : "รหัสผ่านเข้าสู่ระบบปัจจุบัน",
"Update Private Key Password" : "อัปเดตรหัสผ่านคีย์ส่วนตัว",
"Enable password recovery:" : "เปิดใช้งานการกู้คืนด้วยรหัสผ่าน:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "การเปิดใช้งานตัวเลือกนี้จะช่วยให้คุณสามารถเข้าถึงไฟล์ของคุณที่เข้ารหัสไว้ ในกรณีที่คุณลืมรหัสผ่าน",
"Enabled" : "เปิดใช้งาน",
- "Disabled" : "ปิดใช้งาน",
- "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." : "คีย์การกู้คืนเป็นคีย์เข้ารหัสเพิ่มเติมที่ใช้ในการเข้ารหัสไฟล์ ซึ่งจะทำให้สามารถกู้คืนไฟล์ของผู้ใช้ที่ลืมรหัสผ่านได้"
+ "Disabled" : "ปิดใช้งาน"
},
"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/th.json b/apps/encryption/l10n/th.json
index 2db6706a3a3..017602e4584 100644
--- a/apps/encryption/l10n/th.json
+++ b/apps/encryption/l10n/th.json
@@ -35,14 +35,12 @@
"Change Password" : "เปลี่ยนรหัสผ่าน",
"Your private key password no longer matches your log-in password." : "รหัสผ่านคีย์ส่วนตัวของคุณ ไม่ตรงกับรหัสผ่านที่ใช้เข้าสู่ระบบของคุณอีกต่อไป",
"Set your old private key password to your current log-in password:" : "ตั้งรหัสผ่านคีย์ส่วนตัวเก่าของคุณเป็นรหัสผ่านเข้าสู่ระบบปัจจุบันของคุณ:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "ถ้าคุณลืมรหัสผ่านเก่าของคุณ คุณสามารถขอให้ผู้ดูแลระบบกู้คืนไฟล์ของคุณ",
"Old log-in password" : "รหัสผ่านเข้าสู่ระบบเดิม",
"Current log-in password" : "รหัสผ่านเข้าสู่ระบบปัจจุบัน",
"Update Private Key Password" : "อัปเดตรหัสผ่านคีย์ส่วนตัว",
"Enable password recovery:" : "เปิดใช้งานการกู้คืนด้วยรหัสผ่าน:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "การเปิดใช้งานตัวเลือกนี้จะช่วยให้คุณสามารถเข้าถึงไฟล์ของคุณที่เข้ารหัสไว้ ในกรณีที่คุณลืมรหัสผ่าน",
"Enabled" : "เปิดใช้งาน",
- "Disabled" : "ปิดใช้งาน",
- "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." : "คีย์การกู้คืนเป็นคีย์เข้ารหัสเพิ่มเติมที่ใช้ในการเข้ารหัสไฟล์ ซึ่งจะทำให้สามารถกู้คืนไฟล์ของผู้ใช้ที่ลืมรหัสผ่านได้"
+ "Disabled" : "ปิดใช้งาน"
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/tr.js b/apps/encryption/l10n/tr.js
index 2737c4a5c31..dad06799b7e 100644
--- a/apps/encryption/l10n/tr.js
+++ b/apps/encryption/l10n/tr.js
@@ -1,47 +1,47 @@
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ı etkinleştirildi",
- "Could not enable recovery key. Please check your recovery key password!" : "Geri yükleme anahtarı etkinleştirilemedi. Lütfen geri yükleme anahtarı parolanızı denetleyin!",
- "Recovery key successfully disabled" : "Geri yükleme anahtarı devre dışı bırakıldı",
- "Could not disable recovery key. Please check your recovery key password!" : "Geri yükleme anahtarı devre dışı bırakı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ı devre dışı",
- "Recovery Key enabled" : "Geri yükleme anahtarı etkin",
- "Could not enable the recovery key, please try again or contact your administrator" : "Geri yükleme anahtarı etkinleştirilemedi, 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ı etkin 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 etkinleştirin.",
- "Encryption app is enabled and ready" : "Şifreleme uygulaması etkinleştirilmiş 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önetim, sunucu tarafı şifrelemeyi etkinleştirmiş. Dosyalarınız <strong>%s</strong> parolası ile şifrelendi .",
- "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Yönetim, sunucu tarafı şifrelemeyi etkinleştirmiş. 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.",
"Default encryption module" : "Varsayılan şifreleme modülü",
"Default encryption module for server-side encryption" : "Sunucu tarafında şifreleme için varsayılan şifreleme modülü",
- "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 etkinleştirilmelidir. Bu modül etkinleştirildikten 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 etkinleştirildikten sonra eklenen yeni dosyalar şifrelenir. Şifreleme etkinleştirildikten sonra devre dışı bırakılamaz ve şifreleme olmayan sisteme geri dönülemez.\nLütfen sunucu tarafı şifrelemeyi etkinleştirmeden ö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ı etkin ancak anahtarlarınız hazırlanmamış. Lütfen oturumunuzu kapatıp yeniden açın.",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "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 etkinleştirildiğinde, ana depolama alanındaki tüm dosyalar şifrelenir. Devre dışı bırakıldığında yalnızca dış depolama alanındaki dosyalar şifrelenir",
- "Enable recovery key" : "Kurtarma anahtarını etkinleştir",
- "Disable recovery key" : "Kurtarma anahtarını devre dışı bırak",
+ "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.",
"Recovery key password" : "Kurtarma anahtarı parolası",
"Repeat recovery key password" : "Kurtarma anahtarı parolası onayı",
@@ -53,15 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "Temel şifreleme modülü",
"Your private key password no longer matches your log-in password." : "Kişisel anahtar parolanız artık oturum açma parolanız ile eşleşmiyor.",
"Set your old private key password to your current log-in password:" : "Eski kişisel anahtar parolanızı, geçerli oturum açma parolanız olarak ayarlayın:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Eski parolanızı hatırlamıyorsanız, BT yöneticinizden dosyalarınızı kurtarmasını isteyebilirsiniz.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Eski parolanızı hatırlamıyorsanız, BT yöneticinizden dosyalarınızı kurtarmasını isteyebilirsiniz.",
"Old log-in password" : "Eski oturum açma parolası",
"Current log-in password" : "Geçerli oturum açma parolası",
"Update Private Key Password" : "Kişisel anahtar parolasını güncelle",
- "Enable password recovery:" : "Parola kurtarmayı etkinleştir:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu seçenek etkinleştirildiğinde, parolayı unutursanız şifrelenmiş dosyalarınıza yeniden erişim izni elde edebilirsiniz",
- "Enabled" : "Etkin",
- "Disabled" : "Devre dışı",
- "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 log-in 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.",
- "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." : "Kurtarma anahtarı, dosyaların şifrelenmesi için ek bir güvenlik sağlar. Böylece kullanıcı unutursa dosyalarının parolasını sıfırlayabilir."
+ "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 4351da3eedb..4f3ff388ad1 100644
--- a/apps/encryption/l10n/tr.json
+++ b/apps/encryption/l10n/tr.json
@@ -1,45 +1,45 @@
{ "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ı etkinleştirildi",
- "Could not enable recovery key. Please check your recovery key password!" : "Geri yükleme anahtarı etkinleştirilemedi. Lütfen geri yükleme anahtarı parolanızı denetleyin!",
- "Recovery key successfully disabled" : "Geri yükleme anahtarı devre dışı bırakıldı",
- "Could not disable recovery key. Please check your recovery key password!" : "Geri yükleme anahtarı devre dışı bırakı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ı devre dışı",
- "Recovery Key enabled" : "Geri yükleme anahtarı etkin",
- "Could not enable the recovery key, please try again or contact your administrator" : "Geri yükleme anahtarı etkinleştirilemedi, 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ı etkin 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 etkinleştirin.",
- "Encryption app is enabled and ready" : "Şifreleme uygulaması etkinleştirilmiş 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önetim, sunucu tarafı şifrelemeyi etkinleştirmiş. Dosyalarınız <strong>%s</strong> parolası ile şifrelendi .",
- "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Yönetim, sunucu tarafı şifrelemeyi etkinleştirmiş. 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.",
"Default encryption module" : "Varsayılan şifreleme modülü",
"Default encryption module for server-side encryption" : "Sunucu tarafında şifreleme için varsayılan şifreleme modülü",
- "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 etkinleştirilmelidir. Bu modül etkinleştirildikten 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 etkinleştirildikten sonra eklenen yeni dosyalar şifrelenir. Şifreleme etkinleştirildikten sonra devre dışı bırakılamaz ve şifreleme olmayan sisteme geri dönülemez.\nLütfen sunucu tarafı şifrelemeyi etkinleştirmeden ö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ı etkin ancak anahtarlarınız hazırlanmamış. Lütfen oturumunuzu kapatıp yeniden açın.",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "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 etkinleştirildiğinde, ana depolama alanındaki tüm dosyalar şifrelenir. Devre dışı bırakıldığında yalnızca dış depolama alanındaki dosyalar şifrelenir",
- "Enable recovery key" : "Kurtarma anahtarını etkinleştir",
- "Disable recovery key" : "Kurtarma anahtarını devre dışı bırak",
+ "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.",
"Recovery key password" : "Kurtarma anahtarı parolası",
"Repeat recovery key password" : "Kurtarma anahtarı parolası onayı",
@@ -51,15 +51,13 @@
"Basic encryption module" : "Temel şifreleme modülü",
"Your private key password no longer matches your log-in password." : "Kişisel anahtar parolanız artık oturum açma parolanız ile eşleşmiyor.",
"Set your old private key password to your current log-in password:" : "Eski kişisel anahtar parolanızı, geçerli oturum açma parolanız olarak ayarlayın:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Eski parolanızı hatırlamıyorsanız, BT yöneticinizden dosyalarınızı kurtarmasını isteyebilirsiniz.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Eski parolanızı hatırlamıyorsanız, BT yöneticinizden dosyalarınızı kurtarmasını isteyebilirsiniz.",
"Old log-in password" : "Eski oturum açma parolası",
"Current log-in password" : "Geçerli oturum açma parolası",
"Update Private Key Password" : "Kişisel anahtar parolasını güncelle",
- "Enable password recovery:" : "Parola kurtarmayı etkinleştir:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu seçenek etkinleştirildiğinde, parolayı unutursanız şifrelenmiş dosyalarınıza yeniden erişim izni elde edebilirsiniz",
- "Enabled" : "Etkin",
- "Disabled" : "Devre dışı",
- "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 log-in 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.",
- "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." : "Kurtarma anahtarı, dosyaların şifrelenmesi için ek bir güvenlik sağlar. Böylece kullanıcı unutursa dosyalarının parolasını sıfırlayabilir."
+ "Enable password recovery:" : "Parola kurtarma özelliğini aç:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu seçenek açıldığında, parolayı unutursanız şifrelenmiş dosyalarınıza yeniden erişim izni elde edebilirsiniz",
+ "Enabled" : "Açık",
+ "Disabled" : "Kapalı"
},"pluralForm" :"nplurals=2; plural=(n > 1);"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/ug.js b/apps/encryption/l10n/ug.js
new file mode 100644
index 00000000000..3575f43bb5e
--- /dev/null
+++ b/apps/encryption/l10n/ug.js
@@ -0,0 +1,64 @@
+OC.L10N.register(
+ "encryption",
+ {
+ "Missing recovery key password" : "ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولى يوقاپ كەتتى",
+ "Please repeat the recovery key password" : "ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولىنى تەكرارلاڭ",
+ "Repeated recovery key password does not match the provided recovery key password" : "قايتا-قايتا ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولى تەمىنلەنگەن ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولىغا ماس كەلمەيدۇ",
+ "Recovery key successfully enabled" : "ئەسلىگە كەلتۈرۈش ئاچقۇچى مۇۋەپپەقىيەتلىك قوزغىتىلدى",
+ "Could not enable recovery key. Please check your recovery key password!" : "ئەسلىگە كەلتۈرۈش ئاچقۇچىنى قوزغىتالمىدى. ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولىڭىزنى تەكشۈرۈپ بېقىڭ!",
+ "Recovery key successfully disabled" : "ئەسلىگە كەلتۈرۈش ئاچقۇچى مۇۋەپپەقىيەتلىك چەكلەنگەن",
+ "Could not disable recovery key. Please check your recovery key password!" : "ئەسلىگە كەلتۈرۈش ئاچقۇچىنى چەكلىيەلمىدى. ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولىڭىزنى تەكشۈرۈپ بېقىڭ!",
+ "Missing parameters" : "يوقاپ كەتكەن پارامېتىرلار",
+ "Please provide the old recovery password" : "كونا ئەسلىگە كەلتۈرۈش پارولى بىلەن تەمىنلەڭ",
+ "Please provide a new recovery password" : "يېڭى ئەسلىگە كەلتۈرۈش پارولى بىلەن تەمىنلەڭ",
+ "Please repeat the new recovery password" : "يېڭى ئەسلىگە كەلتۈرۈش پارولىنى تەكرارلاڭ",
+ "Password successfully changed." : "پارول مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى.",
+ "Could not change the password. Maybe the old password was not correct." : "پارولنى ئۆزگەرتەلمىدى. بەلكىم كونا پارول توغرا بولمىغان بولۇشى مۇمكىن.",
+ "Recovery Key disabled" : "ئەسلىگە كەلتۈرۈش ئاچقۇچى چەكلەنگەن",
+ "Recovery Key enabled" : "ئەسلىگە كەلتۈرۈش ئاچقۇچى قوزغىتىلدى",
+ "Could not enable the recovery key, please try again or contact your administrator" : "ئەسلىگە كەلتۈرۈش ئاچقۇچىنى قوزغىتالمىدى ، قايتا سىناڭ ياكى باشقۇرغۇچى بىلەن ئالاقىلىشىڭ",
+ "Could not update the private key password." : "شەخسىي ئاچقۇچ پارولىنى يېڭىلىيالمىدى.",
+ "The old password was not correct, please try again." : "كونا پارول توغرا ئەمەس ، قايتا سىناڭ.",
+ "The current log-in password was not correct, please try again." : "نۆۋەتتىكى كىرىش پارولى توغرا ئەمەس ، قايتا سىناڭ.",
+ "Private key password successfully updated." : "شەخسىي ئاچقۇچ مەخپىي نومۇرى مۇۋەپپەقىيەتلىك يېڭىلاندى.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "مەخپىيلەشتۈرۈش دېتالىنىڭ ئىناۋەتسىز شەخسىي ئاچقۇچى. شىفىرلانغان ھۆججەتلىرىڭىزنى ئەسلىگە كەلتۈرۈش ئۈچۈن شەخسىي تەڭشەكلىرىڭىزدىكى شەخسىي ئاچقۇچ پارولىڭىزنى يېڭىلاڭ.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "شىفىرلاش دېتالى قوزغىتىلغان ، ئەمما ئاچقۇچلىرىڭىز دەسلەپكى قەدەمدە ئەمەس. قايتا كىرىپ قايتا كىرىڭ.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "مەخپىيلەشتۈرۈش مودۇلىنى ئىشلىتىش ئۈچۈن باشقۇرۇش تەڭشەكلىرىدە مۇلازىمېتىر تەرەپ شىفىرلاشنى قوزغىتىڭ.",
+ "Encryption app is enabled and ready" : "شىفىرلاش دېتالى قوزغىتىلغان ۋە تەييار",
+ "Bad Signature" : "ناچار ئىمزا",
+ "Missing Signature" : "قولدىن كەتكەن ئىمزا",
+ "one-time password for server-side-encryption" : "مۇلازىمېتىرنى مەخپىيلەشتۈرۈش ئۈچۈن بىر قېتىم پارول",
+ "Encryption password" : "مەخپىي شىفىر",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "باشقۇرۇش مۇلازىمىتىر تەرەپنى مەخپىيلەشتۈرۈشنى قوزغىدى. ھۆججەتلىرىڭىز مەخپىي نومۇر <strong>% s </strong> ئارقىلىق شىفىرلاندى.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "باشقۇرۇش مۇلازىمىتىر تەرەپنى مەخپىيلەشتۈرۈشنى قوزغىدى. ھۆججەتلىرىڭىز «% s» پارولى ئارقىلىق شىفىرلاندى.",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "تور كۆرۈنمە يۈزىگە كىرىڭ ، شەخسىي تەڭشەكلىرىڭىزنىڭ «بىخەتەرلىك» بۆلىكىگە كىرىپ ، مەخپىي شىفىرىڭىزنى «كونا كىرىش پارولى» دېگەن ئورۇنغا ۋە نۆۋەتتىكى كىرىش پارولىڭىزنى كىرگۈزۈڭ.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "بۇ ھۆججەتنى يېشىش مۇمكىن ئەمەس ، بەلكىم بۇ ئورتاق ھۆججەت بولۇشى مۇمكىن. ھۆججەت ئىگىسىدىن ھۆججەتنى سىز بىلەن ئورتاقلىشىشنى تەلەپ قىلىڭ.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "بۇ ھۆججەتنى ئوقۇيالمايدۇ ، بەلكىم بۇ ئورتاق ھۆججەت بولۇشى مۇمكىن. ھۆججەت ئىگىسىدىن ھۆججەتنى سىز بىلەن ئورتاقلىشىشنى تەلەپ قىلىڭ.",
+ "Default encryption module" : "كۆڭۈلدىكى مەخپىيلەشتۈرۈش مودۇلى",
+ "Default encryption module for server-side encryption" : "مۇلازىمېتىر تەرەپ شىفىرلاشنىڭ كۆڭۈلدىكى مەخپىيلەشتۈرۈش مودۇلى",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "بۇ مەخپىيلەشتۈرۈش مودۇلىنى ئىشلىتىش ئۈچۈن ، باشقۇرۇش تەڭشەكلىرىدە مۇلازىمېتىر تەرەپ مەخپىيلەشتۈرۈشنى قوزغىتىشىڭىز كېرەك. بۇ مودۇل قوزغىتىلغاندىن كېيىن بارلىق ھۆججەتلىرىڭىزنى ئوچۇق شىفىرلايدۇ. شىفىرلاش AES 256 كۇنۇپكىسىنى ئاساس قىلغان.\nبۇ بۆلەك مەۋجۇت ھۆججەتلەرگە تەگمەيدۇ ، پەقەت يېڭى ھۆججەتلەر مۇلازىمېتىر تەرەپ شىفىرلانغاندىن كېيىن شىفىرلىنىدۇ. مەخپىيلەشتۈرۈشنى قايتا چەكلەش ۋە شىفىرلانمىغان سىستېمىغا قايتىش مۇمكىن ئەمەس.\nمۇلازىمېتىرنى مەخپىيلەشتۈرۈشنى قارار قىلىشتىن ئىلگىرى بارلىق تەسىرلەرنى بىلىش ئۈچۈن ھۆججەتلەرنى ئوقۇڭ.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "شىفىرلاش دېتالى قوزغىتىلغان ، ئەمما ئاچقۇچلىرىڭىز دەسلەپكى قەدەمدە قوزغىتىلمىغان ، قايتا كىرىپ قايتا كىرىڭ",
+ "Encrypt the home storage" : "ئۆي ئامبىرىنى مەخپىيلەشتۈرۈڭ",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "بۇ تاللاشنى قوزغىتىش ئاساسلىق ساقلاش بوشلۇقىدا ساقلانغان بارلىق ھۆججەتلەرنى مەخپىيلەشتۈرىدۇ ، بولمىسا پەقەت سىرتقى ساقلىغۇچتىكى ھۆججەتلەرلا شىفىرلىنىدۇ",
+ "Enable recovery key" : "ئەسلىگە كەلتۈرۈش ئاچقۇچىنى قوزغىتىڭ",
+ "Disable recovery key" : "ئەسلىگە كەلتۈرۈش ئاچقۇچىنى چەكلەڭ",
+ "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." : "ئەسلىگە كەلتۈرۈش ئاچقۇچى ھۆججەتلەرنى مەخپىيلەشتۈرۈش ئۈچۈن ئىشلىتىلىدىغان قوشۇمچە شىفىرلاش ئاچقۇچى. پارول ئۇنتۇلۇپ قالسا ھېساباتتىكى ھۆججەتلەرنى ئەسلىگە كەلتۈرۈشكە ئىشلىتىلىدۇ.",
+ "Recovery key password" : "ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولى",
+ "Repeat recovery key password" : "ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولىنى تەكرارلاڭ",
+ "Change recovery key password:" : "ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولىنى ئۆزگەرتىش:",
+ "Old recovery key password" : "كونا ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولى",
+ "New recovery key password" : "يېڭى ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولى",
+ "Repeat new recovery key password" : "يېڭى ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولىنى تەكرارلاڭ",
+ "Change Password" : "پارولنى ئۆزگەرتىش",
+ "Basic encryption module" : "ئاساسىي مەخپىيلەشتۈرۈش مودۇلى",
+ "Your private key password no longer matches your log-in password." : "شەخسىي ئاچقۇچ پارولىڭىز كىرىش پارولىڭىزغا ماس كەلمەيدۇ.",
+ "Set your old private key password to your current log-in password:" : "كونا شەخسىي پارولىڭىزنى نۆۋەتتىكى كىرىش پارولىڭىزغا تەڭشەڭ:",
+ "Old log-in password" : "كونا كىرىش پارولى",
+ "Current log-in password" : "نۆۋەتتىكى كىرىش پارولى",
+ "Update Private Key Password" : "شەخسىي ئاچقۇچ پارولىنى يېڭىلاڭ",
+ "Enable password recovery:" : "پارولنى ئەسلىگە كەلتۈرۈشنى قوزغىتىڭ:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "بۇ تاللانمىنى قوزغاتسىڭىز مەخپىي شىفىرلانغان ھۆججەتلەرنى مەخپىي شىفىرىڭىز يوقاپ كەتكەن ئەھۋال ئاستىدا قايتا زىيارەت قىلالايسىز",
+ "Enabled" : "قوزغىتىلدى",
+ "Disabled" : "چەكلەنگەن"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/ug.json b/apps/encryption/l10n/ug.json
new file mode 100644
index 00000000000..e924f446720
--- /dev/null
+++ b/apps/encryption/l10n/ug.json
@@ -0,0 +1,62 @@
+{ "translations": {
+ "Missing recovery key password" : "ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولى يوقاپ كەتتى",
+ "Please repeat the recovery key password" : "ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولىنى تەكرارلاڭ",
+ "Repeated recovery key password does not match the provided recovery key password" : "قايتا-قايتا ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولى تەمىنلەنگەن ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولىغا ماس كەلمەيدۇ",
+ "Recovery key successfully enabled" : "ئەسلىگە كەلتۈرۈش ئاچقۇچى مۇۋەپپەقىيەتلىك قوزغىتىلدى",
+ "Could not enable recovery key. Please check your recovery key password!" : "ئەسلىگە كەلتۈرۈش ئاچقۇچىنى قوزغىتالمىدى. ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولىڭىزنى تەكشۈرۈپ بېقىڭ!",
+ "Recovery key successfully disabled" : "ئەسلىگە كەلتۈرۈش ئاچقۇچى مۇۋەپپەقىيەتلىك چەكلەنگەن",
+ "Could not disable recovery key. Please check your recovery key password!" : "ئەسلىگە كەلتۈرۈش ئاچقۇچىنى چەكلىيەلمىدى. ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولىڭىزنى تەكشۈرۈپ بېقىڭ!",
+ "Missing parameters" : "يوقاپ كەتكەن پارامېتىرلار",
+ "Please provide the old recovery password" : "كونا ئەسلىگە كەلتۈرۈش پارولى بىلەن تەمىنلەڭ",
+ "Please provide a new recovery password" : "يېڭى ئەسلىگە كەلتۈرۈش پارولى بىلەن تەمىنلەڭ",
+ "Please repeat the new recovery password" : "يېڭى ئەسلىگە كەلتۈرۈش پارولىنى تەكرارلاڭ",
+ "Password successfully changed." : "پارول مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى.",
+ "Could not change the password. Maybe the old password was not correct." : "پارولنى ئۆزگەرتەلمىدى. بەلكىم كونا پارول توغرا بولمىغان بولۇشى مۇمكىن.",
+ "Recovery Key disabled" : "ئەسلىگە كەلتۈرۈش ئاچقۇچى چەكلەنگەن",
+ "Recovery Key enabled" : "ئەسلىگە كەلتۈرۈش ئاچقۇچى قوزغىتىلدى",
+ "Could not enable the recovery key, please try again or contact your administrator" : "ئەسلىگە كەلتۈرۈش ئاچقۇچىنى قوزغىتالمىدى ، قايتا سىناڭ ياكى باشقۇرغۇچى بىلەن ئالاقىلىشىڭ",
+ "Could not update the private key password." : "شەخسىي ئاچقۇچ پارولىنى يېڭىلىيالمىدى.",
+ "The old password was not correct, please try again." : "كونا پارول توغرا ئەمەس ، قايتا سىناڭ.",
+ "The current log-in password was not correct, please try again." : "نۆۋەتتىكى كىرىش پارولى توغرا ئەمەس ، قايتا سىناڭ.",
+ "Private key password successfully updated." : "شەخسىي ئاچقۇچ مەخپىي نومۇرى مۇۋەپپەقىيەتلىك يېڭىلاندى.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "مەخپىيلەشتۈرۈش دېتالىنىڭ ئىناۋەتسىز شەخسىي ئاچقۇچى. شىفىرلانغان ھۆججەتلىرىڭىزنى ئەسلىگە كەلتۈرۈش ئۈچۈن شەخسىي تەڭشەكلىرىڭىزدىكى شەخسىي ئاچقۇچ پارولىڭىزنى يېڭىلاڭ.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "شىفىرلاش دېتالى قوزغىتىلغان ، ئەمما ئاچقۇچلىرىڭىز دەسلەپكى قەدەمدە ئەمەس. قايتا كىرىپ قايتا كىرىڭ.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "مەخپىيلەشتۈرۈش مودۇلىنى ئىشلىتىش ئۈچۈن باشقۇرۇش تەڭشەكلىرىدە مۇلازىمېتىر تەرەپ شىفىرلاشنى قوزغىتىڭ.",
+ "Encryption app is enabled and ready" : "شىفىرلاش دېتالى قوزغىتىلغان ۋە تەييار",
+ "Bad Signature" : "ناچار ئىمزا",
+ "Missing Signature" : "قولدىن كەتكەن ئىمزا",
+ "one-time password for server-side-encryption" : "مۇلازىمېتىرنى مەخپىيلەشتۈرۈش ئۈچۈن بىر قېتىم پارول",
+ "Encryption password" : "مەخپىي شىفىر",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "باشقۇرۇش مۇلازىمىتىر تەرەپنى مەخپىيلەشتۈرۈشنى قوزغىدى. ھۆججەتلىرىڭىز مەخپىي نومۇر <strong>% s </strong> ئارقىلىق شىفىرلاندى.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "باشقۇرۇش مۇلازىمىتىر تەرەپنى مەخپىيلەشتۈرۈشنى قوزغىدى. ھۆججەتلىرىڭىز «% s» پارولى ئارقىلىق شىفىرلاندى.",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "تور كۆرۈنمە يۈزىگە كىرىڭ ، شەخسىي تەڭشەكلىرىڭىزنىڭ «بىخەتەرلىك» بۆلىكىگە كىرىپ ، مەخپىي شىفىرىڭىزنى «كونا كىرىش پارولى» دېگەن ئورۇنغا ۋە نۆۋەتتىكى كىرىش پارولىڭىزنى كىرگۈزۈڭ.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "بۇ ھۆججەتنى يېشىش مۇمكىن ئەمەس ، بەلكىم بۇ ئورتاق ھۆججەت بولۇشى مۇمكىن. ھۆججەت ئىگىسىدىن ھۆججەتنى سىز بىلەن ئورتاقلىشىشنى تەلەپ قىلىڭ.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "بۇ ھۆججەتنى ئوقۇيالمايدۇ ، بەلكىم بۇ ئورتاق ھۆججەت بولۇشى مۇمكىن. ھۆججەت ئىگىسىدىن ھۆججەتنى سىز بىلەن ئورتاقلىشىشنى تەلەپ قىلىڭ.",
+ "Default encryption module" : "كۆڭۈلدىكى مەخپىيلەشتۈرۈش مودۇلى",
+ "Default encryption module for server-side encryption" : "مۇلازىمېتىر تەرەپ شىفىرلاشنىڭ كۆڭۈلدىكى مەخپىيلەشتۈرۈش مودۇلى",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "بۇ مەخپىيلەشتۈرۈش مودۇلىنى ئىشلىتىش ئۈچۈن ، باشقۇرۇش تەڭشەكلىرىدە مۇلازىمېتىر تەرەپ مەخپىيلەشتۈرۈشنى قوزغىتىشىڭىز كېرەك. بۇ مودۇل قوزغىتىلغاندىن كېيىن بارلىق ھۆججەتلىرىڭىزنى ئوچۇق شىفىرلايدۇ. شىفىرلاش AES 256 كۇنۇپكىسىنى ئاساس قىلغان.\nبۇ بۆلەك مەۋجۇت ھۆججەتلەرگە تەگمەيدۇ ، پەقەت يېڭى ھۆججەتلەر مۇلازىمېتىر تەرەپ شىفىرلانغاندىن كېيىن شىفىرلىنىدۇ. مەخپىيلەشتۈرۈشنى قايتا چەكلەش ۋە شىفىرلانمىغان سىستېمىغا قايتىش مۇمكىن ئەمەس.\nمۇلازىمېتىرنى مەخپىيلەشتۈرۈشنى قارار قىلىشتىن ئىلگىرى بارلىق تەسىرلەرنى بىلىش ئۈچۈن ھۆججەتلەرنى ئوقۇڭ.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "شىفىرلاش دېتالى قوزغىتىلغان ، ئەمما ئاچقۇچلىرىڭىز دەسلەپكى قەدەمدە قوزغىتىلمىغان ، قايتا كىرىپ قايتا كىرىڭ",
+ "Encrypt the home storage" : "ئۆي ئامبىرىنى مەخپىيلەشتۈرۈڭ",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "بۇ تاللاشنى قوزغىتىش ئاساسلىق ساقلاش بوشلۇقىدا ساقلانغان بارلىق ھۆججەتلەرنى مەخپىيلەشتۈرىدۇ ، بولمىسا پەقەت سىرتقى ساقلىغۇچتىكى ھۆججەتلەرلا شىفىرلىنىدۇ",
+ "Enable recovery key" : "ئەسلىگە كەلتۈرۈش ئاچقۇچىنى قوزغىتىڭ",
+ "Disable recovery key" : "ئەسلىگە كەلتۈرۈش ئاچقۇچىنى چەكلەڭ",
+ "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." : "ئەسلىگە كەلتۈرۈش ئاچقۇچى ھۆججەتلەرنى مەخپىيلەشتۈرۈش ئۈچۈن ئىشلىتىلىدىغان قوشۇمچە شىفىرلاش ئاچقۇچى. پارول ئۇنتۇلۇپ قالسا ھېساباتتىكى ھۆججەتلەرنى ئەسلىگە كەلتۈرۈشكە ئىشلىتىلىدۇ.",
+ "Recovery key password" : "ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولى",
+ "Repeat recovery key password" : "ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولىنى تەكرارلاڭ",
+ "Change recovery key password:" : "ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولىنى ئۆزگەرتىش:",
+ "Old recovery key password" : "كونا ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولى",
+ "New recovery key password" : "يېڭى ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولى",
+ "Repeat new recovery key password" : "يېڭى ئەسلىگە كەلتۈرۈش ئاچقۇچ پارولىنى تەكرارلاڭ",
+ "Change Password" : "پارولنى ئۆزگەرتىش",
+ "Basic encryption module" : "ئاساسىي مەخپىيلەشتۈرۈش مودۇلى",
+ "Your private key password no longer matches your log-in password." : "شەخسىي ئاچقۇچ پارولىڭىز كىرىش پارولىڭىزغا ماس كەلمەيدۇ.",
+ "Set your old private key password to your current log-in password:" : "كونا شەخسىي پارولىڭىزنى نۆۋەتتىكى كىرىش پارولىڭىزغا تەڭشەڭ:",
+ "Old log-in password" : "كونا كىرىش پارولى",
+ "Current log-in password" : "نۆۋەتتىكى كىرىش پارولى",
+ "Update Private Key Password" : "شەخسىي ئاچقۇچ پارولىنى يېڭىلاڭ",
+ "Enable password recovery:" : "پارولنى ئەسلىگە كەلتۈرۈشنى قوزغىتىڭ:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "بۇ تاللانمىنى قوزغاتسىڭىز مەخپىي شىفىرلانغان ھۆججەتلەرنى مەخپىي شىفىرىڭىز يوقاپ كەتكەن ئەھۋال ئاستىدا قايتا زىيارەت قىلالايسىز",
+ "Enabled" : "قوزغىتىلدى",
+ "Disabled" : "چەكلەنگەن"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+} \ No newline at end of file
diff --git a/apps/encryption/l10n/uk.js b/apps/encryption/l10n/uk.js
index 55b22554ec1..d17b0892569 100644
--- a/apps/encryption/l10n/uk.js
+++ b/apps/encryption/l10n/uk.js
@@ -53,15 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "Основний модуль шифрування",
"Your private key password no longer matches your log-in password." : "Пароль вашого закритого ключа більше не відповідає паролю від вашого облікового запису.",
"Set your old private key password to your current log-in password:" : "Замініть старий пароль від закритого ключа на новий пароль входу:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до адміністратора щоб його відновити.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до вашого адміністратора для відновлення ваших файлів.",
"Old log-in password" : "Старий пароль входу",
"Current log-in password" : "Поточний пароль входу",
"Update Private Key Password" : "Оновити пароль для закритого ключа",
"Enable password recovery:" : "Ввімкнути відновлення паролю:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Включення цієї опції дозволить вам отримати доступ до своїх зашифрованих файлів у випадку втрати паролю",
"Enabled" : "Увімкнено",
- "Disabled" : "Вимкнено",
- "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 log-in password\" field and your current login-password." : "Будь ласка, відкрийте вебсторінку хмари, перейдіть до розділу \"Безпека\" у особистих налаштуваннях та оновіть пароль шифрування, для цього зазначте парольні фрази у полях \"Старий пароль для входу\" та поточний пароль.",
- "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." : "Ключ відновлення — це додатковий ключ шифрування, який використовується для шифрування файлів. Це дозволяє відновити файли користувача, якщо користувач забув свій пароль."
+ "Disabled" : "Вимкнено"
},
"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);");
diff --git a/apps/encryption/l10n/uk.json b/apps/encryption/l10n/uk.json
index 3e3c3c7cd07..6f2c589357e 100644
--- a/apps/encryption/l10n/uk.json
+++ b/apps/encryption/l10n/uk.json
@@ -51,15 +51,13 @@
"Basic encryption module" : "Основний модуль шифрування",
"Your private key password no longer matches your log-in password." : "Пароль вашого закритого ключа більше не відповідає паролю від вашого облікового запису.",
"Set your old private key password to your current log-in password:" : "Замініть старий пароль від закритого ключа на новий пароль входу:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до адміністратора щоб його відновити.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до вашого адміністратора для відновлення ваших файлів.",
"Old log-in password" : "Старий пароль входу",
"Current log-in password" : "Поточний пароль входу",
"Update Private Key Password" : "Оновити пароль для закритого ключа",
"Enable password recovery:" : "Ввімкнути відновлення паролю:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Включення цієї опції дозволить вам отримати доступ до своїх зашифрованих файлів у випадку втрати паролю",
"Enabled" : "Увімкнено",
- "Disabled" : "Вимкнено",
- "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 log-in password\" field and your current login-password." : "Будь ласка, відкрийте вебсторінку хмари, перейдіть до розділу \"Безпека\" у особистих налаштуваннях та оновіть пароль шифрування, для цього зазначте парольні фрази у полях \"Старий пароль для входу\" та поточний пароль.",
- "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." : "Ключ відновлення — це додатковий ключ шифрування, який використовується для шифрування файлів. Це дозволяє відновити файли користувача, якщо користувач забув свій пароль."
+ "Disabled" : "Вимкнено"
},"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);"
} \ 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/l10n/zh_CN.js b/apps/encryption/l10n/zh_CN.js
index e9bbae57ca4..79496467c11 100644
--- a/apps/encryption/l10n/zh_CN.js
+++ b/apps/encryption/l10n/zh_CN.js
@@ -23,20 +23,25 @@ OC.L10N.register(
"Private key password successfully updated." : "私钥密码成功更新。",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的加密应用程序私钥。请在您的个人设置中更新您的私钥密码,以恢复对加密文件的访问。",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "加密应用被启用了,但是您的加密密钥没有初始化。请重新登出登录系统一次。",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "请启用管理员设置中的服务器端加密,以使用加密模块。",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "请启用管理员设置中的服务端加密,以使用加密模块。",
"Encryption app is enabled and ready" : "加密应用程序已启用并准备就绪",
"Bad Signature" : "签名已损坏",
"Missing Signature" : "签名已丢失",
- "one-time password for server-side-encryption" : "用于服务器端加密的一次性密码",
- "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "法解密此文件,可能这是一个共享文件。请通知文件所有者与您重新共享该文件。 ",
- "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "无法读取此文件,可能这是一个共享文件。请通知文件所有者与您重新共享该文件。 ",
+ "one-time password for server-side-encryption" : "用于服务端加密的一次性密码",
+ "Encryption password" : "加密密码",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "服务器端加密已启用,您的文件已经使用密码<strong>%s</strong>加密。",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "服务器端加密已启用,您的文件已经使用密码“%s”加密。",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "请登录网络界面,进入个人设置的 \"安全\" 部分,在“旧登录密码”字段中输入此密码,并在当前登录密码中输入该密码,以更新您的加密密码。",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "无法解密此文件,可能这是一个共享文件。请通知文件所有者与你重新共享该文件。",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "无法读取此文件,可能这是一个共享文件。请通知文件所有者与你重新共享该文件。",
"Default encryption module" : "默认加密模块",
- "Default encryption module for server-side encryption" : "服务器端加密的默认加密模块",
+ "Default encryption module for server-side encryption" : "服务端加密的默认加密模块",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用已启用,但您的密钥未初始化,请登出并再次登录",
"Encrypt the home storage" : "加密主目录储存",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "启用此选项将加密存储在主存储上的所有文件,否则只会加密外部存储上的文件",
"Enable recovery key" : "启用恢复密钥",
"Disable recovery key" : "禁用恢复密钥",
+ "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." : "恢复密钥是用于加密文件的附加加密密钥。如果忘记密码,可以使用该密钥从帐户中恢复文件。",
"Recovery key password" : "恢复密钥密码",
"Repeat recovery key password" : "重复恢复密码",
"Change recovery key password:" : "更改恢复密钥密码:",
@@ -47,14 +52,12 @@ OC.L10N.register(
"Basic encryption module" : "基础加密模块",
"Your private key password no longer matches your log-in password." : "您的私钥不再与您的登录密码匹配。",
"Set your old private key password to your current log-in password:" : "将的私钥设置为当前登录密码:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "如果您记不住旧的密码,您可以请求管理员恢复您的文件。",
"Old log-in password" : "旧登录密码",
"Current log-in password" : "当前登录密码",
"Update Private Key Password" : "更新私钥密码",
"Enable password recovery:" : "启用密码恢复:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "启用该项将允许您在密码丢失后取回您的加密文件",
"Enabled" : "启用",
- "Disabled" : "禁用",
- "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." : "恢复密钥是用于加密文件的额外加密密钥。如果用户忘记了密码,它允许用户恢复文件。"
+ "Disabled" : "禁用"
},
"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/zh_CN.json b/apps/encryption/l10n/zh_CN.json
index 8580084640d..2d5411013dc 100644
--- a/apps/encryption/l10n/zh_CN.json
+++ b/apps/encryption/l10n/zh_CN.json
@@ -21,20 +21,25 @@
"Private key password successfully updated." : "私钥密码成功更新。",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的加密应用程序私钥。请在您的个人设置中更新您的私钥密码,以恢复对加密文件的访问。",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "加密应用被启用了,但是您的加密密钥没有初始化。请重新登出登录系统一次。",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "请启用管理员设置中的服务器端加密,以使用加密模块。",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "请启用管理员设置中的服务端加密,以使用加密模块。",
"Encryption app is enabled and ready" : "加密应用程序已启用并准备就绪",
"Bad Signature" : "签名已损坏",
"Missing Signature" : "签名已丢失",
- "one-time password for server-side-encryption" : "用于服务器端加密的一次性密码",
- "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "法解密此文件,可能这是一个共享文件。请通知文件所有者与您重新共享该文件。 ",
- "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "无法读取此文件,可能这是一个共享文件。请通知文件所有者与您重新共享该文件。 ",
+ "one-time password for server-side-encryption" : "用于服务端加密的一次性密码",
+ "Encryption password" : "加密密码",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "服务器端加密已启用,您的文件已经使用密码<strong>%s</strong>加密。",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "服务器端加密已启用,您的文件已经使用密码“%s”加密。",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "请登录网络界面,进入个人设置的 \"安全\" 部分,在“旧登录密码”字段中输入此密码,并在当前登录密码中输入该密码,以更新您的加密密码。",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "无法解密此文件,可能这是一个共享文件。请通知文件所有者与你重新共享该文件。",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "无法读取此文件,可能这是一个共享文件。请通知文件所有者与你重新共享该文件。",
"Default encryption module" : "默认加密模块",
- "Default encryption module for server-side encryption" : "服务器端加密的默认加密模块",
+ "Default encryption module for server-side encryption" : "服务端加密的默认加密模块",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用已启用,但您的密钥未初始化,请登出并再次登录",
"Encrypt the home storage" : "加密主目录储存",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "启用此选项将加密存储在主存储上的所有文件,否则只会加密外部存储上的文件",
"Enable recovery key" : "启用恢复密钥",
"Disable recovery key" : "禁用恢复密钥",
+ "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." : "恢复密钥是用于加密文件的附加加密密钥。如果忘记密码,可以使用该密钥从帐户中恢复文件。",
"Recovery key password" : "恢复密钥密码",
"Repeat recovery key password" : "重复恢复密码",
"Change recovery key password:" : "更改恢复密钥密码:",
@@ -45,14 +50,12 @@
"Basic encryption module" : "基础加密模块",
"Your private key password no longer matches your log-in password." : "您的私钥不再与您的登录密码匹配。",
"Set your old private key password to your current log-in password:" : "将的私钥设置为当前登录密码:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "如果您记不住旧的密码,您可以请求管理员恢复您的文件。",
"Old log-in password" : "旧登录密码",
"Current log-in password" : "当前登录密码",
"Update Private Key Password" : "更新私钥密码",
"Enable password recovery:" : "启用密码恢复:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "启用该项将允许您在密码丢失后取回您的加密文件",
"Enabled" : "启用",
- "Disabled" : "禁用",
- "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." : "恢复密钥是用于加密文件的额外加密密钥。如果用户忘记了密码,它允许用户恢复文件。"
+ "Disabled" : "禁用"
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/zh_HK.js b/apps/encryption/l10n/zh_HK.js
index a2d79030f1f..5084a5871f1 100644
--- a/apps/encryption/l10n/zh_HK.js
+++ b/apps/encryption/l10n/zh_HK.js
@@ -21,7 +21,7 @@ OC.L10N.register(
"The old password was not correct, please try again." : "舊密碼不正確,請再試一次",
"The current log-in password was not correct, please try again." : "目前登入的密碼不正確,請再試一次",
"Private key password successfully updated." : "私人密鑰密碼已成功更新。",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的加密應用程序私鑰。請在您的個人設定中更新您的私鑰密碼,以恢復對加密文件的訪問。",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的加密應用程序私鑰。請在您的個人設定中更新您的私鑰密碼,以恢復對加密檔案的訪問。",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "已啟用加密應用,但是你的加密密鑰沒有初始化。請重新登出並登入系統一次。",
"Please enable server side encryption in the admin settings in order to use the encryption module." : "請啟用管理員設定中的伺服器端加密,以使用加密模組。",
"Encryption app is enabled and ready" : "加密應用程式已啟用並準備就緒",
@@ -31,12 +31,12 @@ OC.L10N.register(
"Encryption password" : "加密密碼",
"The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "管理啟用了伺服器端加密 您的檔案已使用密碼 <strong>%s</strong> 加密。",
"The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "管理員啟用了伺服器端加密。您的檔案已使用密碼 \"%s\" 加密。",
- "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "請登錄到網絡界面,轉到您個人設置的「安全」部分,並通過在「舊登錄密碼」字段中輸入此密碼和您當前的登錄密碼來更新您的登入密碼。",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "請登錄到網絡界面,轉到您個人設置的「安全」部分,並通過在「舊登錄密碼」字段中輸入此密碼和您目前的登錄密碼來更新您的登入密碼。",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法解密這個檔案,也許這是分享的檔案。請讓檔案所有者與您重新共享檔案。",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法檢視這個檔案,或許這是分享的檔案。請讓檔案所有者與您重新共享檔案。",
"Default encryption module" : "默認加密模組",
"Default encryption module for server-side encryption" : "伺服器端的默認加密模組",
- "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "您需要在管理員設置中啟用服務器端加密才能使用此加密模塊您需要在管理員設置中啟用服務器端加密。啟用後,此模塊將透明地加密您的所有文件。加密基於 AES 256 密鑰。\n該模塊不會觸及現有文件,啟用伺服器端加密後只會對新檔案進行加密。也不可能再次禁用加密並切換回未加密的系統。\n在您決定啟用伺服器端加密之前,請閱讀文檔以了解所有含義。一旦啟用,此模塊將透明地加密您的所有文件。加密基於 AES 256 密鑰。\n該模塊不會觸及現有文件,啟伺服器端加密後只會對新文件進行加密。也不可能再次禁用加密並切換回未加密的系統。\n在您決定啟用伺服器端加密之前,請閱讀文檔以了解所有含義。",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "要使用此加密模塊,您需要在管理設置中啟用伺服器端加密。啟用後,此模塊將透明地加密您的所有檔案,加密基於 AES 256 密鑰。\n\n請注意,該模塊不會影響現有檔案;只有在啟用伺服器端加密後,新的檔案才會被加密。此外,一旦啟用加密,將無法再次禁用並切換回未加密的系統。\n\n在您決定啟用伺服器端加密之前,請仔細閱讀說明書以了解所有影響。",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "已啟用加密應用,但是你的加密密鑰沒有初始化。請重新登出並登入系統一次。",
"Encrypt the home storage" : "加密主要存儲空間",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "請啟用這個功能以用來加密主要儲存空間的檔案,否則只有再外部儲存的檔案會加密",
@@ -53,15 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "基本加密模組",
"Your private key password no longer matches your log-in password." : "您的私人密鑰密碼不符合您的登入密碼",
"Set your old private key password to your current log-in password:" : "設定您的舊私人密鑰密碼到您現在的登入密碼:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
"Old log-in password" : "舊登入密碼",
"Current log-in password" : "目前的登入密碼",
"Update Private Key Password" : "更新私人密鑰密碼",
"Enable password recovery:" : "啟用密碼還原﹕",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "啟用這個選項將會允許您因忘記密碼但需要存取您的加密檔案",
"Enabled" : "已啓用",
- "Disabled" : "已停用",
- "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 log-in password\" field and your current login-password." : "請登錄到網絡界面,轉到您個人設置的“安全”部分,並通過在“舊登錄密碼”字段中輸入此密碼和您當前的登錄密碼來更新您的登入密碼。",
- "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." : "加密密鑰是另一種加密檔案方式,當用戶忘記密碼時,可以用還原密鑰來還原檔案"
+ "Disabled" : "已停用"
},
"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/zh_HK.json b/apps/encryption/l10n/zh_HK.json
index e512c7a4591..e8e49796265 100644
--- a/apps/encryption/l10n/zh_HK.json
+++ b/apps/encryption/l10n/zh_HK.json
@@ -19,7 +19,7 @@
"The old password was not correct, please try again." : "舊密碼不正確,請再試一次",
"The current log-in password was not correct, please try again." : "目前登入的密碼不正確,請再試一次",
"Private key password successfully updated." : "私人密鑰密碼已成功更新。",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的加密應用程序私鑰。請在您的個人設定中更新您的私鑰密碼,以恢復對加密文件的訪問。",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的加密應用程序私鑰。請在您的個人設定中更新您的私鑰密碼,以恢復對加密檔案的訪問。",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "已啟用加密應用,但是你的加密密鑰沒有初始化。請重新登出並登入系統一次。",
"Please enable server side encryption in the admin settings in order to use the encryption module." : "請啟用管理員設定中的伺服器端加密,以使用加密模組。",
"Encryption app is enabled and ready" : "加密應用程式已啟用並準備就緒",
@@ -29,12 +29,12 @@
"Encryption password" : "加密密碼",
"The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "管理啟用了伺服器端加密 您的檔案已使用密碼 <strong>%s</strong> 加密。",
"The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "管理員啟用了伺服器端加密。您的檔案已使用密碼 \"%s\" 加密。",
- "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "請登錄到網絡界面,轉到您個人設置的「安全」部分,並通過在「舊登錄密碼」字段中輸入此密碼和您當前的登錄密碼來更新您的登入密碼。",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "請登錄到網絡界面,轉到您個人設置的「安全」部分,並通過在「舊登錄密碼」字段中輸入此密碼和您目前的登錄密碼來更新您的登入密碼。",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法解密這個檔案,也許這是分享的檔案。請讓檔案所有者與您重新共享檔案。",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法檢視這個檔案,或許這是分享的檔案。請讓檔案所有者與您重新共享檔案。",
"Default encryption module" : "默認加密模組",
"Default encryption module for server-side encryption" : "伺服器端的默認加密模組",
- "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "您需要在管理員設置中啟用服務器端加密才能使用此加密模塊您需要在管理員設置中啟用服務器端加密。啟用後,此模塊將透明地加密您的所有文件。加密基於 AES 256 密鑰。\n該模塊不會觸及現有文件,啟用伺服器端加密後只會對新檔案進行加密。也不可能再次禁用加密並切換回未加密的系統。\n在您決定啟用伺服器端加密之前,請閱讀文檔以了解所有含義。一旦啟用,此模塊將透明地加密您的所有文件。加密基於 AES 256 密鑰。\n該模塊不會觸及現有文件,啟伺服器端加密後只會對新文件進行加密。也不可能再次禁用加密並切換回未加密的系統。\n在您決定啟用伺服器端加密之前,請閱讀文檔以了解所有含義。",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "要使用此加密模塊,您需要在管理設置中啟用伺服器端加密。啟用後,此模塊將透明地加密您的所有檔案,加密基於 AES 256 密鑰。\n\n請注意,該模塊不會影響現有檔案;只有在啟用伺服器端加密後,新的檔案才會被加密。此外,一旦啟用加密,將無法再次禁用並切換回未加密的系統。\n\n在您決定啟用伺服器端加密之前,請仔細閱讀說明書以了解所有影響。",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "已啟用加密應用,但是你的加密密鑰沒有初始化。請重新登出並登入系統一次。",
"Encrypt the home storage" : "加密主要存儲空間",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "請啟用這個功能以用來加密主要儲存空間的檔案,否則只有再外部儲存的檔案會加密",
@@ -51,15 +51,13 @@
"Basic encryption module" : "基本加密模組",
"Your private key password no longer matches your log-in password." : "您的私人密鑰密碼不符合您的登入密碼",
"Set your old private key password to your current log-in password:" : "設定您的舊私人密鑰密碼到您現在的登入密碼:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
"Old log-in password" : "舊登入密碼",
"Current log-in password" : "目前的登入密碼",
"Update Private Key Password" : "更新私人密鑰密碼",
"Enable password recovery:" : "啟用密碼還原﹕",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "啟用這個選項將會允許您因忘記密碼但需要存取您的加密檔案",
"Enabled" : "已啓用",
- "Disabled" : "已停用",
- "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 log-in password\" field and your current login-password." : "請登錄到網絡界面,轉到您個人設置的“安全”部分,並通過在“舊登錄密碼”字段中輸入此密碼和您當前的登錄密碼來更新您的登入密碼。",
- "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." : "加密密鑰是另一種加密檔案方式,當用戶忘記密碼時,可以用還原密鑰來還原檔案"
+ "Disabled" : "已停用"
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/apps/encryption/l10n/zh_TW.js b/apps/encryption/l10n/zh_TW.js
index 523560205f2..ed7578821d5 100644
--- a/apps/encryption/l10n/zh_TW.js
+++ b/apps/encryption/l10n/zh_TW.js
@@ -2,8 +2,8 @@ OC.L10N.register(
"encryption",
{
"Missing recovery key password" : "遺失還原金鑰密碼",
- "Please repeat the recovery key password" : "請您再輸入新的還原金鑰密碼一次",
- "Repeated recovery key password does not match the provided recovery key password" : "輸入的還原金鑰密碼與設定的並不相符",
+ "Please repeat the recovery key password" : "請再次輸入還原金鑰密碼",
+ "Repeated recovery key password does not match the provided recovery key password" : "再次輸入的還原金鑰密碼與提供的不相符",
"Recovery key successfully enabled" : "還原金鑰已成功啟用",
"Could not enable recovery key. Please check your recovery key password!" : "無法啟用還原金鑰。請檢查您的還原金鑰密碼!",
"Recovery key successfully disabled" : "還原金鑰已成功停用",
@@ -11,27 +11,27 @@ OC.L10N.register(
"Missing parameters" : "遺失參數",
"Please provide the old recovery password" : "請提供舊的還原密碼",
"Please provide a new recovery password" : "請提供新的還原密碼",
- "Please repeat the new recovery password" : "請您再輸入新的還原密碼",
+ "Please repeat the new recovery password" : "請再次輸入新的還原密碼",
"Password successfully changed." : "成功變更密碼。",
"Could not change the password. Maybe the old password was not correct." : "無法變更密碼。或許是輸入的舊密碼不正確。",
- "Recovery Key disabled" : "還原金鑰停用",
- "Recovery Key enabled" : "還原金鑰啟用",
- "Could not enable the recovery key, please try again or contact your administrator" : "無法啟用還原金鑰功能,請重試或聯絡系統管理員",
+ "Recovery Key disabled" : "已停用還原金鑰",
+ "Recovery Key enabled" : "已啟用還原金鑰",
+ "Could not enable the recovery key, please try again or contact your administrator" : "無法啟用還原金鑰,請重試或聯絡系統管理員",
"Could not update the private key password." : "無法更新私鑰密碼。",
"The old password was not correct, please try again." : "舊密碼不正確,請再試一次。",
- "The current log-in password was not correct, please try again." : "目前登入的密碼不正確,請再試一次。",
+ "The current log-in password was not correct, please try again." : "目前的登入密碼不正確,請再試一次。",
"Private key password successfully updated." : "私鑰密碼已成功更新。",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "加密應用程式的私鑰無效。請在您的個人設定中更新您的私鑰密碼以恢復您對加密檔案的存取權。",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "加密應用程式的私鑰無效。請在您的個人設定中更新您的私鑰密碼,以恢復您對加密檔案的存取權。",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "已啟用加密應用程式,但您的金鑰並未初始化。請登出並再次登入。",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "請啟用管理員設定中的伺服器端加密,以使用加密模組。",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "請啟用管理員設定中的伺服器端加密以使用加密模組。",
"Encryption app is enabled and ready" : "加密應用程式已啟用並準備就緒",
- "Bad Signature" : "錯誤簽章",
+ "Bad Signature" : "不良簽章",
"Missing Signature" : "遺失簽章",
"one-time password for server-side-encryption" : "用於伺服器端加密的一次性密碼",
"Encryption password" : "加密密碼",
"The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "管理員啟用了伺服器端加密。您的檔案已使用密碼 <strong>%s</strong> 加密。",
"The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "管理員啟用了伺服器端加密。您的檔案已使用密碼「%s」加密。",
- "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "請登入網頁界面,請到個人設定中的「安全」區塊,透過輸入此密碼至「舊登入密碼」欄位與您目前的登入密碼來更新您的加密密碼。",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "請登入網頁介面,請到個人設定中的「安全」區塊,透過輸入此密碼至「舊登入密碼」欄位與您目前的登入密碼,來更新您的加密密碼。",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法解密這個檔案,也許這是分享的檔案。請要求檔案所有人重新分享檔案給您。",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法讀取這個檔案,也許這是分享的檔案。請要求檔案所有人重新分享檔案給您。",
"Default encryption module" : "預設加密模組",
@@ -39,29 +39,27 @@ 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." : "為了使用此加密模組,您必須在管理員設定中啟用伺服器端加密。啟用後,此模組將會加密您之後傳輸的所有檔案。此加密是以 AES 256 金鑰為基礎。\n此模組將不會處理既有的檔案,僅會加密在伺服器端加密啟用後的新檔案。同時也無法停用加密並切換回未加密的系統。\n在您決定啟用伺服器端加密前,請閱讀文件得知其實際作用與影響。",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "已啟用加密應用程式,但您的金鑰並未初始化,請登出並再次登入",
"Encrypt the home storage" : "加密家目錄儲存空間",
- "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "啟用此功能以加密所有主要儲存空間的檔案,否則僅有外部儲存空間的檔案會被加密。",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "啟用此功能以加密所有主要儲存空間的檔案,否則僅有外部儲存空間的檔案會被加密",
"Enable recovery key" : "啟用還原金鑰",
"Disable recovery key" : "停用還原金鑰",
"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." : "還原金鑰是用於加密檔案的額外加密金鑰。其用於忘記密碼時從帳號還原檔案。",
"Recovery key password" : "還原金鑰密碼",
- "Repeat recovery key password" : "再輸入還原金鑰密碼一次",
+ "Repeat recovery key password" : "再次輸入還原金鑰密碼",
"Change recovery key password:" : "變更還原金鑰密碼:",
"Old recovery key password" : "舊的還原金鑰密碼",
"New recovery key password" : "新的還原金鑰密碼",
- "Repeat new recovery key password" : "再輸入新的還原金鑰密碼一次",
+ "Repeat new recovery key password" : "再次輸入新的還原金鑰密碼",
"Change Password" : "變更密碼",
"Basic encryption module" : "基本加密模組",
- "Your private key password no longer matches your log-in password." : "您的私鑰密碼不符合您的登入密碼。",
- "Set your old private key password to your current log-in password:" : "設定您的舊私鑰密碼到您現在的登入密碼:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
+ "Your private key password no longer matches your log-in password." : "您的私鑰密碼與您的登入密碼不相符。",
+ "Set your old private key password to your current log-in password:" : "將您的舊私鑰密碼設為您現在的登入密碼:",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
"Old log-in password" : "舊登入密碼",
- "Current log-in password" : "目前的登入密碼",
+ "Current log-in password" : "目前登入密碼",
"Update Private Key Password" : "更新私鑰密碼",
"Enable password recovery:" : "啟用密碼還原:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "啟用此選項讓您可以在忘記密碼的情況下取回對您已加密檔案的存取權",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "啟用此選項,讓您可以在忘記密碼的情況下,取回對您已加密檔案的存取權",
"Enabled" : "已啟用",
- "Disabled" : "已停用",
- "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 log-in password\" field and your current login-password." : "請登入網頁界面,請到個人設定中的「安全」區塊,透過輸入此密碼至「舊登入密碼」欄位與您目前的登入密碼來更新您的加密密碼。",
- "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." : "還原金鑰是用於加密檔案的另一把加密金鑰。當使用者忘記密碼時,可以用它來還原使用者的檔案。"
+ "Disabled" : "已停用"
},
"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/zh_TW.json b/apps/encryption/l10n/zh_TW.json
index f532df430ff..961e5c1bee2 100644
--- a/apps/encryption/l10n/zh_TW.json
+++ b/apps/encryption/l10n/zh_TW.json
@@ -1,7 +1,7 @@
{ "translations": {
"Missing recovery key password" : "遺失還原金鑰密碼",
- "Please repeat the recovery key password" : "請您再輸入新的還原金鑰密碼一次",
- "Repeated recovery key password does not match the provided recovery key password" : "輸入的還原金鑰密碼與設定的並不相符",
+ "Please repeat the recovery key password" : "請再次輸入還原金鑰密碼",
+ "Repeated recovery key password does not match the provided recovery key password" : "再次輸入的還原金鑰密碼與提供的不相符",
"Recovery key successfully enabled" : "還原金鑰已成功啟用",
"Could not enable recovery key. Please check your recovery key password!" : "無法啟用還原金鑰。請檢查您的還原金鑰密碼!",
"Recovery key successfully disabled" : "還原金鑰已成功停用",
@@ -9,27 +9,27 @@
"Missing parameters" : "遺失參數",
"Please provide the old recovery password" : "請提供舊的還原密碼",
"Please provide a new recovery password" : "請提供新的還原密碼",
- "Please repeat the new recovery password" : "請您再輸入新的還原密碼",
+ "Please repeat the new recovery password" : "請再次輸入新的還原密碼",
"Password successfully changed." : "成功變更密碼。",
"Could not change the password. Maybe the old password was not correct." : "無法變更密碼。或許是輸入的舊密碼不正確。",
- "Recovery Key disabled" : "還原金鑰停用",
- "Recovery Key enabled" : "還原金鑰啟用",
- "Could not enable the recovery key, please try again or contact your administrator" : "無法啟用還原金鑰功能,請重試或聯絡系統管理員",
+ "Recovery Key disabled" : "已停用還原金鑰",
+ "Recovery Key enabled" : "已啟用還原金鑰",
+ "Could not enable the recovery key, please try again or contact your administrator" : "無法啟用還原金鑰,請重試或聯絡系統管理員",
"Could not update the private key password." : "無法更新私鑰密碼。",
"The old password was not correct, please try again." : "舊密碼不正確,請再試一次。",
- "The current log-in password was not correct, please try again." : "目前登入的密碼不正確,請再試一次。",
+ "The current log-in password was not correct, please try again." : "目前的登入密碼不正確,請再試一次。",
"Private key password successfully updated." : "私鑰密碼已成功更新。",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "加密應用程式的私鑰無效。請在您的個人設定中更新您的私鑰密碼以恢復您對加密檔案的存取權。",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "加密應用程式的私鑰無效。請在您的個人設定中更新您的私鑰密碼,以恢復您對加密檔案的存取權。",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "已啟用加密應用程式,但您的金鑰並未初始化。請登出並再次登入。",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "請啟用管理員設定中的伺服器端加密,以使用加密模組。",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "請啟用管理員設定中的伺服器端加密以使用加密模組。",
"Encryption app is enabled and ready" : "加密應用程式已啟用並準備就緒",
- "Bad Signature" : "錯誤簽章",
+ "Bad Signature" : "不良簽章",
"Missing Signature" : "遺失簽章",
"one-time password for server-side-encryption" : "用於伺服器端加密的一次性密碼",
"Encryption password" : "加密密碼",
"The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "管理員啟用了伺服器端加密。您的檔案已使用密碼 <strong>%s</strong> 加密。",
"The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "管理員啟用了伺服器端加密。您的檔案已使用密碼「%s」加密。",
- "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "請登入網頁界面,請到個人設定中的「安全」區塊,透過輸入此密碼至「舊登入密碼」欄位與您目前的登入密碼來更新您的加密密碼。",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "請登入網頁介面,請到個人設定中的「安全」區塊,透過輸入此密碼至「舊登入密碼」欄位與您目前的登入密碼,來更新您的加密密碼。",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法解密這個檔案,也許這是分享的檔案。請要求檔案所有人重新分享檔案給您。",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法讀取這個檔案,也許這是分享的檔案。請要求檔案所有人重新分享檔案給您。",
"Default encryption module" : "預設加密模組",
@@ -37,29 +37,27 @@
"In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "為了使用此加密模組,您必須在管理員設定中啟用伺服器端加密。啟用後,此模組將會加密您之後傳輸的所有檔案。此加密是以 AES 256 金鑰為基礎。\n此模組將不會處理既有的檔案,僅會加密在伺服器端加密啟用後的新檔案。同時也無法停用加密並切換回未加密的系統。\n在您決定啟用伺服器端加密前,請閱讀文件得知其實際作用與影響。",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "已啟用加密應用程式,但您的金鑰並未初始化,請登出並再次登入",
"Encrypt the home storage" : "加密家目錄儲存空間",
- "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "啟用此功能以加密所有主要儲存空間的檔案,否則僅有外部儲存空間的檔案會被加密。",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "啟用此功能以加密所有主要儲存空間的檔案,否則僅有外部儲存空間的檔案會被加密",
"Enable recovery key" : "啟用還原金鑰",
"Disable recovery key" : "停用還原金鑰",
"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." : "還原金鑰是用於加密檔案的額外加密金鑰。其用於忘記密碼時從帳號還原檔案。",
"Recovery key password" : "還原金鑰密碼",
- "Repeat recovery key password" : "再輸入還原金鑰密碼一次",
+ "Repeat recovery key password" : "再次輸入還原金鑰密碼",
"Change recovery key password:" : "變更還原金鑰密碼:",
"Old recovery key password" : "舊的還原金鑰密碼",
"New recovery key password" : "新的還原金鑰密碼",
- "Repeat new recovery key password" : "再輸入新的還原金鑰密碼一次",
+ "Repeat new recovery key password" : "再次輸入新的還原金鑰密碼",
"Change Password" : "變更密碼",
"Basic encryption module" : "基本加密模組",
- "Your private key password no longer matches your log-in password." : "您的私鑰密碼不符合您的登入密碼。",
- "Set your old private key password to your current log-in password:" : "設定您的舊私鑰密碼到您現在的登入密碼:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
+ "Your private key password no longer matches your log-in password." : "您的私鑰密碼與您的登入密碼不相符。",
+ "Set your old private key password to your current log-in password:" : "將您的舊私鑰密碼設為您現在的登入密碼:",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
"Old log-in password" : "舊登入密碼",
- "Current log-in password" : "目前的登入密碼",
+ "Current log-in password" : "目前登入密碼",
"Update Private Key Password" : "更新私鑰密碼",
"Enable password recovery:" : "啟用密碼還原:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "啟用此選項讓您可以在忘記密碼的情況下取回對您已加密檔案的存取權",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "啟用此選項,讓您可以在忘記密碼的情況下,取回對您已加密檔案的存取權",
"Enabled" : "已啟用",
- "Disabled" : "已停用",
- "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 log-in password\" field and your current login-password." : "請登入網頁界面,請到個人設定中的「安全」區塊,透過輸入此密碼至「舊登入密碼」欄位與您目前的登入密碼來更新您的加密密碼。",
- "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." : "還原金鑰是用於加密檔案的另一把加密金鑰。當使用者忘記密碼時,可以用它來還原使用者的檔案。"
+ "Disabled" : "已停用"
},"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 fa765de4248..b1bf93b9dea 100644
--- a/apps/encryption/lib/AppInfo/Application.php
+++ b/apps/encryption/lib/AppInfo/Application.php
@@ -7,67 +7,105 @@
*/
namespace OCA\Encryption\AppInfo;
+use OC\Core\Events\BeforePasswordResetEvent;
+use OC\Core\Events\PasswordResetEvent;
use OCA\Encryption\Crypto\Crypt;
use OCA\Encryption\Crypto\DecryptAll;
use OCA\Encryption\Crypto\EncryptAll;
use OCA\Encryption\Crypto\Encryption;
-use OCA\Encryption\HookManager;
-use OCA\Encryption\Hooks\UserHooks;
use OCA\Encryption\KeyManager;
-use OCA\Encryption\Recovery;
+use OCA\Encryption\Listeners\UserEventsListener;
use OCA\Encryption\Session;
use OCA\Encryption\Users\Setup;
use OCA\Encryption\Util;
+use OCP\AppFramework\App;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\Encryption\IManager;
+use OCP\EventDispatcher\IEventDispatcher;
use OCP\IConfig;
+use OCP\IL10N;
+use OCP\IUserSession;
+use OCP\User\Events\BeforePasswordUpdatedEvent;
+use OCP\User\Events\PasswordUpdatedEvent;
+use OCP\User\Events\UserCreatedEvent;
+use OCP\User\Events\UserDeletedEvent;
+use OCP\User\Events\UserLoggedInEvent;
+use OCP\User\Events\UserLoggedInWithCookieEvent;
+use OCP\User\Events\UserLoggedOutEvent;
use Psr\Log\LoggerInterface;
-class Application extends \OCP\AppFramework\App {
- /**
- * @param array $urlParams
- */
- public function __construct($urlParams = []) {
- parent::__construct('encryption', $urlParams);
+class Application extends App implements IBootstrap {
+ public const APP_ID = 'encryption';
+
+ public function __construct(array $urlParams = []) {
+ parent::__construct(self::APP_ID, $urlParams);
+ }
+
+ public function register(IRegistrationContext $context): void {
+ }
+
+ public function boot(IBootContext $context): void {
+ \OCP\Util::addScript(self::APP_ID, 'encryption');
+
+ $context->injectFn(function (IManager $encryptionManager) use ($context): void {
+ if (!($encryptionManager instanceof \OC\Encryption\Manager)) {
+ return;
+ }
+
+ if (!$encryptionManager->isReady()) {
+ return;
+ }
+
+ $context->injectFn($this->registerEncryptionModule(...));
+ $context->injectFn($this->registerEventListeners(...));
+ $context->injectFn($this->setUp(...));
+ });
}
public function setUp(IManager $encryptionManager) {
if ($encryptionManager->isEnabled()) {
/** @var Setup $setup */
- $setup = $this->getContainer()->query(Setup::class);
+ $setup = $this->getContainer()->get(Setup::class);
$setup->setupSystem();
}
}
- /**
- * register hooks
- */
- public function registerHooks(IConfig $config) {
- if (!$config->getSystemValueBool('maintenance')) {
- $container = $this->getContainer();
- $server = $container->getServer();
- // Register our hooks and fire them.
- $hookManager = new HookManager();
-
- $hookManager->registerHook([
- new UserHooks($container->query(KeyManager::class),
- $server->getUserManager(),
- $server->get(LoggerInterface::class),
- $container->query(Setup::class),
- $server->getUserSession(),
- $container->query(Util::class),
- $container->query(Session::class),
- $container->query(Crypt::class),
- $container->query(Recovery::class))
- ]);
+ public function registerEventListeners(
+ IConfig $config,
+ IEventDispatcher $eventDispatcher,
+ IManager $encryptionManager,
+ Util $util,
+ ): void {
+ if (!$encryptionManager->isEnabled()) {
+ return;
+ }
- $hookManager->fireHooks();
- } else {
+ if ($config->getSystemValueBool('maintenance')) {
// Logout user if we are in maintenance to force re-login
- $this->getContainer()->getServer()->getUserSession()->logout();
+ $this->getContainer()->get(IUserSession::class)->logout();
+ return;
+ }
+
+ // No maintenance so register all events
+ $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(
@@ -75,14 +113,14 @@ class Application extends \OCP\AppFramework\App {
Encryption::DISPLAY_NAME,
function () use ($container) {
return new Encryption(
- $container->query(Crypt::class),
- $container->query(KeyManager::class),
- $container->query(Util::class),
- $container->query(Session::class),
- $container->query(EncryptAll::class),
- $container->query(DecryptAll::class),
- $container->getServer()->get(LoggerInterface::class),
- $container->getServer()->getL10N($container->getAppName())
+ $container->get(Crypt::class),
+ $container->get(KeyManager::class),
+ $container->get(Util::class),
+ $container->get(Session::class),
+ $container->get(EncryptAll::class),
+ $container->get(DecryptAll::class),
+ $container->get(LoggerInterface::class),
+ $container->get(IL10N::class),
);
});
}
diff --git a/apps/encryption/lib/Command/DisableMasterKey.php b/apps/encryption/lib/Command/DisableMasterKey.php
index 7993ba38078..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
@@ -14,31 +15,15 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\ConfirmationQuestion;
class DisableMasterKey extends Command {
-
- /** @var Util */
- protected $util;
-
- /** @var IConfig */
- protected $config;
-
- /** @var QuestionHelper */
- protected $questionHelper;
-
- /**
- * @param Util $util
- * @param IConfig $config
- * @param QuestionHelper $questionHelper
- */
- public function __construct(Util $util,
- IConfig $config,
- QuestionHelper $questionHelper) {
- $this->util = $util;
- $this->config = $config;
- $this->questionHelper = $questionHelper;
+ public function __construct(
+ protected Util $util,
+ protected IConfig $config,
+ protected QuestionHelper $questionHelper,
+ ) {
parent::__construct();
}
- protected function configure() {
+ protected function configure(): void {
$this
->setName('encryption:disable-master-key')
->setDescription('Disable the master key and use per-user keys instead. Only available for fresh installations with no existing encrypted data! There is no way to enable it again.');
@@ -49,21 +34,23 @@ class DisableMasterKey extends Command {
if (!$isMasterKeyEnabled) {
$output->writeln('Master key already disabled');
- } else {
- $question = new ConfirmationQuestion(
- 'Warning: Only perform this operation for a fresh installations with no existing encrypted data! '
- . 'There is no way to enable the master key again. '
- . 'We strongly recommend to keep the master key, it provides significant performance improvements '
- . 'and is easier to handle for both, users and administrators. '
- . 'Do you really want to switch to per-user keys? (y/n) ', false);
- if ($this->questionHelper->ask($input, $output, $question)) {
- $this->config->setAppValue('encryption', 'useMasterKey', '0');
- $output->writeln('Master key successfully disabled.');
- } else {
- $output->writeln('aborted.');
- return 1;
- }
+ return self::SUCCESS;
+ }
+
+ $question = new ConfirmationQuestion(
+ 'Warning: Only perform this operation for a fresh installations with no existing encrypted data! '
+ . 'There is no way to enable the master key again. '
+ . 'We strongly recommend to keep the master key, it provides significant performance improvements '
+ . 'and is easier to handle for both, users and administrators. '
+ . 'Do you really want to switch to per-user keys? (y/n) ', false);
+
+ if ($this->questionHelper->ask($input, $output, $question)) {
+ $this->config->setAppValue('encryption', 'useMasterKey', '0');
+ $output->writeln('Master key successfully disabled.');
+ return self::SUCCESS;
}
- return 0;
+
+ $output->writeln('aborted.');
+ return self::FAILURE;
}
}
diff --git a/apps/encryption/lib/Command/DropLegacyFileKey.php b/apps/encryption/lib/Command/DropLegacyFileKey.php
index c9f6e9440e2..a9add1ad93b 100644
--- a/apps/encryption/lib/Command/DropLegacyFileKey.php
+++ b/apps/encryption/lib/Command/DropLegacyFileKey.php
@@ -58,10 +58,10 @@ class DropLegacyFileKey extends Command {
if ($result) {
$output->writeln('All scanned files are properly encrypted.');
- return 0;
+ return self::SUCCESS;
}
- return 1;
+ return self::FAILURE;
}
private function scanFolder(OutputInterface $output, string $folder): bool {
@@ -114,10 +114,10 @@ class DropLegacyFileKey extends Command {
$copyResource = $this->rootView->fopen($target, 'r');
$sourceResource = $this->rootView->fopen($source, 'w');
if ($copyResource === false || $sourceResource === false) {
- throw new DecryptionFailedException('Failed to open '.$source.' or '.$target);
+ throw new DecryptionFailedException('Failed to open ' . $source . ' or ' . $target);
}
if (stream_copy_to_stream($copyResource, $sourceResource) === false) {
- $output->writeln('<error>Failed to copy '.$target.' data into '.$source.'</error>');
+ $output->writeln('<error>Failed to copy ' . $target . ' data into ' . $source . '</error>');
$output->writeln('<error>Leaving both files in there to avoid data loss</error>');
return;
}
diff --git a/apps/encryption/lib/Command/EnableMasterKey.php b/apps/encryption/lib/Command/EnableMasterKey.php
index 98ad58e1bf8..0d8b893e0e2 100644
--- a/apps/encryption/lib/Command/EnableMasterKey.php
+++ b/apps/encryption/lib/Command/EnableMasterKey.php
@@ -16,31 +16,15 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\ConfirmationQuestion;
class EnableMasterKey extends Command {
-
- /** @var Util */
- protected $util;
-
- /** @var IConfig */
- protected $config;
-
- /** @var QuestionHelper */
- protected $questionHelper;
-
- /**
- * @param Util $util
- * @param IConfig $config
- * @param QuestionHelper $questionHelper
- */
- public function __construct(Util $util,
- IConfig $config,
- QuestionHelper $questionHelper) {
- $this->util = $util;
- $this->config = $config;
- $this->questionHelper = $questionHelper;
+ public function __construct(
+ protected Util $util,
+ protected IConfig $config,
+ protected QuestionHelper $questionHelper,
+ ) {
parent::__construct();
}
- protected function configure() {
+ protected function configure(): void {
$this
->setName('encryption:enable-master-key')
->setDescription('Enable the master key. Only available for fresh installations with no existing encrypted data! There is also no way to disable it again.');
@@ -51,18 +35,20 @@ class EnableMasterKey extends Command {
if ($isAlreadyEnabled) {
$output->writeln('Master key already enabled');
- } else {
- $question = new ConfirmationQuestion(
- 'Warning: Only available for fresh installations with no existing encrypted data! '
+ return self::SUCCESS;
+ }
+
+ $question = new ConfirmationQuestion(
+ 'Warning: Only available for fresh installations with no existing encrypted data! '
. 'There is also no way to disable it again. Do you want to continue? (y/n) ', false);
- if ($this->questionHelper->ask($input, $output, $question)) {
- $this->config->setAppValue('encryption', 'useMasterKey', '1');
- $output->writeln('Master key successfully enabled.');
- } else {
- $output->writeln('aborted.');
- return 1;
- }
+
+ if ($this->questionHelper->ask($input, $output, $question)) {
+ $this->config->setAppValue('encryption', 'useMasterKey', '1');
+ $output->writeln('Master key successfully enabled.');
+ return self::SUCCESS;
}
- return 0;
+
+ $output->writeln('aborted.');
+ return self::FAILURE;
}
}
diff --git a/apps/encryption/lib/Command/FixEncryptedVersion.php b/apps/encryption/lib/Command/FixEncryptedVersion.php
index 36f4ee3620e..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;
@@ -25,7 +26,7 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
class FixEncryptedVersion extends Command {
- private bool $supportLegacy;
+ private bool $supportLegacy = false;
public function __construct(
private IConfig $config,
@@ -35,8 +36,6 @@ class FixEncryptedVersion extends Command {
private Util $util,
private View $view,
) {
- $this->supportLegacy = false;
-
parent::__construct();
}
@@ -69,47 +68,49 @@ class FixEncryptedVersion extends Command {
if ($skipSignatureCheck) {
$output->writeln("<error>Repairing is not possible when \"encryption_skip_signature_check\" is set. Please disable this flag in the configuration.</error>\n");
- return 1;
+ return self::FAILURE;
}
if (!$this->util->isMasterKeyEnabled()) {
$output->writeln("<error>Repairing only works with master key encryption.</error>\n");
- return 1;
+ return self::FAILURE;
}
$user = $input->getArgument('user');
$all = $input->getOption('all');
$pathOption = \trim(($input->getOption('path') ?? ''), '/');
+ if (!$user && !$all) {
+ $output->writeln('Either a user id or --all needs to be provided');
+ return self::FAILURE;
+ }
+
if ($user) {
if ($all) {
- $output->writeln("Specifying a user id and --all are mutually exclusive");
- return 1;
+ $output->writeln('Specifying a user id and --all are mutually exclusive');
+ return self::FAILURE;
}
if ($this->userManager->get($user) === null) {
$output->writeln("<error>User id $user does not exist. Please provide a valid user id</error>");
- return 1;
+ return self::FAILURE;
}
return $this->runForUser($user, $pathOption, $output);
- } elseif ($all) {
- $result = 0;
- $this->userManager->callForSeenUsers(function (IUser $user) use ($pathOption, $output, &$result) {
- $output->writeln("Processing files for " . $user->getUID());
- $result = $this->runForUser($user->getUID(), $pathOption, $output);
- return $result === 0;
- });
- return $result;
- } else {
- $output->writeln("Either a user id or --all needs to be provided");
- return 1;
}
+
+ $result = 0;
+ $this->userManager->callForSeenUsers(function (IUser $user) use ($pathOption, $output, &$result) {
+ $output->writeln('Processing files for ' . $user->getUID());
+ $result = $this->runForUser($user->getUID(), $pathOption, $output);
+ return $result === 0;
+ });
+ return $result;
}
private function runForUser(string $user, string $pathOption, OutputInterface $output): int {
$pathToWalk = "/$user/files";
- if ($pathOption !== "") {
+ if ($pathOption !== '') {
$pathToWalk = "$pathToWalk/$pathOption";
}
return $this->walkPathOfUser($user, $pathToWalk, $output);
@@ -122,13 +123,13 @@ class FixEncryptedVersion extends Command {
$this->setupUserFs($user);
if (!$this->view->file_exists($path)) {
$output->writeln("<error>Path \"$path\" does not exist. Please provide a valid path.</error>");
- return 1;
+ return self::FAILURE;
}
if ($this->view->is_file($path)) {
$output->writeln("Verifying the content of file \"$path\"");
$this->verifyFileContent($path, $output);
- return 0;
+ return self::SUCCESS;
}
$directories = [];
$directories[] = $path;
@@ -144,7 +145,7 @@ class FixEncryptedVersion extends Command {
}
}
}
- return 0;
+ return self::SUCCESS;
}
/**
@@ -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) {
@@ -205,7 +206,7 @@ class FixEncryptedVersion extends Command {
}
return false;
} catch (HintException $e) {
- $this->logger->warning("Issue: " . $e->getMessage());
+ $this->logger->warning('Issue: ' . $e->getMessage());
// If allowOnce is set to false, this becomes recursive.
if ($ignoreCorrectEncVersionCall === true) {
// Lets rectify the file by correcting encrypted version
@@ -254,7 +255,7 @@ class FixEncryptedVersion extends Command {
// try with zero first
$cacheInfo = ['encryptedVersion' => 0, 'encrypted' => 0];
$cache->put($fileCache->getPath(), $cacheInfo);
- $output->writeln("<info>Set the encrypted version to 0 (unencrypted)</info>");
+ $output->writeln('<info>Set the encrypted version to 0 (unencrypted)</info>');
if ($this->verifyFileContent($path, $output, false) === true) {
$output->writeln("<info>Fixed the file: \"$path\" with version 0 (unencrypted)</info>");
return true;
@@ -268,7 +269,7 @@ class FixEncryptedVersion extends Command {
$cache->put($fileCache->getPath(), $cacheInfo);
$output->writeln("<info>Decrement the encrypted version to $encryptedVersion</info>");
if ($this->verifyFileContent($path, $output, false) === true) {
- $output->writeln("<info>Fixed the file: \"$path\" with version " . $encryptedVersion . "</info>");
+ $output->writeln("<info>Fixed the file: \"$path\" with version " . $encryptedVersion . '</info>');
return true;
}
$encryptedVersion--;
@@ -291,7 +292,7 @@ class FixEncryptedVersion extends Command {
$cache->put($fileCache->getPath(), $cacheInfo);
$output->writeln("<info>Increment the encrypted version to $newEncryptedVersion</info>");
if ($this->verifyFileContent($path, $output, false) === true) {
- $output->writeln("<info>Fixed the file: \"$path\" with version " . $newEncryptedVersion . "</info>");
+ $output->writeln("<info>Fixed the file: \"$path\" with version " . $newEncryptedVersion . '</info>');
return true;
}
$increment++;
diff --git a/apps/encryption/lib/Command/FixKeyLocation.php b/apps/encryption/lib/Command/FixKeyLocation.php
index cb3408f77f1..da529a4be2f 100644
--- a/apps/encryption/lib/Command/FixKeyLocation.php
+++ b/apps/encryption/lib/Command/FixKeyLocation.php
@@ -28,29 +28,21 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
class FixKeyLocation extends Command {
- private IUserManager $userManager;
- private IUserMountCache $userMountCache;
- private Util $encryptionUtil;
- private IRootFolder $rootFolder;
private string $keyRootDirectory;
private View $rootView;
private Manager $encryptionManager;
public function __construct(
- IUserManager $userManager,
- IUserMountCache $userMountCache,
- Util $encryptionUtil,
- IRootFolder $rootFolder,
- IManager $encryptionManager
+ private IUserManager $userManager,
+ private IUserMountCache $userMountCache,
+ private Util $encryptionUtil,
+ private IRootFolder $rootFolder,
+ IManager $encryptionManager,
) {
- $this->userManager = $userManager;
- $this->userMountCache = $userMountCache;
- $this->encryptionUtil = $encryptionUtil;
- $this->rootFolder = $rootFolder;
$this->keyRootDirectory = rtrim($this->encryptionUtil->getKeyStorageRoot(), '/');
$this->rootView = new View();
if (!$encryptionManager instanceof Manager) {
- throw new \Exception("Wrong encryption manager");
+ throw new \Exception('Wrong encryption manager');
}
$this->encryptionManager = $encryptionManager;
@@ -65,7 +57,7 @@ class FixKeyLocation extends Command {
->setName('encryption:fix-key-location')
->setDescription('Fix the location of encryption keys for external storage')
->addOption('dry-run', null, InputOption::VALUE_NONE, "Only list files that require key migration, don't try to perform any migration")
- ->addArgument('user', InputArgument::REQUIRED, "User id to fix the key locations for");
+ ->addArgument('user', InputArgument::REQUIRED, 'User id to fix the key locations for');
}
protected function execute(InputInterface $input, OutputInterface $output): int {
@@ -74,7 +66,7 @@ class FixKeyLocation extends Command {
$user = $this->userManager->get($userId);
if (!$user) {
$output->writeln("<error>User $userId not found</error>");
- return 1;
+ return self::FAILURE;
}
\OC_Util::setupFS($user->getUID());
@@ -83,7 +75,7 @@ class FixKeyLocation extends Command {
foreach ($mounts as $mount) {
$mountRootFolder = $this->rootFolder->get($mount->getMountPoint());
if (!$mountRootFolder instanceof Folder) {
- $output->writeln("<error>System wide mount point is not a directory, skipping: " . $mount->getMountPoint() . "</error>");
+ $output->writeln('<error>System wide mount point is not a directory, skipping: ' . $mount->getMountPoint() . '</error>');
continue;
}
@@ -97,14 +89,14 @@ class FixKeyLocation extends Command {
// key was stored incorrectly as user key, migrate
if ($dryRun) {
- $output->writeln("<info>" . $file->getPath() . "</info> needs migration");
+ $output->writeln('<info>' . $file->getPath() . '</info> needs migration');
} else {
- $output->write("Migrating key for <info>" . $file->getPath() . "</info> ");
+ $output->write('Migrating key for <info>' . $file->getPath() . '</info> ');
if ($this->copyUserKeyToSystemAndValidate($user, $file)) {
- $output->writeln("<info>✓</info>");
+ $output->writeln('<info>✓</info>');
} else {
- $output->writeln("<fg=red>❌</>");
- $output->writeln(" Failed to validate key for <error>" . $file->getPath() . "</error>, key will not be migrated");
+ $output->writeln('<fg=red>❌</>');
+ $output->writeln(' Failed to validate key for <error>' . $file->getPath() . '</error>, key will not be migrated');
}
}
} else {
@@ -115,42 +107,42 @@ class FixKeyLocation extends Command {
if ($isActuallyEncrypted) {
if ($dryRun) {
if ($shouldBeEncrypted) {
- $output->write("<info>" . $file->getPath() . "</info> needs migration");
+ $output->write('<info>' . $file->getPath() . '</info> needs migration');
} else {
- $output->write("<info>" . $file->getPath() . "</info> needs decryption");
+ $output->write('<info>' . $file->getPath() . '</info> needs decryption');
}
$foundKey = $this->findUserKeyForSystemFile($user, $file);
if ($foundKey) {
- $output->writeln(", valid key found at <info>" . $foundKey . "</info>");
+ $output->writeln(', valid key found at <info>' . $foundKey . '</info>');
} else {
- $output->writeln(" <error>❌ No key found</error>");
+ $output->writeln(' <error>❌ No key found</error>');
}
} else {
if ($shouldBeEncrypted) {
- $output->write("<info>Migrating key for " . $file->getPath() . "</info>");
+ $output->write('<info>Migrating key for ' . $file->getPath() . '</info>');
} else {
- $output->write("<info>Decrypting " . $file->getPath() . "</info>");
+ $output->write('<info>Decrypting ' . $file->getPath() . '</info>');
}
$foundKey = $this->findUserKeyForSystemFile($user, $file);
if ($foundKey) {
if ($shouldBeEncrypted) {
$systemKeyPath = $this->getSystemKeyPath($file);
$this->rootView->copy($foundKey, $systemKeyPath);
- $output->writeln(" Migrated key from <info>" . $foundKey . "</info>");
+ $output->writeln(' Migrated key from <info>' . $foundKey . '</info>');
} else {
$this->decryptWithSystemKey($file, $foundKey);
- $output->writeln(" Decrypted with key from <info>" . $foundKey . "</info>");
+ $output->writeln(' Decrypted with key from <info>' . $foundKey . '</info>');
}
} else {
- $output->writeln(" <error>❌ No key found</error>");
+ $output->writeln(' <error>❌ No key found</error>');
}
}
} else {
if ($dryRun) {
- $output->writeln("<info>" . $file->getPath() . " needs to be marked as not encrypted</info>");
+ $output->writeln('<info>' . $file->getPath() . ' needs to be marked as not encrypted</info>');
} else {
$this->markAsUnEncrypted($file);
- $output->writeln("<info>" . $file->getPath() . " marked as not encrypted</info>");
+ $output->writeln('<info>' . $file->getPath() . ' marked as not encrypted</info>');
}
}
}
@@ -158,7 +150,7 @@ class FixKeyLocation extends Command {
}
}
- return 0;
+ return self::SUCCESS;
}
private function getUserRelativePath(string $path): string {
@@ -171,7 +163,6 @@ class FixKeyLocation extends Command {
}
/**
- * @param IUser $user
* @return ICachedMountInfo[]
*/
private function getSystemMountsForUser(IUser $user): array {
@@ -186,7 +177,6 @@ class FixKeyLocation extends Command {
/**
* Get all files in a folder which are marked as encrypted
*
- * @param Folder $folder
* @return \Generator<File>
*/
private function getAllEncryptedFiles(Folder $folder) {
@@ -227,10 +217,6 @@ class FixKeyLocation extends Command {
/**
* Check that the user key stored for a file can decrypt the file
- *
- * @param IUser $user
- * @param File $node
- * @return bool
*/
private function copyUserKeyToSystemAndValidate(IUser $user, File $node): bool {
$path = trim(substr($node->getPath(), strlen($user->getUID()) + 1), '/');
@@ -267,7 +253,6 @@ class FixKeyLocation extends Command {
/**
* Get the contents of a file without decrypting it
*
- * @param File $node
* @return resource
*/
private function openWithoutDecryption(File $node, string $mode) {
@@ -288,16 +273,13 @@ class FixKeyLocation extends Command {
}
/** @var resource|false $handle */
if ($handle === false) {
- throw new \Exception("Failed to open " . $node->getPath());
+ throw new \Exception('Failed to open ' . $node->getPath());
}
return $handle;
}
/**
* Check if the data stored for a file is encrypted, regardless of it's metadata
- *
- * @param File $node
- * @return bool
*/
private function isDataEncrypted(File $node): bool {
$handle = $this->openWithoutDecryption($node, 'r');
@@ -310,9 +292,6 @@ class FixKeyLocation extends Command {
/**
* Attempt to find a key (stored for user) for a file (that needs a system key) even when it's not stored in the expected location
- *
- * @param File $node
- * @return string
*/
private function findUserKeyForSystemFile(IUser $user, File $node): ?string {
$userKeyPath = $this->getUserBaseKeyPath($user);
@@ -328,8 +307,6 @@ class FixKeyLocation extends Command {
/**
* Attempt to find a key for a file even when it's not stored in the expected location
*
- * @param string $basePath
- * @param string $name
* @return \Generator<string>
*/
private function findKeysByFileName(string $basePath, string $name) {
@@ -339,7 +316,7 @@ class FixKeyLocation extends Command {
/** @var false|resource $dh */
$dh = $this->rootView->opendir($basePath);
if (!$dh) {
- throw new \Exception("Invalid base path " . $basePath);
+ throw new \Exception('Invalid base path ' . $basePath);
}
while ($child = readdir($dh)) {
if ($child != '..' && $child != '.') {
@@ -356,11 +333,6 @@ class FixKeyLocation extends Command {
/**
* Test if the provided key is valid as a system key for the file
- *
- * @param IUser $user
- * @param string $key
- * @param File $node
- * @return bool
*/
private function testSystemKey(IUser $user, string $key, File $node): bool {
$systemKeyPath = $this->getSystemKeyPath($node);
@@ -378,10 +350,6 @@ class FixKeyLocation extends Command {
/**
* Decrypt a file with the specified system key and mark the key as not-encrypted
- *
- * @param File $node
- * @param string $key
- * @return void
*/
private function decryptWithSystemKey(File $node, string $key): void {
$storage = $node->getStorage();
@@ -398,7 +366,7 @@ class FixKeyLocation extends Command {
/** @var false|resource $source */
$source = $storage->fopen($node->getInternalPath(), 'r');
if (!$source) {
- throw new \Exception("Failed to open " . $node->getPath() . " with " . $key);
+ throw new \Exception('Failed to open ' . $node->getPath() . ' with ' . $key);
}
$decryptedNode = $node->getParent()->newFile($name);
@@ -418,7 +386,7 @@ class FixKeyLocation extends Command {
}
if ($this->isDataEncrypted($decryptedNode)) {
- throw new \Exception($node->getPath() . " still encrypted after attempting to decrypt with " . $key);
+ throw new \Exception($node->getPath() . ' still encrypted after attempting to decrypt with ' . $key);
}
$this->markAsUnEncrypted($decryptedNode);
diff --git a/apps/encryption/lib/Command/RecoverUser.php b/apps/encryption/lib/Command/RecoverUser.php
index fcdc3f15fb5..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
@@ -16,33 +17,16 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\Question;
class RecoverUser extends Command {
-
- /** @var Util */
- protected $util;
-
- /** @var IUserManager */
- protected $userManager;
-
- /** @var QuestionHelper */
- protected $questionHelper;
-
- /**
- * @param Util $util
- * @param IConfig $config
- * @param IUserManager $userManager
- * @param QuestionHelper $questionHelper
- */
- public function __construct(Util $util,
+ public function __construct(
+ protected Util $util,
IConfig $config,
- IUserManager $userManager,
- QuestionHelper $questionHelper) {
- $this->util = $util;
- $this->questionHelper = $questionHelper;
- $this->userManager = $userManager;
+ protected IUserManager $userManager,
+ protected QuestionHelper $questionHelper,
+ ) {
parent::__construct();
}
- protected function configure() {
+ protected function configure(): void {
$this
->setName('encryption:recover-user')
->setDescription('Recover user data in case of password lost. This only works if the user enabled the recovery key.');
@@ -59,20 +43,20 @@ class RecoverUser extends Command {
if ($isMasterKeyEnabled) {
$output->writeln('You use the master key, no individual user recovery needed.');
- return 0;
+ return self::SUCCESS;
}
$uid = $input->getArgument('user');
$userExists = $this->userManager->userExists($uid);
if ($userExists === false) {
$output->writeln('User "' . $uid . '" unknown.');
- return 1;
+ return self::FAILURE;
}
$recoveryKeyEnabled = $this->util->isRecoveryEnabledForUser($uid);
if ($recoveryKeyEnabled === false) {
$output->writeln('Recovery key is not enabled for: ' . $uid);
- return 1;
+ return self::FAILURE;
}
$question = new Question('Please enter the recovery key password: ');
@@ -88,6 +72,6 @@ class RecoverUser extends Command {
$output->write('Start to recover users files... This can take some time...');
$this->userManager->get($uid)->setPassword($newLoginPassword, $recoveryPassword);
$output->writeln('Done.');
- return 0;
+ return self::SUCCESS;
}
}
diff --git a/apps/encryption/lib/Command/ScanLegacyFormat.php b/apps/encryption/lib/Command/ScanLegacyFormat.php
index 07cfcfdade5..1e46a3d7545 100644
--- a/apps/encryption/lib/Command/ScanLegacyFormat.php
+++ b/apps/encryption/lib/Command/ScanLegacyFormat.php
@@ -18,40 +18,20 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class ScanLegacyFormat extends Command {
- /** @var Util */
- protected $util;
-
- /** @var IConfig */
- protected $config;
-
- /** @var QuestionHelper */
- protected $questionHelper;
-
- /** @var IUserManager */
- private $userManager;
-
- /** @var View */
- private $rootView;
-
- /**
- * @param Util $util
- * @param IConfig $config
- * @param QuestionHelper $questionHelper
- */
- public function __construct(Util $util,
- IConfig $config,
- QuestionHelper $questionHelper,
- IUserManager $userManager) {
+ private View $rootView;
+
+ public function __construct(
+ protected Util $util,
+ protected IConfig $config,
+ protected QuestionHelper $questionHelper,
+ private IUserManager $userManager,
+ ) {
parent::__construct();
- $this->util = $util;
- $this->config = $config;
- $this->questionHelper = $questionHelper;
- $this->userManager = $userManager;
$this->rootView = new View();
}
- protected function configure() {
+ protected function configure(): void {
$this
->setName('encryption:scan:legacy-format')
->setDescription('Scan the files for the legacy format');
@@ -78,10 +58,10 @@ class ScanLegacyFormat extends Command {
if ($result) {
$output->writeln('All scanned files are properly encrypted. You can disable the legacy compatibility mode.');
- return 0;
+ return self::SUCCESS;
}
- return 1;
+ return self::FAILURE;
}
private function scanFolder(OutputInterface $output, string $folder): bool {
@@ -112,10 +92,8 @@ class ScanLegacyFormat extends Command {
/**
* setup user file system
- *
- * @param string $uid
*/
- protected function setupUserFS($uid) {
+ protected function setupUserFS(string $uid): void {
\OC_Util::tearDownFS();
\OC_Util::setupFS($uid);
}
diff --git a/apps/encryption/lib/Controller/RecoveryController.php b/apps/encryption/lib/Controller/RecoveryController.php
index 3f39b0d929f..d75406e6319 100644
--- a/apps/encryption/lib/Controller/RecoveryController.php
+++ b/apps/encryption/lib/Controller/RecoveryController.php
@@ -10,6 +10,7 @@ namespace OCA\Encryption\Controller;
use OCA\Encryption\Recovery;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\DataResponse;
use OCP\IConfig;
use OCP\IL10N;
@@ -17,34 +18,20 @@ use OCP\IRequest;
class RecoveryController extends Controller {
/**
- * @var IConfig
- */
- private $config;
- /**
- * @var IL10N
- */
- private $l;
- /**
- * @var Recovery
- */
- private $recovery;
-
- /**
* @param string $AppName
* @param IRequest $request
* @param IConfig $config
- * @param IL10N $l10n
+ * @param IL10N $l
* @param Recovery $recovery
*/
- public function __construct($AppName,
+ public function __construct(
+ $AppName,
IRequest $request,
- IConfig $config,
- IL10N $l10n,
- Recovery $recovery) {
+ private IConfig $config,
+ private IL10N $l,
+ private Recovery $recovery,
+ ) {
parent::__construct($AppName, $request);
- $this->config = $config;
- $this->l = $l10n;
- $this->recovery = $recovery;
}
/**
@@ -136,11 +123,10 @@ class RecoveryController extends Controller {
}
/**
- * @NoAdminRequired
- *
* @param string $userEnableRecovery
* @return DataResponse
*/
+ #[NoAdminRequired]
public function userSetRecovery($userEnableRecovery) {
if ($userEnableRecovery === '0' || $userEnableRecovery === '1') {
$result = $this->recovery->setRecoveryForUser($userEnableRecovery);
diff --git a/apps/encryption/lib/Controller/SettingsController.php b/apps/encryption/lib/Controller/SettingsController.php
index a28f2a11af2..8548ea51c04 100644
--- a/apps/encryption/lib/Controller/SettingsController.php
+++ b/apps/encryption/lib/Controller/SettingsController.php
@@ -13,6 +13,8 @@ use OCA\Encryption\Session;
use OCA\Encryption\Util;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\Attribute\UseSession;
use OCP\AppFramework\Http\DataResponse;
use OCP\IL10N;
use OCP\IRequest;
@@ -22,34 +24,10 @@ use OCP\IUserSession;
class SettingsController extends Controller {
- /** @var IL10N */
- private $l;
-
- /** @var IUserManager */
- private $userManager;
-
- /** @var IUserSession */
- private $userSession;
-
- /** @var KeyManager */
- private $keyManager;
-
- /** @var Crypt */
- private $crypt;
-
- /** @var Session */
- private $session;
-
- /** @var ISession */
- private $ocSession;
-
- /** @var Util */
- private $util;
-
/**
* @param string $AppName
* @param IRequest $request
- * @param IL10N $l10n
+ * @param IL10N $l
* @param IUserManager $userManager
* @param IUserSession $userSession
* @param KeyManager $keyManager
@@ -58,37 +36,29 @@ class SettingsController extends Controller {
* @param ISession $ocSession
* @param Util $util
*/
- public function __construct($AppName,
+ public function __construct(
+ $AppName,
IRequest $request,
- IL10N $l10n,
- IUserManager $userManager,
- IUserSession $userSession,
- KeyManager $keyManager,
- Crypt $crypt,
- Session $session,
- ISession $ocSession,
- Util $util
+ private IL10N $l,
+ private IUserManager $userManager,
+ private IUserSession $userSession,
+ private KeyManager $keyManager,
+ private Crypt $crypt,
+ private Session $session,
+ private ISession $ocSession,
+ private Util $util,
) {
parent::__construct($AppName, $request);
- $this->l = $l10n;
- $this->userSession = $userSession;
- $this->userManager = $userManager;
- $this->keyManager = $keyManager;
- $this->crypt = $crypt;
- $this->session = $session;
- $this->ocSession = $ocSession;
- $this->util = $util;
}
/**
- * @NoAdminRequired
- * @UseSession
- *
* @param string $oldPassword
* @param string $newPassword
* @return DataResponse
*/
+ #[NoAdminRequired]
+ #[UseSession]
public function updatePrivateKeyPassword($oldPassword, $newPassword) {
$result = false;
$uid = $this->userSession->getUser()->getUID();
@@ -137,11 +107,10 @@ class SettingsController extends Controller {
}
/**
- * @UseSession
- *
* @param bool $encryptHomeStorage
* @return DataResponse
*/
+ #[UseSession]
public function setEncryptHomeStorage($encryptHomeStorage) {
$this->util->setEncryptHomeStorage($encryptHomeStorage);
return new DataResponse();
diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php
index 8f2732477a7..341ad6bc49f 100644
--- a/apps/encryption/lib/Controller/StatusController.php
+++ b/apps/encryption/lib/Controller/StatusController.php
@@ -9,6 +9,7 @@ namespace OCA\Encryption\Controller;
use OCA\Encryption\Session;
use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\DataResponse;
use OCP\Encryption\IManager;
use OCP\IL10N;
@@ -16,38 +17,27 @@ use OCP\IRequest;
class StatusController extends Controller {
- /** @var IL10N */
- private $l;
-
- /** @var Session */
- private $session;
-
- /** @var IManager */
- private $encryptionManager;
-
/**
* @param string $AppName
* @param IRequest $request
- * @param IL10N $l10n
+ * @param IL10N $l
* @param Session $session
* @param IManager $encryptionManager
*/
- public function __construct($AppName,
+ public function __construct(
+ $AppName,
IRequest $request,
- IL10N $l10n,
- Session $session,
- IManager $encryptionManager
+ private IL10N $l,
+ private Session $session,
+ private IManager $encryptionManager,
) {
parent::__construct($AppName, $request);
- $this->l = $l10n;
- $this->session = $session;
- $this->encryptionManager = $encryptionManager;
}
/**
- * @NoAdminRequired
* @return DataResponse
*/
+ #[NoAdminRequired]
public function getStatus() {
$status = 'error';
$message = 'no valid init status';
diff --git a/apps/encryption/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php
index 00611f294bf..463ca4e22bb 100644
--- a/apps/encryption/lib/Crypto/Crypt.php
+++ b/apps/encryption/lib/Crypto/Crypt.php
@@ -83,7 +83,7 @@ class Crypt {
/**
* create new private/public key-pair for user
*
- * @return array|bool
+ * @return array{publicKey: string, privateKey: string}|false
*/
public function createKeyPair() {
$res = $this->getOpenSSLPKey();
@@ -155,7 +155,7 @@ class Crypt {
$this->getCipher());
// Create a signature based on the key as well as the current version
- $sig = $this->createSignature($encryptedContent, $passPhrase.'_'.$version.'_'.$position);
+ $sig = $this->createSignature($encryptedContent, $passPhrase . '_' . $version . '_' . $position);
// combine content to encrypt the IV identifier and actual IV
$catFile = $this->concatIV($encryptedContent, $iv);
@@ -457,7 +457,7 @@ class Crypt {
if ($enforceSignature) {
throw new GenericEncryptionException('Bad Signature', $this->l->t('Bad Signature'));
} else {
- $this->logger->info("Signature check skipped", ['app' => 'encryption']);
+ $this->logger->info('Signature check skipped', ['app' => 'encryption']);
}
}
}
@@ -751,7 +751,7 @@ class Crypt {
$result = false;
// check if RC4 is used
- if (strcasecmp($cipher_algo, "rc4") === 0) {
+ if (strcasecmp($cipher_algo, 'rc4') === 0) {
// decrypt the intermediate key with RSA
if (openssl_private_decrypt($encrypted_key, $intermediate, $private_key, OPENSSL_PKCS1_PADDING)) {
// decrypt the file key with the intermediate key
@@ -760,7 +760,7 @@ class Crypt {
$result = (strlen($output) === strlen($data));
}
} else {
- throw new DecryptionFailedException('Unsupported cipher '.$cipher_algo);
+ throw new DecryptionFailedException('Unsupported cipher ' . $cipher_algo);
}
return $result;
@@ -776,7 +776,7 @@ class Crypt {
$result = false;
// check if RC4 is used
- if (strcasecmp($cipher_algo, "rc4") === 0) {
+ if (strcasecmp($cipher_algo, 'rc4') === 0) {
// make sure that there is at least one public key to use
if (count($public_key) >= 1) {
// generate the intermediate key
@@ -807,7 +807,7 @@ class Crypt {
}
}
} else {
- throw new EncryptionFailedException('Unsupported cipher '.$cipher_algo);
+ throw new EncryptionFailedException('Unsupported cipher ' . $cipher_algo);
}
return $result;
diff --git a/apps/encryption/lib/Crypto/DecryptAll.php b/apps/encryption/lib/Crypto/DecryptAll.php
index e1eb1ba6a2a..362f43b8672 100644
--- a/apps/encryption/lib/Crypto/DecryptAll.php
+++ b/apps/encryption/lib/Crypto/DecryptAll.php
@@ -7,6 +7,7 @@
*/
namespace OCA\Encryption\Crypto;
+use OCA\Encryption\Exceptions\PrivateKeyMissingException;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Session;
use OCA\Encryption\Util;
@@ -18,21 +19,6 @@ use Symfony\Component\Console\Question\Question;
class DecryptAll {
- /** @var Util */
- protected $util;
-
- /** @var QuestionHelper */
- protected $questionHelper;
-
- /** @var Crypt */
- protected $crypt;
-
- /** @var KeyManager */
- protected $keyManager;
-
- /** @var Session */
- protected $session;
-
/**
* @param Util $util
* @param KeyManager $keyManager
@@ -41,17 +27,12 @@ class DecryptAll {
* @param QuestionHelper $questionHelper
*/
public function __construct(
- Util $util,
- KeyManager $keyManager,
- Crypt $crypt,
- Session $session,
- QuestionHelper $questionHelper
+ protected Util $util,
+ protected KeyManager $keyManager,
+ protected Crypt $crypt,
+ protected Session $session,
+ protected QuestionHelper $questionHelper,
) {
- $this->util = $util;
- $this->keyManager = $keyManager;
- $this->crypt = $crypt;
- $this->session = $session;
- $this->questionHelper = $questionHelper;
}
/**
@@ -73,7 +54,7 @@ class DecryptAll {
$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
if (!empty($user)) {
$output->writeln('You can only decrypt the users files if you know');
- $output->writeln('the users password or if he activated the recovery key.');
+ $output->writeln('the users password or if they activated the recovery key.');
$output->writeln('');
$questionUseLoginPassword = new ConfirmationQuestion(
'Do you want to use the users login password to decrypt all files? (y/n) ',
@@ -118,7 +99,7 @@ class DecryptAll {
* @param string $user
* @param string $password
* @return bool|string
- * @throws \OCA\Encryption\Exceptions\PrivateKeyMissingException
+ * @throws PrivateKeyMissingException
*/
protected function getPrivateKey($user, $password) {
$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
diff --git a/apps/encryption/lib/Crypto/EncryptAll.php b/apps/encryption/lib/Crypto/EncryptAll.php
index 09b418836d9..4ed75b85a93 100644
--- a/apps/encryption/lib/Crypto/EncryptAll.php
+++ b/apps/encryption/lib/Crypto/EncryptAll.php
@@ -12,6 +12,7 @@ use OC\Files\View;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Users\Setup;
use OCA\Encryption\Util;
+use OCP\Files\FileInfo;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IUser;
@@ -20,6 +21,7 @@ use OCP\L10N\IFactory;
use OCP\Mail\Headers\AutoSubmitted;
use OCP\Mail\IMailer;
use OCP\Security\ISecureRandom;
+use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Helper\QuestionHelper;
use Symfony\Component\Console\Helper\Table;
@@ -29,72 +31,29 @@ use Symfony\Component\Console\Question\ConfirmationQuestion;
class EncryptAll {
- /** @var Setup */
- protected $userSetup;
-
- /** @var IUserManager */
- protected $userManager;
-
- /** @var View */
- protected $rootView;
-
- /** @var KeyManager */
- protected $keyManager;
-
- /** @var Util */
- protected $util;
-
- /** @var array */
+ /** @var array */
protected $userPasswords;
- /** @var IConfig */
- protected $config;
-
- /** @var IMailer */
- protected $mailer;
-
- /** @var IL10N */
- protected $l;
-
- /** @var IFactory */
- protected $l10nFactory;
-
- /** @var QuestionHelper */
- protected $questionHelper;
-
- /** @var OutputInterface */
+ /** @var OutputInterface */
protected $output;
- /** @var InputInterface */
+ /** @var InputInterface */
protected $input;
- /** @var ISecureRandom */
- protected $secureRandom;
-
public function __construct(
- Setup $userSetup,
- IUserManager $userManager,
- View $rootView,
- KeyManager $keyManager,
- Util $util,
- IConfig $config,
- IMailer $mailer,
- IL10N $l,
- IFactory $l10nFactory,
- QuestionHelper $questionHelper,
- ISecureRandom $secureRandom
+ protected Setup $userSetup,
+ protected IUserManager $userManager,
+ protected View $rootView,
+ protected KeyManager $keyManager,
+ protected Util $util,
+ protected IConfig $config,
+ protected IMailer $mailer,
+ protected IL10N $l,
+ protected IFactory $l10nFactory,
+ protected QuestionHelper $questionHelper,
+ protected ISecureRandom $secureRandom,
+ protected LoggerInterface $logger,
) {
- $this->userSetup = $userSetup;
- $this->userManager = $userManager;
- $this->rootView = $rootView;
- $this->keyManager = $keyManager;
- $this->util = $util;
- $this->config = $config;
- $this->mailer = $mailer;
- $this->l = $l;
- $this->l10nFactory = $l10nFactory;
- $this->questionHelper = $questionHelper;
- $this->secureRandom = $secureRandom;
// store one time passwords for the users
$this->userPasswords = [];
}
@@ -203,7 +162,7 @@ class EncryptAll {
$userNo++;
}
}
- $progress->setMessage("all files encrypted");
+ $progress->setMessage('all files encrypted');
$progress->finish();
}
@@ -244,33 +203,42 @@ class EncryptAll {
while ($root = array_pop($directories)) {
$content = $this->rootView->getDirectoryContent($root);
foreach ($content as $file) {
- $path = $root . '/' . $file['name'];
- if ($this->rootView->is_dir($path)) {
+ $path = $root . '/' . $file->getName();
+ if ($file->isShared()) {
+ $progress->setMessage("Skip shared file/folder $path");
+ $progress->advance();
+ continue;
+ } elseif ($file->getType() === FileInfo::TYPE_FOLDER) {
$directories[] = $path;
continue;
} else {
$progress->setMessage("encrypt files for user $userCount: $path");
$progress->advance();
- if ($this->encryptFile($path) === false) {
- $progress->setMessage("encrypt files for user $userCount: $path (already encrypted)");
+ try {
+ if ($this->encryptFile($file, $path) === false) {
+ $progress->setMessage("encrypt files for user $userCount: $path (already encrypted)");
+ $progress->advance();
+ }
+ } catch (\Exception $e) {
+ $progress->setMessage("Failed to encrypt path $path: " . $e->getMessage());
$progress->advance();
+ $this->logger->error(
+ 'Failed to encrypt path {path}',
+ [
+ 'user' => $uid,
+ 'path' => $path,
+ 'exception' => $e,
+ ]
+ );
}
}
}
}
}
- /**
- * encrypt file
- *
- * @param string $path
- * @return bool
- */
- protected function encryptFile($path) {
-
+ protected function encryptFile(FileInfo $fileInfo, string $path): bool {
// skip already encrypted files
- $fileInfo = $this->rootView->getFileInfo($path);
- if ($fileInfo !== false && $fileInfo->isEncrypted()) {
+ if ($fileInfo->isEncrypted()) {
return true;
}
@@ -278,7 +246,14 @@ class EncryptAll {
$target = $path . '.encrypted.' . time();
try {
- $this->rootView->copy($source, $target);
+ $copySuccess = $this->rootView->copy($source, $target);
+ if ($copySuccess === false) {
+ /* Copy failed, abort */
+ if ($this->rootView->file_exists($target)) {
+ $this->rootView->unlink($target);
+ }
+ throw new \Exception('Copy failed for ' . $source);
+ }
$this->rootView->rename($target, $source);
} catch (DecryptionFailedException $e) {
if ($this->rootView->file_exists($target)) {
diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php
index dda93e13306..6d388624e48 100644
--- a/apps/encryption/lib/Crypto/Encryption.php
+++ b/apps/encryption/lib/Crypto/Encryption.php
@@ -10,6 +10,7 @@ namespace OCA\Encryption\Crypto;
use OC\Encryption\Exceptions\DecryptionFailedException;
use OC\Files\Cache\Scanner;
use OC\Files\View;
+use OCA\Encryption\Exceptions\MultiKeyEncryptException;
use OCA\Encryption\Exceptions\PublicKeyMissingException;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Session;
@@ -99,8 +100,8 @@ class Encryption implements IEncryptionModule {
* @param array $accessList who has access to the file contains the key 'users' and 'public'
*
* @return array $header contain data as key-value pairs which should be
- * written to the header, in case of a write operation
- * or if no additional data is needed return a empty array
+ * written to the header, in case of a write operation
+ * or if no additional data is needed return a empty array
*/
public function begin($path, $user, $mode, array $header, array $accessList) {
$this->path = $this->getPathToRealFile($path);
@@ -187,7 +188,7 @@ class Encryption implements IEncryptionModule {
* of a write operation
* @throws PublicKeyMissingException
* @throws \Exception
- * @throws \OCA\Encryption\Exceptions\MultiKeyEncryptException
+ * @throws MultiKeyEncryptException
*/
public function end($path, $position = '0') {
$result = '';
@@ -432,7 +433,7 @@ class Encryption implements IEncryptionModule {
* e.g. if all encryption keys exists
*
* @param string $path
- * @param string $uid user for whom we want to check if he can read the file
+ * @param string $uid user for whom we want to check if they can read the file
* @return bool
* @throws DecryptionFailedException
*/
@@ -445,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/Exceptions/PrivateKeyMissingException.php b/apps/encryption/lib/Exceptions/PrivateKeyMissingException.php
index 9e3dea67f3e..15fe8f4e72f 100644
--- a/apps/encryption/lib/Exceptions/PrivateKeyMissingException.php
+++ b/apps/encryption/lib/Exceptions/PrivateKeyMissingException.php
@@ -16,7 +16,7 @@ class PrivateKeyMissingException extends GenericEncryptionException {
*/
public function __construct($userId) {
if (empty($userId)) {
- $userId = "<no-user-id-given>";
+ $userId = '<no-user-id-given>';
}
parent::__construct("Private Key missing for user: $userId");
}
diff --git a/apps/encryption/lib/Exceptions/PublicKeyMissingException.php b/apps/encryption/lib/Exceptions/PublicKeyMissingException.php
index 3173f0fb44a..78eeeccf47d 100644
--- a/apps/encryption/lib/Exceptions/PublicKeyMissingException.php
+++ b/apps/encryption/lib/Exceptions/PublicKeyMissingException.php
@@ -16,7 +16,7 @@ class PublicKeyMissingException extends GenericEncryptionException {
*/
public function __construct($userId) {
if (empty($userId)) {
- $userId = "<no-user-id-given>";
+ $userId = '<no-user-id-given>';
}
parent::__construct("Public Key missing for user: $userId");
}
diff --git a/apps/encryption/lib/HookManager.php b/apps/encryption/lib/HookManager.php
deleted file mode 100644
index 71fa4f0a08e..00000000000
--- a/apps/encryption/lib/HookManager.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-namespace OCA\Encryption;
-
-use OCA\Encryption\Hooks\Contracts\IHook;
-
-class HookManager {
- /** @var IHook[] */
- private $hookInstances = [];
-
- /**
- * @param array|IHook $instances
- * - This accepts either a single instance of IHook or an array of instances of IHook
- * @return bool
- */
- public function registerHook($instances) {
- if (is_array($instances)) {
- foreach ($instances as $instance) {
- if (!$instance instanceof IHook) {
- return false;
- }
- $this->hookInstances[] = $instance;
- }
- } elseif ($instances instanceof IHook) {
- $this->hookInstances[] = $instances;
- }
- return true;
- }
-
- public function fireHooks() {
- foreach ($this->hookInstances as $instance) {
- /**
- * Fire off the add hooks method of each instance stored in cache
- */
- $instance->addHooks();
- }
- }
-}
diff --git a/apps/encryption/lib/Hooks/Contracts/IHook.php b/apps/encryption/lib/Hooks/Contracts/IHook.php
deleted file mode 100644
index 5bb8046e230..00000000000
--- a/apps/encryption/lib/Hooks/Contracts/IHook.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-namespace OCA\Encryption\Hooks\Contracts;
-
-interface IHook {
- /**
- * Connects Hooks
- *
- * @return null
- */
- public function addHooks();
-}
diff --git a/apps/encryption/lib/Hooks/UserHooks.php b/apps/encryption/lib/Hooks/UserHooks.php
deleted file mode 100644
index 2424370e47f..00000000000
--- a/apps/encryption/lib/Hooks/UserHooks.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-namespace OCA\Encryption\Hooks;
-
-use OC\Files\Filesystem;
-use OCA\Encryption\Crypto\Crypt;
-use OCA\Encryption\Hooks\Contracts\IHook;
-use OCA\Encryption\KeyManager;
-use OCA\Encryption\Recovery;
-use OCA\Encryption\Session;
-use OCA\Encryption\Users\Setup;
-use OCA\Encryption\Util;
-use OCP\Encryption\Exceptions\GenericEncryptionException;
-use OCP\IUserManager;
-use OCP\IUserSession;
-use OCP\Util as OCUtil;
-use Psr\Log\LoggerInterface;
-
-class UserHooks implements IHook {
- /**
- * list of user for which we perform a password reset
- * @var array<string, true>
- */
- protected static array $passwordResetUsers = [];
-
- public function __construct(
- private KeyManager $keyManager,
- private IUserManager $userManager,
- private LoggerInterface $logger,
- private Setup $userSetup,
- private IUserSession $userSession,
- private Util $util,
- private Session $session,
- private Crypt $crypt,
- private Recovery $recovery,
- ) {
- }
-
- /**
- * Connects Hooks
- *
- * @return null
- */
- public function addHooks() {
- OCUtil::connectHook('OC_User', 'post_login', $this, 'login');
- OCUtil::connectHook('OC_User', 'logout', $this, 'logout');
-
- // this hooks only make sense if no master key is used
- if ($this->util->isMasterKeyEnabled() === false) {
- OCUtil::connectHook('OC_User',
- 'post_setPassword',
- $this,
- 'setPassphrase');
-
- OCUtil::connectHook('OC_User',
- 'pre_setPassword',
- $this,
- 'preSetPassphrase');
-
- OCUtil::connectHook('\OC\Core\LostPassword\Controller\LostController',
- 'post_passwordReset',
- $this,
- 'postPasswordReset');
-
- OCUtil::connectHook('\OC\Core\LostPassword\Controller\LostController',
- 'pre_passwordReset',
- $this,
- 'prePasswordReset');
-
- OCUtil::connectHook('OC_User',
- 'post_createUser',
- $this,
- 'postCreateUser');
-
- OCUtil::connectHook('OC_User',
- 'post_deleteUser',
- $this,
- 'postDeleteUser');
- }
- }
-
-
- /**
- * Startup encryption backend upon user login
- *
- * @note This method should never be called for users using client side encryption
- * @param array $params
- * @return boolean|null
- */
- public function login($params) {
- // ensure filesystem is loaded
- if (!\OC\Files\Filesystem::$loaded) {
- $this->setupFS($params['uid']);
- }
- if ($this->util->isMasterKeyEnabled() === false) {
- $this->userSetup->setupUser($params['uid'], $params['password']);
- }
-
- $this->keyManager->init($params['uid'], $params['password']);
- }
-
- /**
- * remove keys from session during logout
- */
- public function logout() {
- $this->session->clear();
- }
-
- /**
- * setup encryption backend upon user created
- *
- * @note This method should never be called for users using client side encryption
- * @param array $params
- */
- public function postCreateUser($params) {
- $this->userSetup->setupUser($params['uid'], $params['password']);
- }
-
- /**
- * cleanup encryption backend upon user deleted
- *
- * @param array $params : uid, password
- * @note This method should never be called for users using client side encryption
- */
- public function postDeleteUser($params) {
- $this->keyManager->deletePublicKey($params['uid']);
- }
-
- public function prePasswordReset($params) {
- $user = $params['uid'];
- self::$passwordResetUsers[$user] = true;
- }
-
- public function postPasswordReset($params) {
- $uid = $params['uid'];
- $password = $params['password'];
- $this->keyManager->backupUserKeys('passwordReset', $uid);
- $this->keyManager->deleteUserKeys($uid);
- $this->userSetup->setupUser($uid, $password);
- unset(self::$passwordResetUsers[$uid]);
- }
-
- /**
- * If the password can't be changed within Nextcloud, than update the key password in advance.
- *
- * @param array $params : uid, password
- * @return boolean|null
- */
- public function preSetPassphrase($params) {
- $user = $this->userManager->get($params['uid']);
-
- if ($user && !$user->canChangePassword()) {
- $this->setPassphrase($params);
- }
- }
-
- /**
- * Change a user's encryption passphrase
- *
- * @param array $params keys: uid, password
- * @return boolean|null
- */
- public function setPassphrase($params) {
- // if we are in the process to resetting a user password, we have nothing
- // to do here
- if (isset(self::$passwordResetUsers[$params['uid']])) {
- return true;
- }
-
- // Get existing decrypted private key
- $user = $this->userSession->getUser();
-
- // current logged in user changes his own password
- if ($user && $params['uid'] === $user->getUID()) {
- $privateKey = $this->session->getPrivateKey();
-
- // Encrypt private key with new user pwd as passphrase
- $encryptedPrivateKey = $this->crypt->encryptPrivateKey($privateKey, $params['password'], $params['uid']);
-
- // Save private key
- if ($encryptedPrivateKey) {
- $this->keyManager->setPrivateKey($user->getUID(),
- $this->crypt->generateHeader() . $encryptedPrivateKey);
- } else {
- $this->logger->error('Encryption could not update users encryption password');
- }
-
- // NOTE: Session does not need to be updated as the
- // private key has not changed, only the passphrase
- // used to decrypt it has changed
- } else { // admin changed the password for a different user, create new keys and re-encrypt file keys
- $userId = $params['uid'];
- $this->initMountPoints($userId);
- $recoveryPassword = $params['recoveryPassword'] ?? null;
-
- $recoveryKeyId = $this->keyManager->getRecoveryKeyId();
- $recoveryKey = $this->keyManager->getSystemPrivateKey($recoveryKeyId);
- try {
- $decryptedRecoveryKey = $this->crypt->decryptPrivateKey($recoveryKey, $recoveryPassword);
- } catch (\Exception $e) {
- $decryptedRecoveryKey = false;
- }
- if ($decryptedRecoveryKey === false) {
- $message = 'Can not decrypt the recovery key. Maybe you provided the wrong password. Try again.';
- throw new GenericEncryptionException($message, $message);
- }
-
- // we generate new keys if...
- // ...we have a recovery password and the user enabled the recovery key
- // ...encryption was activated for the first time (no keys exists)
- // ...the user doesn't have any files
- if (
- ($this->recovery->isRecoveryEnabledForUser($userId) && $recoveryPassword)
- || !$this->keyManager->userHasKeys($userId)
- || !$this->util->userHasFiles($userId)
- ) {
- // backup old keys
- //$this->backupAllKeys('recovery');
-
- $newUserPassword = $params['password'];
-
- $keyPair = $this->crypt->createKeyPair();
-
- // Save public key
- $this->keyManager->setPublicKey($userId, $keyPair['publicKey']);
-
- // Encrypt private key with new password
- $encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $newUserPassword, $userId);
-
- if ($encryptedKey) {
- $this->keyManager->setPrivateKey($userId, $this->crypt->generateHeader() . $encryptedKey);
-
- if ($recoveryPassword) { // if recovery key is set we can re-encrypt the key files
- $this->recovery->recoverUsersFiles($recoveryPassword, $userId);
- }
- } else {
- $this->logger->error('Encryption Could not update users encryption password');
- }
- }
- }
- }
-
- /**
- * init mount points for given user
- *
- * @param string $user
- * @throws \OC\User\NoUserException
- */
- protected function initMountPoints($user) {
- Filesystem::initMountPoints($user);
- }
-
- /**
- * setup file system for user
- *
- * @param string $uid user id
- */
- protected function setupFS($uid) {
- \OC_Util::setupFS($uid);
- }
-}
diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php
index 9fd6c7655af..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);
@@ -287,11 +287,9 @@ class KeyManager {
/**
* Decrypt private key and store it
*
- * @param string $uid user id
- * @param string $passPhrase users password
* @return boolean
*/
- public function init($uid, $passPhrase) {
+ public function init(string $uid, ?string $passPhrase) {
$this->session->setStatus(Session::INIT_EXECUTED);
try {
@@ -300,6 +298,10 @@ class KeyManager {
$passPhrase = $this->getMasterKeyPassword();
$privateKey = $this->getSystemPrivateKey($uid);
} else {
+ if ($passPhrase === null) {
+ $this->logger->warning('Master key is disabled but not passphrase provided.');
+ return false;
+ }
$privateKey = $this->getPrivateKey($uid);
}
$privateKey = $this->crypt->decryptPrivateKey($privateKey, $passPhrase, $uid);
@@ -631,8 +633,8 @@ class KeyManager {
$publicKeys[$this->getPublicShareKeyId()] = $publicShareKey;
}
- if ($this->recoveryKeyExists() &&
- $this->util->isRecoveryEnabledForUser($uid)) {
+ if ($this->recoveryKeyExists()
+ && $this->util->isRecoveryEnabledForUser($uid)) {
$publicKeys[$this->getRecoveryKeyId()] = $this->getRecoveryKey();
}
diff --git a/apps/encryption/lib/Listeners/UserEventsListener.php b/apps/encryption/lib/Listeners/UserEventsListener.php
new file mode 100644
index 00000000000..3f61fde599b
--- /dev/null
+++ b/apps/encryption/lib/Listeners/UserEventsListener.php
@@ -0,0 +1,144 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Encryption\Listeners;
+
+use OC\Core\Events\BeforePasswordResetEvent;
+use OC\Core\Events\PasswordResetEvent;
+use OC\Files\SetupManager;
+use OCA\Encryption\KeyManager;
+use OCA\Encryption\Services\PassphraseService;
+use OCA\Encryption\Session;
+use OCA\Encryption\Users\Setup;
+use OCA\Encryption\Util;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\IUserSession;
+use OCP\User\Events\BeforePasswordUpdatedEvent;
+use OCP\User\Events\PasswordUpdatedEvent;
+use OCP\User\Events\UserCreatedEvent;
+use OCP\User\Events\UserDeletedEvent;
+use OCP\User\Events\UserLoggedInEvent;
+use OCP\User\Events\UserLoggedInWithCookieEvent;
+use OCP\User\Events\UserLoggedOutEvent;
+
+/**
+ * @template-implements IEventListener<UserCreatedEvent|UserDeletedEvent|UserLoggedInEvent|UserLoggedInWithCookieEvent|UserLoggedOutEvent|BeforePasswordUpdatedEvent|PasswordUpdatedEvent|BeforePasswordResetEvent|PasswordResetEvent>
+ */
+class UserEventsListener implements IEventListener {
+
+ public function __construct(
+ private Util $util,
+ private Setup $userSetup,
+ private Session $session,
+ private KeyManager $keyManager,
+ private IUserManager $userManager,
+ private IUserSession $userSession,
+ private SetupManager $setupManager,
+ private PassphraseService $passphraseService,
+ ) {
+ }
+
+ public function handle(Event $event): void {
+ if ($event instanceof UserCreatedEvent) {
+ $this->onUserCreated($event->getUid(), $event->getPassword());
+ } elseif ($event instanceof UserDeletedEvent) {
+ $this->onUserDeleted($event->getUid());
+ } elseif ($event instanceof UserLoggedInEvent || $event instanceof UserLoggedInWithCookieEvent) {
+ $this->onUserLogin($event->getUser(), $event->getPassword());
+ } elseif ($event instanceof UserLoggedOutEvent) {
+ $this->onUserLogout();
+ } elseif ($event instanceof BeforePasswordUpdatedEvent) {
+ $this->onBeforePasswordUpdated($event->getUser(), $event->getPassword(), $event->getRecoveryPassword());
+ } elseif ($event instanceof PasswordUpdatedEvent) {
+ $this->onPasswordUpdated($event->getUid(), $event->getPassword(), $event->getRecoveryPassword());
+ } elseif ($event instanceof BeforePasswordResetEvent) {
+ $this->onBeforePasswordReset($event->getUid());
+ } elseif ($event instanceof PasswordResetEvent) {
+ $this->onPasswordReset($event->getUid(), $event->getPassword());
+ }
+ }
+
+ /**
+ * Startup encryption backend upon user login
+ */
+ private function onUserLogin(IUser $user, ?string $password): void {
+ // ensure filesystem is loaded
+ $this->setupManager->setupForUser($user);
+ if ($this->util->isMasterKeyEnabled() === false) {
+ // Skip if no master key and the password is not provided
+ if ($password === null) {
+ return;
+ }
+
+ $this->userSetup->setupUser($user->getUID(), $password);
+ }
+
+ $this->keyManager->init($user->getUID(), $password);
+ }
+
+ /**
+ * Remove keys from session during logout
+ */
+ private function onUserLogout(): void {
+ $this->session->clear();
+ }
+
+ /**
+ * Setup encryption backend upon user created
+ *
+ * This method should never be called for users using client side encryption
+ */
+ protected function onUserCreated(string $userId, string $password): void {
+ $this->userSetup->setupUser($userId, $password);
+ }
+
+ /**
+ * Cleanup encryption backend upon user deleted
+ *
+ * This method should never be called for users using client side encryption
+ */
+ protected function onUserDeleted(string $userId): void {
+ $this->keyManager->deletePublicKey($userId);
+ }
+
+ /**
+ * If the password can't be changed within Nextcloud, than update the key password in advance.
+ */
+ public function onBeforePasswordUpdated(IUser $user, string $password, ?string $recoveryPassword = null): void {
+ if (!$user->canChangePassword()) {
+ $this->passphraseService->setPassphraseForUser($user->getUID(), $password, $recoveryPassword);
+ }
+ }
+
+ /**
+ * Change a user's encryption passphrase
+ */
+ public function onPasswordUpdated(string $userId, string $password, ?string $recoveryPassword): void {
+ $this->passphraseService->setPassphraseForUser($userId, $password, $recoveryPassword);
+ }
+
+ /**
+ * Set user password resetting state to allow ignoring "reset"-requests on password update
+ */
+ public function onBeforePasswordReset(string $userId): void {
+ $this->passphraseService->setProcessingReset($userId);
+ }
+
+ /**
+ * Create new encryption keys on password reset and backup the old one
+ */
+ public function onPasswordReset(string $userId, string $password): void {
+ $this->keyManager->backupUserKeys('passwordReset', $userId);
+ $this->keyManager->deleteUserKeys($userId);
+ $this->userSetup->setupUser($userId, $password);
+ $this->passphraseService->setProcessingReset($userId, false);
+ }
+}
diff --git a/apps/encryption/lib/Migration/SetMasterKeyStatus.php b/apps/encryption/lib/Migration/SetMasterKeyStatus.php
index 598f2dd516a..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
@@ -17,12 +18,9 @@ use OCP\Migration\IRepairStep;
class SetMasterKeyStatus implements IRepairStep {
- /** @var IConfig */
- private $config;
-
-
- public function __construct(IConfig $config) {
- $this->config = $config;
+ public function __construct(
+ private IConfig $config,
+ ) {
}
/**
diff --git a/apps/encryption/lib/Recovery.php b/apps/encryption/lib/Recovery.php
index 3990067f19b..38e78f5e822 100644
--- a/apps/encryption/lib/Recovery.php
+++ b/apps/encryption/lib/Recovery.php
@@ -20,26 +20,6 @@ class Recovery {
* @var null|IUser
*/
protected $user;
- /**
- * @var Crypt
- */
- protected $crypt;
- /**
- * @var KeyManager
- */
- private $keyManager;
- /**
- * @var IConfig
- */
- private $config;
- /**
- * @var View
- */
- private $view;
- /**
- * @var IFile
- */
- private $file;
/**
* @param IUserSession $userSession
@@ -49,18 +29,15 @@ class Recovery {
* @param IFile $file
* @param View $view
*/
- public function __construct(IUserSession $userSession,
- Crypt $crypt,
- KeyManager $keyManager,
- IConfig $config,
- IFile $file,
- View $view) {
+ public function __construct(
+ IUserSession $userSession,
+ protected Crypt $crypt,
+ private KeyManager $keyManager,
+ private IConfig $config,
+ private IFile $file,
+ private View $view,
+ ) {
$this->user = ($userSession->isLoggedIn()) ? $userSession->getUser() : null;
- $this->crypt = $crypt;
- $this->keyManager = $keyManager;
- $this->config = $config;
- $this->view = $view;
- $this->file = $file;
}
/**
diff --git a/apps/encryption/lib/Services/PassphraseService.php b/apps/encryption/lib/Services/PassphraseService.php
new file mode 100644
index 00000000000..bdcc3f1108a
--- /dev/null
+++ b/apps/encryption/lib/Services/PassphraseService.php
@@ -0,0 +1,148 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Encryption\Services;
+
+use OC\Files\Filesystem;
+use OCA\Encryption\Crypto\Crypt;
+use OCA\Encryption\KeyManager;
+use OCA\Encryption\Recovery;
+use OCA\Encryption\Session;
+use OCA\Encryption\Util;
+use OCP\Encryption\Exceptions\GenericEncryptionException;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\IUserSession;
+use Psr\Log\LoggerInterface;
+
+class PassphraseService {
+
+ /** @var array<string, bool> */
+ private static array $passwordResetUsers = [];
+
+ public function __construct(
+ private Util $util,
+ private Crypt $crypt,
+ private Session $session,
+ private Recovery $recovery,
+ private KeyManager $keyManager,
+ private LoggerInterface $logger,
+ private IUserManager $userManager,
+ private IUserSession $userSession,
+ ) {
+ }
+
+ public function setProcessingReset(string $uid, bool $processing = true): void {
+ if ($processing) {
+ self::$passwordResetUsers[$uid] = true;
+ } else {
+ unset(self::$passwordResetUsers[$uid]);
+ }
+ }
+
+ /**
+ * Change a user's encryption passphrase
+ */
+ public function setPassphraseForUser(string $userId, string $password, ?string $recoveryPassword = null): bool {
+ // if we are in the process to resetting a user password, we have nothing
+ // to do here
+ if (isset(self::$passwordResetUsers[$userId])) {
+ 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) {
+ return false;
+ }
+
+ // Get existing decrypted private key
+ $currentUser = $this->userSession->getUser();
+
+ // current logged in user changes his own password
+ if ($currentUser !== null && $userId === $currentUser->getUID()) {
+ $privateKey = $this->session->getPrivateKey();
+
+ // Encrypt private key with new user pwd as passphrase
+ $encryptedPrivateKey = $this->crypt->encryptPrivateKey($privateKey, $password, $userId);
+
+ // Save private key
+ if ($encryptedPrivateKey !== false) {
+ $key = $this->crypt->generateHeader() . $encryptedPrivateKey;
+ $this->keyManager->setPrivateKey($userId, $key);
+ return true;
+ }
+
+ $this->logger->error('Encryption could not update users encryption password');
+
+ // NOTE: Session does not need to be updated as the
+ // private key has not changed, only the passphrase
+ // used to decrypt it has changed
+ } else {
+ // admin changed the password for a different user, create new keys and re-encrypt file keys
+ $recoveryPassword = $recoveryPassword ?? '';
+ $this->initMountPoints($user);
+
+ $recoveryKeyId = $this->keyManager->getRecoveryKeyId();
+ $recoveryKey = $this->keyManager->getSystemPrivateKey($recoveryKeyId);
+ try {
+ $this->crypt->decryptPrivateKey($recoveryKey, $recoveryPassword);
+ } catch (\Exception) {
+ $message = 'Can not decrypt the recovery key. Maybe you provided the wrong password. Try again.';
+ throw new GenericEncryptionException($message, $message);
+ }
+
+ // we generate new keys if...
+ // ...we have a recovery password and the user enabled the recovery key
+ // ...encryption was activated for the first time (no keys exists)
+ // ...the user doesn't have any files
+ if (
+ ($this->recovery->isRecoveryEnabledForUser($userId) && $recoveryPassword !== '')
+ || !$this->keyManager->userHasKeys($userId)
+ || !$this->util->userHasFiles($userId)
+ ) {
+ $keyPair = $this->crypt->createKeyPair();
+ if ($keyPair === false) {
+ $this->logger->error('Could not create new private key-pair for user.');
+ return false;
+ }
+
+ // Save public key
+ $this->keyManager->setPublicKey($userId, $keyPair['publicKey']);
+
+ // Encrypt private key with new password
+ $encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $password, $userId);
+ if ($encryptedKey === false) {
+ $this->logger->error('Encryption could not update users encryption password');
+ return false;
+ }
+
+ $this->keyManager->setPrivateKey($userId, $this->crypt->generateHeader() . $encryptedKey);
+
+ if ($recoveryPassword !== '') {
+ // if recovery key is set we can re-encrypt the key files
+ $this->recovery->recoverUsersFiles($recoveryPassword, $userId);
+ }
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Init mount points for given user
+ */
+ private function initMountPoints(IUser $user): void {
+ Filesystem::initMountPoints($user);
+ }
+}
diff --git a/apps/encryption/lib/Session.php b/apps/encryption/lib/Session.php
index e16396e8faf..df1e5d664ad 100644
--- a/apps/encryption/lib/Session.php
+++ b/apps/encryption/lib/Session.php
@@ -12,9 +12,6 @@ use OCP\ISession;
class Session {
- /** @var ISession */
- protected $session;
-
public const NOT_INITIALIZED = '0';
public const INIT_EXECUTED = '1';
public const INIT_SUCCESSFUL = '2';
@@ -22,8 +19,9 @@ class Session {
/**
* @param ISession $session
*/
- public function __construct(ISession $session) {
- $this->session = $session;
+ public function __construct(
+ protected ISession $session,
+ ) {
}
/**
@@ -68,7 +66,7 @@ class Session {
public function getPrivateKey() {
$key = $this->session->get('privateKey');
if (is_null($key)) {
- throw new Exceptions\PrivateKeyMissingException('please try to log-out and log-in again', 0);
+ throw new PrivateKeyMissingException('please try to log-out and log-in again');
}
return $key;
}
diff --git a/apps/encryption/lib/Settings/Admin.php b/apps/encryption/lib/Settings/Admin.php
index ea313225d82..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
@@ -25,7 +26,7 @@ class Admin implements ISettings {
private IUserSession $userSession,
private IConfig $config,
private IUserManager $userManager,
- private ISession $session
+ private ISession $session,
) {
}
@@ -71,8 +72,8 @@ class Admin implements ISettings {
/**
* @return int whether the form should be rather on the top or bottom of
- * the admin section. The forms are arranged in ascending order of the
- * priority values. It is required to return a value between 0 and 100.
+ * the admin section. The forms are arranged in ascending order of the
+ * priority values. It is required to return a value between 0 and 100.
*
* E.g.: 70
*/
diff --git a/apps/encryption/lib/Settings/Personal.php b/apps/encryption/lib/Settings/Personal.php
index 93609acdd03..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
@@ -14,20 +15,12 @@ use OCP\Settings\ISettings;
class Personal implements ISettings {
- /** @var IConfig */
- private $config;
- /** @var Session */
- private $session;
- /** @var Util */
- private $util;
- /** @var IUserSession */
- private $userSession;
-
- public function __construct(IConfig $config, Session $session, Util $util, IUserSession $userSession) {
- $this->config = $config;
- $this->session = $session;
- $this->util = $util;
- $this->userSession = $userSession;
+ public function __construct(
+ private IConfig $config,
+ private Session $session,
+ private Util $util,
+ private IUserSession $userSession,
+ ) {
}
/**
@@ -64,8 +57,8 @@ class Personal implements ISettings {
/**
* @return int whether the form should be rather on the top or bottom of
- * the admin section. The forms are arranged in ascending order of the
- * priority values. It is required to return a value between 0 and 100.
+ * the admin section. The forms are arranged in ascending order of the
+ * priority values. It is required to return a value between 0 and 100.
*
* E.g.: 70
* @since 9.1
diff --git a/apps/encryption/lib/Users/Setup.php b/apps/encryption/lib/Users/Setup.php
index 30e7c5461cc..f2189d6dab2 100644
--- a/apps/encryption/lib/Users/Setup.php
+++ b/apps/encryption/lib/Users/Setup.php
@@ -11,15 +11,11 @@ use OCA\Encryption\Crypto\Crypt;
use OCA\Encryption\KeyManager;
class Setup {
- /** @var Crypt */
- private $crypt;
- /** @var KeyManager */
- private $keyManager;
- public function __construct(Crypt $crypt,
- KeyManager $keyManager) {
- $this->crypt = $crypt;
- $this->keyManager = $keyManager;
+ public function __construct(
+ private Crypt $crypt,
+ private KeyManager $keyManager,
+ ) {
}
/**
diff --git a/apps/encryption/lib/Util.php b/apps/encryption/lib/Util.php
index 6ca4d2c1e1e..ccbdcdcb242 100644
--- a/apps/encryption/lib/Util.php
+++ b/apps/encryption/lib/Util.php
@@ -7,8 +7,10 @@
*/
namespace OCA\Encryption;
+use OC\Files\Storage\Storage;
use OC\Files\View;
use OCA\Encryption\Crypto\Crypt;
+use OCP\Files\Storage\IStorage;
use OCP\IConfig;
use OCP\IUser;
use OCP\IUserManager;
@@ -25,11 +27,7 @@ class Util {
private IConfig $config,
private IUserManager $userManager,
) {
- $this->files = $files;
- $this->crypt = $crypt;
$this->user = $userSession->isLoggedIn() ? $userSession->getUser() : false;
- $this->config = $config;
- $this->userManager = $userManager;
}
/**
@@ -123,21 +121,16 @@ 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');
}
}
return $owner;
}
- /**
- * get storage of path
- *
- * @param string $path
- * @return \OC\Files\Storage\Storage|null
- */
- public function getStorage($path) {
+ public function getStorage(string $path): ?IStorage {
return $this->files->getMount($path)->getStorage();
}
+
}
diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index 22b05f6efcf..432ba2f11b0 100644
--- a/apps/encryption/templates/settings-admin.php
+++ b/apps/encryption/templates/settings-admin.php
@@ -7,13 +7,13 @@
*/
/** @var array $_ */
/** @var \OCP\IL10N $l */
-script('encryption', 'settings-admin');
+\OCP\Util::addScript('encryption', 'settings-admin', 'core');
style('encryption', 'settings-admin');
?>
<form id="ocDefaultEncryptionModule" class="sub-section">
- <h3><?php p($l->t("Default encryption module")); ?></h3>
- <?php if (!$_["initStatus"] && $_['masterKeyEnabled'] === false): ?>
- <?php p($l->t("Encryption app is enabled but your keys are not initialized, please log-out and log-in again")); ?>
+ <h3><?php p($l->t('Default encryption module')); ?></h3>
+ <?php if (!$_['initStatus'] && $_['masterKeyEnabled'] === false): ?>
+ <?php p($l->t('Encryption app is enabled but your keys are not initialized, please log-out and log-in again')); ?>
<?php else: ?>
<p id="encryptHomeStorageSetting">
<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
@@ -21,61 +21,61 @@ style('encryption', 'settings-admin');
print_unescaped('checked="checked"');
} ?> />
<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
- <em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em>
+ <em><?php p($l->t('Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted')); ?></em>
</p>
<br />
<?php if ($_['masterKeyEnabled'] === false): ?>
<p id="encryptionSetRecoveryKey">
- <?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>
+ <?php $_['recoveryEnabled'] === '0' ? p($l->t('Enable recovery key')) : p($l->t('Disable recovery key')); ?>
<span class="msg"></span>
<br/>
<em>
- <?php p($l->t("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.")) ?>
+ <?php p($l->t('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.')) ?>
</em>
<br/>
<input type="password"
name="encryptionRecoveryPassword"
id="encryptionRecoveryPassword"
- placeholder="<?php p($l->t("Recovery key password")); ?>"/>
+ placeholder="<?php p($l->t('Recovery key password')); ?>"/>
<input type="password"
name="encryptionRecoveryPassword"
id="repeatEncryptionRecoveryPassword"
- placeholder="<?php p($l->t("Repeat recovery key password")); ?>"/>
+ placeholder="<?php p($l->t('Repeat recovery key password')); ?>"/>
<input type="button"
name="enableRecoveryKey"
id="enableRecoveryKey"
- status="<?php p($_["recoveryEnabled"]) ?>"
- value="<?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>"/>
+ status="<?php p($_['recoveryEnabled']) ?>"
+ value="<?php $_['recoveryEnabled'] === '0' ? p($l->t('Enable recovery key')) : p($l->t('Disable recovery key')); ?>"/>
</p>
<br/><br/>
<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if ($_['recoveryEnabled'] === '0') {
print_unescaped('class="hidden"');
}?>>
- <?php p($l->t("Change recovery key password:")); ?>
+ <?php p($l->t('Change recovery key password:')); ?>
<span class="msg"></span>
<br/>
<input
type="password"
name="changeRecoveryPassword"
id="oldEncryptionRecoveryPassword"
- placeholder="<?php p($l->t("Old recovery key password")); ?>"/>
+ placeholder="<?php p($l->t('Old recovery key password')); ?>"/>
<br />
<input
type="password"
name="changeRecoveryPassword"
id="newEncryptionRecoveryPassword"
- placeholder="<?php p($l->t("New recovery key password")); ?>"/>
+ placeholder="<?php p($l->t('New recovery key password')); ?>"/>
<input
type="password"
name="changeRecoveryPassword"
id="repeatedNewEncryptionRecoveryPassword"
- placeholder="<?php p($l->t("Repeat new recovery key password")); ?>"/>
+ placeholder="<?php p($l->t('Repeat new recovery key password')); ?>"/>
<button
type="button"
name="submitChangeRecoveryKey">
- <?php p($l->t("Change Password")); ?>
+ <?php p($l->t('Change Password')); ?>
</button>
</p>
<?php endif; ?>
diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php
index c125f1f4d31..604bed53a8f 100644
--- a/apps/encryption/templates/settings-personal.php
+++ b/apps/encryption/templates/settings-personal.php
@@ -7,54 +7,54 @@
*/
/** @var array $_ */
/** @var \OCP\IL10N $l */
-script('encryption', 'settings-personal');
+\OCP\Util::addScript('encryption', 'settings-personal', 'core');
?>
<form id="ocDefaultEncryptionModule" class="section">
<h2 data-anchor-name="basic-encryption-module"><?php p($l->t('Basic encryption module')); ?></h2>
- <?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED): ?>
+ <?php if ($_['initialized'] === \OCA\Encryption\Session::NOT_INITIALIZED): ?>
- <?php p($l->t("Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.")); ?>
+ <?php p($l->t('Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.')); ?>
- <?php elseif ($_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED): ?>
+ <?php elseif ($_['initialized'] === \OCA\Encryption\Session::INIT_EXECUTED): ?>
<p>
<a name="changePKPasswd" />
<label for="changePrivateKeyPasswd">
- <em><?php p($l->t("Your private key password no longer matches your log-in password.")); ?></em>
+ <em><?php p($l->t('Your private key password no longer matches your log-in password.')); ?></em>
</label>
<br />
- <?php p($l->t("Set your old private key password to your current log-in password:")); ?>
- <?php if ($_["recoveryEnabledForUser"]):
- p($l->t(" If you don't remember your old password you can ask your administrator to recover your files."));
+ <?php p($l->t('Set your old private key password to your current log-in password:')); ?>
+ <?php if ($_['recoveryEnabledForUser']):
+ p(' ' . $l->t('If you do not remember your old password you can ask your administrator to recover your files.'));
endif; ?>
<br />
<input
type="password"
name="changePrivateKeyPassword"
id="oldPrivateKeyPassword" />
- <label for="oldPrivateKeyPassword"><?php p($l->t("Old log-in password")); ?></label>
+ <label for="oldPrivateKeyPassword"><?php p($l->t('Old log-in password')); ?></label>
<br />
<input
type="password"
name="changePrivateKeyPassword"
id="newPrivateKeyPassword" />
- <label for="newRecoveryPassword"><?php p($l->t("Current log-in password")); ?></label>
+ <label for="newRecoveryPassword"><?php p($l->t('Current log-in password')); ?></label>
<br />
<button
type="button"
name="submitChangePrivateKeyPassword"
- disabled><?php p($l->t("Update Private Key Password")); ?>
+ disabled><?php p($l->t('Update Private Key Password')); ?>
</button>
<span class="msg"></span>
</p>
- <?php elseif ($_["recoveryEnabled"] && $_["privateKeySet"] && $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL): ?>
+ <?php elseif ($_['recoveryEnabled'] && $_['privateKeySet'] && $_['initialized'] === \OCA\Encryption\Session::INIT_SUCCESSFUL): ?>
<br />
<p id="userEnableRecovery">
- <label for="userEnableRecovery"><?php p($l->t("Enable password recovery:")); ?></label>
+ <label for="userEnableRecovery"><?php p($l->t('Enable password recovery:')); ?></label>
<span class="msg"></span>
<br />
- <em><?php p($l->t("Enabling this option will allow you to reobtain access to your encrypted files in case of password loss")); ?></em>
+ <em><?php p($l->t('Enabling this option will allow you to reobtain access to your encrypted files in case of password loss')); ?></em>
<br />
<input
type="radio"
@@ -62,8 +62,8 @@ script('encryption', 'settings-personal');
id="userEnableRecoveryCheckbox"
name="userEnableRecovery"
value="1"
- <?php echo($_["recoveryEnabledForUser"] ? 'checked="checked"' : ''); ?> />
- <label for="userEnableRecoveryCheckbox"><?php p($l->t("Enabled")); ?></label>
+ <?php echo($_['recoveryEnabledForUser'] ? 'checked="checked"' : ''); ?> />
+ <label for="userEnableRecoveryCheckbox"><?php p($l->t('Enabled')); ?></label>
<br />
<input
@@ -72,8 +72,8 @@ script('encryption', 'settings-personal');
id="userDisableRecoveryCheckbox"
name="userEnableRecovery"
value="0"
- <?php echo($_["recoveryEnabledForUser"] === false ? 'checked="checked"' : ''); ?> />
- <label for="userDisableRecoveryCheckbox"><?php p($l->t("Disabled")); ?></label>
+ <?php echo($_['recoveryEnabledForUser'] === false ? 'checked="checked"' : ''); ?> />
+ <label for="userDisableRecoveryCheckbox"><?php p($l->t('Disabled')); ?></label>
</p>
<?php endif; ?>
</form>
diff --git a/apps/encryption/tests/Command/FixEncryptedVersionTest.php b/apps/encryption/tests/Command/FixEncryptedVersionTest.php
index 9ea981e355d..d0af359183b 100644
--- a/apps/encryption/tests/Command/FixEncryptedVersionTest.php
+++ b/apps/encryption/tests/Command/FixEncryptedVersionTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2019 ownCloud GmbH
@@ -11,6 +13,12 @@ namespace OCA\Encryption\Tests\Command;
use OC\Files\View;
use OCA\Encryption\Command\FixEncryptedVersion;
use OCA\Encryption\Util;
+use OCP\Files\IRootFolder;
+use OCP\IConfig;
+use OCP\ITempManager;
+use OCP\IUserManager;
+use OCP\Server;
+use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Tester\CommandTester;
use Test\TestCase;
@@ -29,21 +37,18 @@ class FixEncryptedVersionTest extends TestCase {
use EncryptionTrait;
use UserTrait;
- private $userId;
+ private string $userId;
- /** @var FixEncryptedVersion */
- private $fixEncryptedVersion;
+ private FixEncryptedVersion $fixEncryptedVersion;
- /** @var CommandTester */
- private $commandTester;
+ private CommandTester $commandTester;
- /** @var Util|\PHPUnit\Framework\MockObject\MockObject */
- protected $util;
+ protected Util&MockObject $util;
public function setUp(): void {
parent::setUp();
- \OC::$server->getConfig()->setAppValue('encryption', 'useMasterKey', '1');
+ Server::get(IConfig::class)->setAppValue('encryption', 'useMasterKey', '1');
$this->util = $this->getMockBuilder(Util::class)
->disableOriginalConstructor()->getMock();
@@ -51,35 +56,35 @@ class FixEncryptedVersionTest extends TestCase {
$this->userId = $this->getUniqueId('user_');
$this->createUser($this->userId, 'foo12345678');
- $tmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+ $tmpFolder = Server::get(ITempManager::class)->getTemporaryFolder();
$this->registerMount($this->userId, '\OC\Files\Storage\Local', '/' . $this->userId, ['datadir' => $tmpFolder]);
$this->setupForUser($this->userId, 'foo12345678');
$this->loginWithEncryption($this->userId);
$this->fixEncryptedVersion = new FixEncryptedVersion(
- \OC::$server->getConfig(),
- \OC::$server->get(LoggerInterface::class),
- \OC::$server->getRootFolder(),
- \OC::$server->getUserManager(),
+ Server::get(IConfig::class),
+ Server::get(LoggerInterface::class),
+ Server::get(IRootFolder::class),
+ Server::get(IUserManager::class),
$this->util,
new View('/')
);
$this->commandTester = new CommandTester($this->fixEncryptedVersion);
- $this->assertTrue(\OC::$server->getEncryptionManager()->isEnabled());
- $this->assertTrue(\OC::$server->getEncryptionManager()->isReady());
- $this->assertTrue(\OC::$server->getEncryptionManager()->isReadyForUser($this->userId));
+ $this->assertTrue(Server::get(\OCP\Encryption\IManager::class)->isEnabled());
+ $this->assertTrue(Server::get(\OCP\Encryption\IManager::class)->isReady());
+ $this->assertTrue(Server::get(\OCP\Encryption\IManager::class)->isReadyForUser($this->userId));
}
/**
* In this test the encrypted version of the file is less than the original value
* but greater than zero
*/
- public function testEncryptedVersionLessThanOriginalValue() {
+ public function testEncryptedVersionLessThanOriginalValue(): void {
$this->util->expects($this->once())->method('isMasterKeyEnabled')
->willReturn(true);
- $view = new View("/" . $this->userId . "/files");
+ $view = new View('/' . $this->userId . '/files');
$view->touch('hello.txt');
$view->touch('world.txt');
@@ -143,11 +148,11 @@ Fixed the file: \"/$this->userId/files/world.txt\" with version 4", $output);
* In this test the encrypted version of the file is greater than the original value
* but greater than zero
*/
- public function testEncryptedVersionGreaterThanOriginalValue() {
+ public function testEncryptedVersionGreaterThanOriginalValue(): void {
$this->util->expects($this->once())->method('isMasterKeyEnabled')
->willReturn(true);
- $view = new View("/" . $this->userId . "/files");
+ $view = new View('/' . $this->userId . '/files');
$view->touch('hello.txt');
$view->touch('world.txt');
@@ -202,11 +207,11 @@ The file \"/$this->userId/files/world.txt\" is: OK
Fixed the file: \"/$this->userId/files/world.txt\" with version 4", $output);
}
- public function testVersionIsRestoredToOriginalIfNoFixIsFound() {
+ public function testVersionIsRestoredToOriginalIfNoFixIsFound(): void {
$this->util->expects($this->once())->method('isMasterKeyEnabled')
->willReturn(true);
- $view = new View("/" . $this->userId . "/files");
+ $view = new View('/' . $this->userId . '/files');
$view->touch('bar.txt');
for ($i = 0; $i < 40; $i++) {
@@ -227,16 +232,16 @@ Fixed the file: \"/$this->userId/files/world.txt\" with version 4", $output);
]);
$cacheInfo = $cache->get($fileInfo->getId());
- $encryptedVersion = $cacheInfo["encryptedVersion"];
+ $encryptedVersion = $cacheInfo['encryptedVersion'];
$this->assertEquals(15, $encryptedVersion);
}
- public function testRepairUnencryptedFileWhenVersionIsSet() {
+ public function testRepairUnencryptedFileWhenVersionIsSet(): void {
$this->util->expects($this->once())->method('isMasterKeyEnabled')
->willReturn(true);
- $view = new View("/" . $this->userId . "/files");
+ $view = new View('/' . $this->userId . '/files');
// create a file, it's encrypted and also the version is set in the database
$view->touch('hello.txt');
@@ -251,7 +256,7 @@ Fixed the file: \"/$this->userId/files/world.txt\" with version 4", $output);
$cacheInfo = ['encryptedVersion' => 1, 'encrypted' => 1];
$cache1->put($fileCache1->getPath(), $cacheInfo);
- $absPath = $storage1->getSourcePath('').$fileInfo1->getInternalPath();
+ $absPath = $storage1->getSourcePath('') . $fileInfo1->getInternalPath();
// create unencrypted file on disk, the version stays
file_put_contents($absPath, 'hello contents');
@@ -275,18 +280,18 @@ Fixed the file: \"/$this->userId/files/hello.txt\" with version 0 (unencrypted)"
/**
* Test commands with a file path
*/
- public function testExecuteWithFilePathOption() {
+ public function testExecuteWithFilePathOption(): void {
$this->util->expects($this->once())->method('isMasterKeyEnabled')
->willReturn(true);
- $view = new View("/" . $this->userId . "/files");
+ $view = new View('/' . $this->userId . '/files');
$view->touch('hello.txt');
$view->touch('world.txt');
$this->commandTester->execute([
'user' => $this->userId,
- '--path' => "/hello.txt"
+ '--path' => '/hello.txt'
]);
$output = $this->commandTester->getDisplay();
@@ -299,11 +304,11 @@ The file \"/$this->userId/files/hello.txt\" is: OK", $output);
/**
* Test commands with a directory path
*/
- public function testExecuteWithDirectoryPathOption() {
+ public function testExecuteWithDirectoryPathOption(): void {
$this->util->expects($this->once())->method('isMasterKeyEnabled')
->willReturn(true);
- $view = new View("/" . $this->userId . "/files");
+ $view = new View('/' . $this->userId . '/files');
$view->mkdir('sub');
$view->touch('sub/hello.txt');
@@ -311,7 +316,7 @@ The file \"/$this->userId/files/hello.txt\" is: OK", $output);
$this->commandTester->execute([
'user' => $this->userId,
- '--path' => "/sub"
+ '--path' => '/sub'
]);
$output = $this->commandTester->getDisplay();
@@ -321,13 +326,13 @@ The file \"/$this->userId/files/sub/hello.txt\" is: OK", $output);
$this->assertStringNotContainsString('world.txt', $output);
}
- public function testExecuteWithNoUser() {
+ public function testExecuteWithNoUser(): void {
$this->util->expects($this->once())->method('isMasterKeyEnabled')
->willReturn(true);
$this->commandTester->execute([
'user' => null,
- '--path' => "/"
+ '--path' => '/'
]);
$output = $this->commandTester->getDisplay();
@@ -335,13 +340,13 @@ The file \"/$this->userId/files/sub/hello.txt\" is: OK", $output);
$this->assertStringContainsString('Either a user id or --all needs to be provided', $output);
}
- public function testExecuteWithBadUser() {
+ public function testExecuteWithBadUser(): void {
$this->util->expects($this->once())->method('isMasterKeyEnabled')
->willReturn(true);
$this->commandTester->execute([
'user' => 'nonexisting',
- '--path' => "/"
+ '--path' => '/'
]);
$output = $this->commandTester->getDisplay();
@@ -352,7 +357,7 @@ The file \"/$this->userId/files/sub/hello.txt\" is: OK", $output);
/**
* Test commands with a directory path
*/
- public function testExecuteWithNonExistentPath() {
+ public function testExecuteWithNonExistentPath(): void {
$this->util->expects($this->once())->method('isMasterKeyEnabled')
->willReturn(true);
@@ -369,8 +374,8 @@ The file \"/$this->userId/files/sub/hello.txt\" is: OK", $output);
/**
* Test commands without master key
*/
- public function testExecuteWithNoMasterKey() {
- \OC::$server->getConfig()->setAppValue('encryption', 'useMasterKey', '0');
+ public function testExecuteWithNoMasterKey(): void {
+ Server::get(IConfig::class)->setAppValue('encryption', 'useMasterKey', '0');
$this->util->expects($this->once())->method('isMasterKeyEnabled')
->willReturn(false);
diff --git a/apps/encryption/tests/Command/TestEnableMasterKey.php b/apps/encryption/tests/Command/TestEnableMasterKey.php
index 8e7dabf8bb6..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.
@@ -17,22 +19,22 @@ use Test\TestCase;
class TestEnableMasterKey extends TestCase {
- /** @var EnableMasterKey */
+ /** @var EnableMasterKey */
protected $enableMasterKey;
- /** @var Util | \PHPUnit\Framework\MockObject\MockObject */
+ /** @var Util | \PHPUnit\Framework\MockObject\MockObject */
protected $util;
- /** @var \OCP\IConfig | \PHPUnit\Framework\MockObject\MockObject */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
protected $config;
/** @var \Symfony\Component\Console\Helper\QuestionHelper | \PHPUnit\Framework\MockObject\MockObject */
protected $questionHelper;
- /** @var \Symfony\Component\Console\Output\OutputInterface | \PHPUnit\Framework\MockObject\MockObject */
+ /** @var \Symfony\Component\Console\Output\OutputInterface | \PHPUnit\Framework\MockObject\MockObject */
protected $output;
- /** @var \Symfony\Component\Console\Input\InputInterface | \PHPUnit\Framework\MockObject\MockObject */
+ /** @var \Symfony\Component\Console\Input\InputInterface | \PHPUnit\Framework\MockObject\MockObject */
protected $input;
protected function setUp(): void {
@@ -53,12 +55,12 @@ class TestEnableMasterKey extends TestCase {
}
/**
- * @dataProvider dataTestExecute
*
* @param bool $isAlreadyEnabled
* @param string $answer
*/
- public function testExecute($isAlreadyEnabled, $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 955e9c7c964..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,39 +15,36 @@ 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 \OCP\IRequest|\PHPUnit\Framework\MockObject\MockObject */
- private $requestMock;
- /** @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject */
- private $configMock;
- /** @var \OCP\IL10N|\PHPUnit\Framework\MockObject\MockObject */
- private $l10nMock;
- /** @var \OCA\Encryption\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
*/
- public function testAdminRecovery($recoveryPassword, $passConfirm, $enableRecovery, $expectedMessage, $expectedStatus) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('adminRecoveryProvider')]
+ public function testAdminRecovery($recoveryPassword, $passConfirm, $enableRecovery, $expectedMessage, $expectedStatus): void {
$this->recoveryMock->expects($this->any())
->method('enableAdminRecovery')
->willReturn(true);
@@ -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,14 +73,14 @@ class RecoveryControllerTest extends TestCase {
}
/**
- * @dataProvider changeRecoveryPasswordProvider
* @param $password
* @param $confirmPassword
* @param $oldPassword
* @param $expectedMessage
* @param $expectedStatus
*/
- public function testChangeRecoveryPassword($password, $confirmPassword, $oldPassword, $expectedMessage, $expectedStatus) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('changeRecoveryPasswordProvider')]
+ public function testChangeRecoveryPassword($password, $confirmPassword, $oldPassword, $expectedMessage, $expectedStatus): void {
$this->recoveryMock->expects($this->any())
->method('changeRecoveryKeyPassword')
->with($password, $oldPassword)
@@ -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,12 +105,12 @@ class RecoveryControllerTest extends TestCase {
}
/**
- * @dataProvider userSetRecoveryProvider
* @param $enableRecovery
* @param $expectedMessage
* @param $expectedStatus
*/
- public function testUserSetRecovery($enableRecovery, $expectedMessage, $expectedStatus) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('userSetRecoveryProvider')]
+ public function testUserSetRecovery($enableRecovery, $expectedMessage, $expectedStatus): void {
$this->recoveryMock->expects($this->any())
->method('setRecoveryForUser')
->with($enableRecovery)
diff --git a/apps/encryption/tests/Controller/SettingsControllerTest.php b/apps/encryption/tests/Controller/SettingsControllerTest.php
index ee49972001c..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 \OCP\IRequest|\PHPUnit\Framework\MockObject\MockObject */
- private $requestMock;
-
- /** @var \OCP\IL10N|\PHPUnit\Framework\MockObject\MockObject */
- private $l10nMock;
-
- /** @var \OCP\IUserManager|\PHPUnit\Framework\MockObject\MockObject */
- private $userManagerMock;
-
- /** @var \OCP\IUserSession|\PHPUnit\Framework\MockObject\MockObject */
- private $userSessionMock;
-
- /** @var \OCA\Encryption\KeyManager|\PHPUnit\Framework\MockObject\MockObject */
- private $keyManagerMock;
+ protected SettingsController $controller;
- /** @var \OCA\Encryption\Crypto\Crypt|\PHPUnit\Framework\MockObject\MockObject */
- private $cryptMock;
-
- /** @var \OCA\Encryption\Session|\PHPUnit\Framework\MockObject\MockObject */
- private $sessionMock;
- /** @var MockObject|IUser */
- private $user;
-
- /** @var \OCP\ISession|\PHPUnit\Framework\MockObject\MockObject */
- private $ocSessionMock;
-
- /** @var \OCA\Encryption\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();
@@ -115,7 +98,7 @@ class SettingsControllerTest extends TestCase {
/**
* test updatePrivateKeyPassword() if wrong new password was entered
*/
- public function testUpdatePrivateKeyPasswordWrongNewPassword() {
+ public function testUpdatePrivateKeyPasswordWrongNewPassword(): void {
$oldPassword = 'old';
$newPassword = 'new';
@@ -140,7 +123,7 @@ class SettingsControllerTest extends TestCase {
/**
* test updatePrivateKeyPassword() if wrong old password was entered
*/
- public function testUpdatePrivateKeyPasswordWrongOldPassword() {
+ public function testUpdatePrivateKeyPasswordWrongOldPassword(): void {
$oldPassword = 'old';
$newPassword = 'new';
@@ -166,26 +149,22 @@ class SettingsControllerTest extends TestCase {
/**
* test updatePrivateKeyPassword() with the correct old and new password
*/
- public function testUpdatePrivateKeyPassword() {
+ public function testUpdatePrivateKeyPassword(): void {
$oldPassword = 'old';
$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())
@@ -227,7 +206,7 @@ class SettingsControllerTest extends TestCase {
$data['message']);
}
- public function testSetEncryptHomeStorage() {
+ public function testSetEncryptHomeStorage(): void {
$value = true;
$this->utilMock->expects($this->once())->method('setEncryptHomeStorage')->with($value);
$this->controller->setEncryptHomeStorage($value);
diff --git a/apps/encryption/tests/Controller/StatusControllerTest.php b/apps/encryption/tests/Controller/StatusControllerTest.php
index 3c59a80fe15..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 \OCP\IRequest|\PHPUnit\Framework\MockObject\MockObject */
- private $requestMock;
-
- /** @var \OCP\IL10N|\PHPUnit\Framework\MockObject\MockObject */
- private $l10nMock;
-
- /** @var \OCA\Encryption\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,12 +50,12 @@ class StatusControllerTest extends TestCase {
}
/**
- * @dataProvider dataTestGetStatus
*
* @param string $status
* @param string $expectedStatus
*/
- public function testGetStatus($status, $expectedStatus) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetStatus')]
+ public function testGetStatus($status, $expectedStatus): void {
$this->sessionMock->expects($this->once())
->method('getStatus')->willReturn($status);
$result = $this->controller->getStatus();
@@ -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 738dfe0a2a0..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.
@@ -8,27 +10,21 @@
namespace OCA\Encryption\Tests\Crypto;
use OCA\Encryption\Crypto\Crypt;
+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 \OCP\IUserSession|\PHPUnit\Framework\MockObject\MockObject */
- private $userSession;
-
- /** @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject */
- private $config;
-
- /** @var \OCP\IL10N|\PHPUnit\Framework\MockObject\MockObject */
- private $l;
+ protected LoggerInterface&MockObject $logger;
+ protected IUserSession&MockObject $userSession;
+ protected IConfig&MockObject $config;
+ protected IL10N&MockObject $l;
- /** @var Crypt */
- private $crypt;
+ protected Crypt $crypt;
protected function setUp(): void {
parent::setUp();
@@ -37,8 +33,7 @@ class CryptTest extends TestCase {
->disableOriginalConstructor()
->getMock();
$this->logger->expects($this->any())
- ->method('warning')
- ->willReturn(true);
+ ->method('warning');
$this->userSession = $this->getMockBuilder(IUserSession::class)
->disableOriginalConstructor()
->getMock();
@@ -53,7 +48,7 @@ class CryptTest extends TestCase {
/**
* test getOpenSSLConfig without any additional parameters
*/
- public function testGetOpenSSLConfigBasic() {
+ public function testGetOpenSSLConfigBasic(): void {
$this->config->expects($this->once())
->method('getSystemValue')
->with($this->equalTo('openssl'), $this->equalTo([]))
@@ -68,7 +63,7 @@ class CryptTest extends TestCase {
/**
* test getOpenSSLConfig with additional parameters defined in config.php
*/
- public function testGetOpenSSLConfig() {
+ public function testGetOpenSSLConfig(): void {
$this->config->expects($this->once())
->method('getSystemValue')
->with($this->equalTo('openssl'), $this->equalTo([]))
@@ -85,10 +80,9 @@ class CryptTest extends TestCase {
/**
* test generateHeader with valid key formats
- *
- * @dataProvider dataTestGenerateHeader
*/
- public function testGenerateHeader($keyFormat, $expected) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestGenerateHeader')]
+ public function testGenerateHeader($keyFormat, $expected): void {
$this->config->expects($this->once())
->method('getSystemValueString')
->with($this->equalTo('cipher'), $this->equalTo('AES-256-CTR'))
@@ -107,16 +101,13 @@ class CryptTest extends TestCase {
* test generateHeader with invalid key format
*
*/
- public function testGenerateHeaderInvalid() {
+ public function testGenerateHeaderInvalid(): void {
$this->expectException(\InvalidArgumentException::class);
$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'],
@@ -124,11 +115,11 @@ class CryptTest extends TestCase {
];
}
- public function testGetCipherWithInvalidCipher() {
+ public function testGetCipherWithInvalidCipher(): void {
$this->config->expects($this->once())
- ->method('getSystemValueString')
- ->with($this->equalTo('cipher'), $this->equalTo('AES-256-CTR'))
- ->willReturn('Not-Existing-Cipher');
+ ->method('getSystemValueString')
+ ->with($this->equalTo('cipher'), $this->equalTo('AES-256-CTR'))
+ ->willReturn('Not-Existing-Cipher');
$this->logger
->expects($this->once())
->method('warning')
@@ -138,11 +129,11 @@ class CryptTest extends TestCase {
}
/**
- * @dataProvider dataProviderGetCipher
* @param string $configValue
* @param string $expected
*/
- public function testGetCipher($configValue, $expected) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataProviderGetCipher')]
+ public function testGetCipher($configValue, $expected): void {
$this->config->expects($this->once())
->method('getSystemValueString')
->with($this->equalTo('cipher'), $this->equalTo('AES-256-CTR'))
@@ -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'],
@@ -172,7 +161,7 @@ class CryptTest extends TestCase {
/**
* test concatIV()
*/
- public function testConcatIV() {
+ public function testConcatIV(): void {
$result = self::invokePrivate(
$this->crypt,
'concatIV',
@@ -183,10 +172,8 @@ class CryptTest extends TestCase {
);
}
- /**
- * @dataProvider dataTestSplitMetaData
- */
- public function testSplitMetaData($data, $expected) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestSplitMetaData')]
+ public function testSplitMetaData($data, $expected): void {
$this->config->method('getSystemValueBool')
->with('encryption_skip_signature_check', false)
->willReturn(true);
@@ -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,10 +197,8 @@ class CryptTest extends TestCase {
];
}
- /**
- * @dataProvider dataTestHasSignature
- */
- public function testHasSignature($data, $expected) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestHasSignature')]
+ public function testHasSignature($data, $expected): void {
$this->config->method('getSystemValueBool')
->with('encryption_skip_signature_check', false)
->willReturn(true);
@@ -222,24 +207,22 @@ class CryptTest extends TestCase {
);
}
- public function dataTestHasSignature() {
+ public static function dataTestHasSignature(): array {
return [
['encryptedContent00iv001234567890123456xx', false],
['encryptedContent00iv00123456789012345600sig00e1992521e437f6915f9173b190a512cfc38a00ac24502db44e0ba10c2bb0cc86xxx', true]
];
}
- /**
- * @dataProvider dataTestHasSignatureFail
- */
- public function testHasSignatureFail($cipher) {
- $this->expectException(\OCP\Encryption\Exceptions\GenericEncryptionException::class);
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestHasSignatureFail')]
+ public function testHasSignatureFail($cipher): void {
+ $this->expectException(GenericEncryptionException::class);
$data = 'encryptedContent00iv001234567890123456xx';
$this->invokePrivate($this->crypt, 'hasSignature', [$data, $cipher]);
}
- public function dataTestHasSignatureFail() {
+ public static function dataTestHasSignatureFail(): array {
return [
['AES-256-CTR'],
['aes-256-ctr'],
@@ -251,7 +234,7 @@ class CryptTest extends TestCase {
/**
* test addPadding()
*/
- public function testAddPadding() {
+ public function testAddPadding(): void {
$result = self::invokePrivate($this->crypt, 'addPadding', ['data']);
$this->assertSame('dataxxx', $result);
}
@@ -259,21 +242,19 @@ class CryptTest extends TestCase {
/**
* test removePadding()
*
- * @dataProvider dataProviderRemovePadding
* @param $data
* @param $expected
*/
- public function testRemovePadding($data, $expected) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataProviderRemovePadding')]
+ public function testRemovePadding($data, $expected): void {
$result = self::invokePrivate($this->crypt, 'removePadding', [$data]);
$this->assertSame($expected, $result);
}
/**
* data provider for testRemovePadding
- *
- * @return array
*/
- public function dataProviderRemovePadding() {
+ public static function dataProviderRemovePadding(): array {
return [
['dataxx', 'data'],
['data', false]
@@ -283,7 +264,7 @@ class CryptTest extends TestCase {
/**
* test parseHeader()
*/
- public function testParseHeader() {
+ public function testParseHeader(): void {
$header = 'HBEGIN:foo:bar:cipher:AES-256-CFB:encoding:binary:HEND';
$result = self::invokePrivate($this->crypt, 'parseHeader', [$header]);
@@ -328,7 +309,7 @@ class CryptTest extends TestCase {
*
* @depends testEncrypt
*/
- public function testDecrypt($data) {
+ public function testDecrypt($data): void {
$result = self::invokePrivate(
$this->crypt,
'decrypt',
@@ -339,10 +320,9 @@ class CryptTest extends TestCase {
/**
* test return values of valid ciphers
- *
- * @dataProvider dataTestGetKeySize
*/
- public function testGetKeySize($cipher, $expected) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetKeySize')]
+ public function testGetKeySize($cipher, $expected): void {
$result = $this->invokePrivate($this->crypt, 'getKeySize', [$cipher]);
$this->assertSame($expected, $result);
}
@@ -351,16 +331,13 @@ class CryptTest extends TestCase {
* test exception if cipher is unknown
*
*/
- public function testGetKeySizeFailure() {
+ public function testGetKeySizeFailure(): void {
$this->expectException(\InvalidArgumentException::class);
$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
- */
- public function testDecryptPrivateKey($header, $privateKey, $expectedCipher, $isValidKey, $expected) {
+ #[\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 \OCA\Encryption\Crypto\Crypt | \PHPUnit\Framework\MockObject\MockObject $crypt */
+ /** @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'],
@@ -430,7 +399,7 @@ class CryptTest extends TestCase {
];
}
- public function testIsValidPrivateKey() {
+ public function testIsValidPrivateKey(): void {
$res = openssl_pkey_new();
openssl_pkey_export($res, $privateKey);
@@ -445,7 +414,7 @@ class CryptTest extends TestCase {
);
}
- public function testMultiKeyEncrypt() {
+ public function testMultiKeyEncrypt(): void {
$res = openssl_pkey_new();
openssl_pkey_export($res, $privateKey);
$publicKeyPem = openssl_pkey_get_details($res)['key'];
diff --git a/apps/encryption/tests/Crypto/DecryptAllTest.php b/apps/encryption/tests/Crypto/DecryptAllTest.php
index 7723fd5ce4f..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();
@@ -58,7 +51,7 @@ class DecryptAllTest extends TestCase {
);
}
- public function testUpdateSession() {
+ public function testUpdateSession(): void {
$this->session->expects($this->once())->method('prepareDecryptAll')
->with('user1', 'key1');
@@ -66,15 +59,16 @@ class DecryptAllTest extends TestCase {
}
/**
- * @dataProvider dataTestGetPrivateKey
*
* @param string $user
* @param string $recoveryKeyId
*/
- public function testGetPrivateKey($user, $recoveryKeyId, $masterKeyId) {
+ #[\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 ec05c422dd4..c56e3375a73 100644
--- a/apps/encryption/tests/Crypto/EncryptAllTest.php
+++ b/apps/encryption/tests/Crypto/EncryptAllTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -20,6 +22,8 @@ use OCP\L10N\IFactory;
use OCP\Mail\IMailer;
use OCP\Security\ISecureRandom;
use OCP\UserInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Formatter\OutputFormatterInterface;
use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Helper\QuestionHelper;
@@ -29,50 +33,23 @@ use Test\TestCase;
class EncryptAllTest extends TestCase {
- /** @var \PHPUnit\Framework\MockObject\MockObject | \OCA\Encryption\KeyManager */
- protected $keyManager;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject | \OCA\Encryption\Util */
- protected $util;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IUserManager */
- protected $userManager;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject | \OCA\Encryption\Users\Setup */
- protected $setupUser;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject | \OC\Files\View */
- protected $view;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IConfig */
- protected $config;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\Mail\IMailer */
- protected $mailer;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\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 | \OCP\UserInterface */
- protected $userInterface;
-
- /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\Security\ISecureRandom */
- protected $secureRandom;
-
- /** @var EncryptAll */
- protected $encryptAll;
+ protected KeyManager&MockObject $keyManager;
+ protected Util&MockObject $util;
+ protected IUserManager&MockObject $userManager;
+ protected Setup&MockObject $setupUser;
+ protected View&MockObject $view;
+ protected IConfig&MockObject $config;
+ protected IMailer&MockObject $mailer;
+ protected IL10N&MockObject $l;
+ protected IFactory&MockObject $l10nFactory;
+ protected \Symfony\Component\Console\Helper\QuestionHelper&MockObject $questionHelper;
+ protected \Symfony\Component\Console\Input\InputInterface&MockObject $inputInterface;
+ protected \Symfony\Component\Console\Output\OutputInterface&MockObject $outputInterface;
+ protected UserInterface&MockObject $userInterface;
+ protected ISecureRandom&MockObject $secureRandom;
+ protected LoggerInterface&MockObject $logger;
+
+ protected EncryptAll $encryptAll;
protected function setUp(): void {
parent::setUp();
@@ -101,10 +78,11 @@ class EncryptAllTest extends TestCase {
->disableOriginalConstructor()->getMock();
$this->userInterface = $this->getMockBuilder(UserInterface::class)
->disableOriginalConstructor()->getMock();
+ $this->logger = $this->createMock(LoggerInterface::class);
/**
* We need format method to return a string
- * @var OutputFormatterInterface|\PHPUnit\Framework\MockObject\MockObject
+ * @var OutputFormatterInterface&MockObject
*/
$outputFormatter = $this->createMock(OutputFormatterInterface::class);
$outputFormatter->method('isDecorated')->willReturn(false);
@@ -131,12 +109,20 @@ class EncryptAllTest extends TestCase {
$this->l,
$this->l10nFactory,
$this->questionHelper,
- $this->secureRandom
+ $this->secureRandom,
+ $this->logger,
);
}
- public function testEncryptAll() {
- /** @var EncryptAll | \PHPUnit\Framework\MockObject\MockObject $encryptAll */
+ protected function createFileInfoMock($type, string $name): FileInfo&MockObject {
+ $fileInfo = $this->createMock(FileInfo::class);
+ $fileInfo->method('getType')->willReturn($type);
+ $fileInfo->method('getName')->willReturn($name);
+ return $fileInfo;
+ }
+
+ public function testEncryptAll(): void {
+ /** @var EncryptAll&MockObject $encryptAll */
$encryptAll = $this->getMockBuilder(EncryptAll::class)
->setConstructorArgs(
[
@@ -150,10 +136,11 @@ class EncryptAllTest extends TestCase {
$this->l,
$this->l10nFactory,
$this->questionHelper,
- $this->secureRandom
+ $this->secureRandom,
+ $this->logger,
]
)
- ->setMethods(['createKeyPairs', 'encryptAllUsersFiles', 'outputPasswords'])
+ ->onlyMethods(['createKeyPairs', 'encryptAllUsersFiles', 'outputPasswords'])
->getMock();
$this->util->expects($this->any())->method('isMasterKeyEnabled')->willReturn(false);
@@ -164,8 +151,8 @@ class EncryptAllTest extends TestCase {
$encryptAll->encryptAll($this->inputInterface, $this->outputInterface);
}
- public function testEncryptAllWithMasterKey() {
- /** @var EncryptAll | \PHPUnit\Framework\MockObject\MockObject $encryptAll */
+ public function testEncryptAllWithMasterKey(): void {
+ /** @var EncryptAll&MockObject $encryptAll */
$encryptAll = $this->getMockBuilder(EncryptAll::class)
->setConstructorArgs(
[
@@ -179,10 +166,11 @@ class EncryptAllTest extends TestCase {
$this->l,
$this->l10nFactory,
$this->questionHelper,
- $this->secureRandom
+ $this->secureRandom,
+ $this->logger,
]
)
- ->setMethods(['createKeyPairs', 'encryptAllUsersFiles', 'outputPasswords'])
+ ->onlyMethods(['createKeyPairs', 'encryptAllUsersFiles', 'outputPasswords'])
->getMock();
$this->util->expects($this->any())->method('isMasterKeyEnabled')->willReturn(true);
@@ -194,8 +182,8 @@ class EncryptAllTest extends TestCase {
$encryptAll->encryptAll($this->inputInterface, $this->outputInterface);
}
- public function testCreateKeyPairs() {
- /** @var EncryptAll | \PHPUnit\Framework\MockObject\MockObject $encryptAll */
+ public function testCreateKeyPairs(): void {
+ /** @var EncryptAll&MockObject $encryptAll */
$encryptAll = $this->getMockBuilder(EncryptAll::class)
->setConstructorArgs(
[
@@ -209,10 +197,11 @@ class EncryptAllTest extends TestCase {
$this->l,
$this->l10nFactory,
$this->questionHelper,
- $this->secureRandom
+ $this->secureRandom,
+ $this->logger,
]
)
- ->setMethods(['setupUserFS', 'generateOneTimePassword'])
+ ->onlyMethods(['setupUserFS', 'generateOneTimePassword'])
->getMock();
@@ -244,8 +233,8 @@ class EncryptAllTest extends TestCase {
$this->assertSame('', $userPasswords['user2']);
}
- public function testEncryptAllUsersFiles() {
- /** @var EncryptAll | \PHPUnit\Framework\MockObject\MockObject $encryptAll */
+ public function testEncryptAllUsersFiles(): void {
+ /** @var EncryptAll&MockObject $encryptAll */
$encryptAll = $this->getMockBuilder(EncryptAll::class)
->setConstructorArgs(
[
@@ -259,10 +248,11 @@ class EncryptAllTest extends TestCase {
$this->l,
$this->l10nFactory,
$this->questionHelper,
- $this->secureRandom
+ $this->secureRandom,
+ $this->logger,
]
)
- ->setMethods(['encryptUsersFiles'])
+ ->onlyMethods(['encryptUsersFiles'])
->getMock();
$this->util->expects($this->any())->method('isMasterKeyEnabled')->willReturn(false);
@@ -271,17 +261,22 @@ class EncryptAllTest extends TestCase {
$this->invokePrivate($encryptAll, 'output', [$this->outputInterface]);
$this->invokePrivate($encryptAll, 'userPasswords', [['user1' => 'pwd1', 'user2' => 'pwd2']]);
- $encryptAll->expects($this->exactly(2))->method('encryptUsersFiles')
- ->withConsecutive(
- ['user1'],
- ['user2'],
- );
+ $encryptAllCalls = [];
+ $encryptAll->expects($this->exactly(2))
+ ->method('encryptUsersFiles')
+ ->willReturnCallback(function ($uid) use (&$encryptAllCalls): void {
+ $encryptAllCalls[] = $uid;
+ });
$this->invokePrivate($encryptAll, 'encryptAllUsersFiles');
+ self::assertEquals([
+ 'user1',
+ 'user2',
+ ], $encryptAllCalls);
}
- public function testEncryptUsersFiles() {
- /** @var EncryptAll | \PHPUnit\Framework\MockObject\MockObject $encryptAll */
+ public function testEncryptUsersFiles(): void {
+ /** @var EncryptAll&MockObject $encryptAll */
$encryptAll = $this->getMockBuilder(EncryptAll::class)
->setConstructorArgs(
[
@@ -295,43 +290,43 @@ class EncryptAllTest extends TestCase {
$this->l,
$this->l10nFactory,
$this->questionHelper,
- $this->secureRandom
+ $this->secureRandom,
+ $this->logger,
]
)
- ->setMethods(['encryptFile', 'setupUserFS'])
+ ->onlyMethods(['encryptFile', 'setupUserFS'])
->getMock();
$this->util->expects($this->any())->method('isMasterKeyEnabled')->willReturn(false);
$this->view->expects($this->exactly(2))->method('getDirectoryContent')
- ->withConsecutive(
- ['/user1/files'],
- ['/user1/files/foo'],
- )->willReturnOnConsecutiveCalls(
+ ->willReturnMap([
[
- ['name' => 'foo', 'type' => 'dir'],
- ['name' => 'bar', 'type' => 'file'],
+ '/user1/files',
+ '',
+ null,
+ [
+ $this->createFileInfoMock(FileInfo::TYPE_FOLDER, 'foo'),
+ $this->createFileInfoMock(FileInfo::TYPE_FILE, 'bar'),
+ ],
],
[
- ['name' => 'subfile', 'type' => 'file']
- ]
- );
-
- $this->view->expects($this->any())->method('is_dir')
- ->willReturnCallback(
- function ($path) {
- if ($path === '/user1/files/foo') {
- return true;
- }
- return false;
- }
- );
+ '/user1/files/foo',
+ '',
+ null,
+ [
+ $this->createFileInfoMock(FileInfo::TYPE_FILE, 'subfile'),
+ ],
+ ],
+ ]);
- $encryptAll->expects($this->exactly(2))->method('encryptFile')
- ->withConsecutive(
- ['/user1/files/bar'],
- ['/user1/files/foo/subfile'],
- );
+ $encryptAllCalls = [];
+ $encryptAll->expects($this->exactly(2))
+ ->method('encryptFile')
+ ->willReturnCallback(function (FileInfo $file, string $path) use (&$encryptAllCalls): bool {
+ $encryptAllCalls[] = $path;
+ return true;
+ });
$outputFormatter = $this->createMock(OutputFormatterInterface::class);
$outputFormatter->method('isDecorated')->willReturn(false);
@@ -341,9 +336,13 @@ 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() {
+ public function testGenerateOneTimePassword(): void {
$password = $this->invokePrivate($this->encryptAll, 'generateOneTimePassword', ['user1']);
$this->assertTrue(is_string($password));
$this->assertSame(8, strlen($password));
@@ -354,15 +353,14 @@ class EncryptAllTest extends TestCase {
}
/**
- * @dataProvider dataTestEncryptFile
* @param $isEncrypted
*/
- public function testEncryptFile($isEncrypted) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestEncryptFile')]
+ public function testEncryptFile($isEncrypted): void {
$fileInfo = $this->createMock(FileInfo::class);
$fileInfo->expects($this->any())->method('isEncrypted')
->willReturn($isEncrypted);
- $this->view->expects($this->any())->method('getFileInfo')
- ->willReturn($fileInfo);
+ $this->view->expects($this->never())->method('getFileInfo');
if ($isEncrypted) {
@@ -374,11 +372,11 @@ class EncryptAllTest extends TestCase {
}
$this->assertTrue(
- $this->invokePrivate($this->encryptAll, 'encryptFile', ['foo.txt'])
+ $this->invokePrivate($this->encryptAll, 'encryptFile', [$fileInfo, 'foo.txt'])
);
}
- public function dataTestEncryptFile() {
+ public static function dataTestEncryptFile(): array {
return [
[true],
[false],
diff --git a/apps/encryption/tests/Crypto/EncryptionTest.php b/apps/encryption/tests/Crypto/EncryptionTest.php
index 4767d22339d..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.
@@ -7,6 +9,8 @@
*/
namespace OCA\Encryption\Tests\Crypto;
+use OC\Encryption\Exceptions\DecryptionFailedException;
+use OC\Files\View;
use OCA\Encryption\Crypto\Crypt;
use OCA\Encryption\Crypto\DecryptAll;
use OCA\Encryption\Crypto\EncryptAll;
@@ -15,48 +19,32 @@ use OCA\Encryption\Exceptions\PublicKeyMissingException;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Session;
use OCA\Encryption\Util;
-use OCP\Files\Storage;
+use OCP\Files\Storage\IStorage;
use OCP\IL10N;
+use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Test\TestCase;
class EncryptionTest extends TestCase {
- /** @var Encryption */
- private $instance;
-
- /** @var \OCA\Encryption\KeyManager|\PHPUnit\Framework\MockObject\MockObject */
- private $keyManagerMock;
-
- /** @var \OCA\Encryption\Crypto\EncryptAll|\PHPUnit\Framework\MockObject\MockObject */
- private $encryptAllMock;
-
- /** @var \OCA\Encryption\Crypto\DecryptAll|\PHPUnit\Framework\MockObject\MockObject */
- private $decryptAllMock;
-
- /** @var \OCA\Encryption\Session|\PHPUnit\Framework\MockObject\MockObject */
- private $sessionMock;
-
- /** @var \OCA\Encryption\Crypto\Crypt|\PHPUnit\Framework\MockObject\MockObject */
- private $cryptMock;
-
- /** @var \OCA\Encryption\Util|\PHPUnit\Framework\MockObject\MockObject */
- private $utilMock;
- /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
- private $loggerMock;
+ protected Encryption $instance;
- /** @var \OCP\IL10N|\PHPUnit\Framework\MockObject\MockObject */
- private $l10nMock;
-
- /** @var \OCP\Files\Storage|\PHPUnit\Framework\MockObject\MockObject */
- private $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();
- $this->storageMock = $this->getMockBuilder(Storage::class)
+ $this->storageMock = $this->getMockBuilder(IStorage::class)
->disableOriginalConstructor()->getMock();
$this->cryptMock = $this->getMockBuilder(Crypt::class)
->disableOriginalConstructor()
@@ -102,7 +90,7 @@ class EncryptionTest extends TestCase {
/**
* test if public key from one of the recipients is missing
*/
- public function testEndUser1() {
+ public function testEndUser1(): void {
$this->sessionMock->expects($this->once())
->method('decryptAllModeActivated')
->willReturn(false);
@@ -115,12 +103,12 @@ class EncryptionTest extends TestCase {
* test if public key from owner is missing
*
*/
- public function testEndUser2() {
+ public function testEndUser2(): void {
$this->sessionMock->expects($this->once())
->method('decryptAllModeActivated')
->willReturn(false);
- $this->expectException(\OCA\Encryption\Exceptions\PublicKeyMissingException::class);
+ $this->expectException(PublicKeyMissingException::class);
$this->instance->begin('/foo/bar', 'user2', 'r', [], ['users' => ['user1', 'user2', 'user3']]);
$this->endTest();
@@ -164,16 +152,14 @@ class EncryptionTest extends TestCase {
return $publicKeys;
}
- /**
- * @dataProvider dataProviderForTestGetPathToRealFile
- */
- public function testGetPathToRealFile($path, $expected) {
+ #[\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'],
@@ -182,10 +168,8 @@ class EncryptionTest extends TestCase {
];
}
- /**
- * @dataProvider dataTestBegin
- */
- public function testBegin($mode, $header, $legacyCipher, $defaultCipher, $fileKey, $expected) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestBegin')]
+ public function testBegin($mode, $header, $legacyCipher, $defaultCipher, $fileKey, $expected): void {
$this->sessionMock->expects($this->once())
->method('decryptAllModeActivated')
->willReturn(false);
@@ -226,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'],
@@ -239,7 +223,7 @@ class EncryptionTest extends TestCase {
/**
* test begin() if decryptAll mode was activated
*/
- public function testBeginDecryptAll() {
+ public function testBeginDecryptAll(): void {
$path = '/user/files/foo.txt';
$fileKey = 'fileKey';
@@ -263,7 +247,7 @@ class EncryptionTest extends TestCase {
* in this case we can initialize the encryption without a username/password
* and continue
*/
- public function testBeginInitMasterKey() {
+ public function testBeginInitMasterKey(): void {
$this->sessionMock->expects($this->once())
->method('decryptAllModeActivated')
->willReturn(false);
@@ -277,12 +261,12 @@ class EncryptionTest extends TestCase {
}
/**
- * @dataProvider dataTestUpdate
*
* @param string $fileKey
* @param boolean $expected
*/
- public function testUpdate($fileKey, $expected) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestUpdate')]
+ public function testUpdate($fileKey, $expected): void {
$this->keyManagerMock->expects($this->once())
->method('getFileKey')->willReturn($fileKey);
@@ -303,24 +287,24 @@ class EncryptionTest extends TestCase {
);
}
- public function dataTestUpdate() {
+ public static function dataTestUpdate(): array {
return [
['', false],
['fileKey', true]
];
}
- public function testUpdateNoUsers() {
+ public function testUpdateNoUsers(): void {
$this->invokePrivate($this->instance, 'rememberVersion', [['path' => 2]]);
$this->keyManagerMock->expects($this->never())->method('getFileKey');
$this->keyManagerMock->expects($this->never())->method('getPublicKey');
$this->keyManagerMock->expects($this->never())->method('addSystemKeys');
$this->keyManagerMock->expects($this->once())->method('setVersion')
- ->willReturnCallback(function ($path, $version, $view) {
+ ->willReturnCallback(function ($path, $version, $view): void {
$this->assertSame('path', $path);
$this->assertSame(2, $version);
- $this->assertTrue($view instanceof \OC\Files\View);
+ $this->assertTrue($view instanceof View);
});
$this->instance->update('path', 'user1', []);
}
@@ -329,13 +313,13 @@ class EncryptionTest extends TestCase {
* Test case if the public key is missing. Nextcloud should still encrypt
* the file for the remaining users
*/
- public function testUpdateMissingPublicKey() {
+ public function testUpdateMissingPublicKey(): void {
$this->keyManagerMock->expects($this->once())
->method('getFileKey')->willReturn('fileKey');
$this->keyManagerMock->expects($this->any())
->method('getPublicKey')->willReturnCallback(
- function ($user) {
+ function ($user): void {
throw new PublicKeyMissingException($user);
}
);
@@ -366,10 +350,9 @@ class EncryptionTest extends TestCase {
/**
* by default the encryption module should encrypt regular files, files in
* files_versions and files in files_trashbin
- *
- * @dataProvider dataTestShouldEncrypt
*/
- public function testShouldEncrypt($path, $shouldEncryptHomeStorage, $isHomeStorage, $expected) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestShouldEncrypt')]
+ public function testShouldEncrypt($path, $shouldEncryptHomeStorage, $isHomeStorage, $expected): void {
$this->utilMock->expects($this->once())->method('shouldEncryptHomeStorage')
->willReturn($shouldEncryptHomeStorage);
@@ -385,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],
@@ -402,14 +385,14 @@ class EncryptionTest extends TestCase {
}
- public function testDecrypt() {
- $this->expectException(\OC\Encryption\Exceptions\DecryptionFailedException::class);
+ public function testDecrypt(): void {
+ $this->expectException(DecryptionFailedException::class);
$this->expectExceptionMessage('Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
$this->instance->decrypt('abc');
}
- public function testPrepareDecryptAll() {
+ public function testPrepareDecryptAll(): void {
/** @var \Symfony\Component\Console\Input\InputInterface $input */
$input = $this->createMock(InputInterface::class);
/** @var \Symfony\Component\Console\Output\OutputInterface $output */
diff --git a/apps/encryption/tests/EncryptedStorageTest.php b/apps/encryption/tests/EncryptedStorageTest.php
index 8c38586eb33..59f419a7f7a 100644
--- a/apps/encryption/tests/EncryptedStorageTest.php
+++ b/apps/encryption/tests/EncryptedStorageTest.php
@@ -13,6 +13,7 @@ use OC\Files\Storage\Wrapper\Encryption;
use OC\Files\View;
use OCP\Files\Mount\IMountManager;
use OCP\Files\Storage\IDisableEncryptionStorage;
+use OCP\Server;
use Test\TestCase;
use Test\Traits\EncryptionTrait;
use Test\Traits\MountProviderTrait;
@@ -30,24 +31,24 @@ class EncryptedStorageTest extends TestCase {
use EncryptionTrait;
use UserTrait;
- public function testMoveFromEncrypted() {
- $this->createUser("test1", "test2");
- $this->setupForUser("test1", 'test2');
+ public function testMoveFromEncrypted(): void {
+ $this->createUser('test1', 'test2');
+ $this->setupForUser('test1', 'test2');
$unwrapped = new Temporary();
- $this->registerMount("test1", new TemporaryNoEncrypted(), "/test1/files/unenc");
- $this->registerMount("test1", $unwrapped, "/test1/files/enc");
+ $this->registerMount('test1', new TemporaryNoEncrypted(), '/test1/files/unenc');
+ $this->registerMount('test1', $unwrapped, '/test1/files/enc');
- $this->loginWithEncryption("test1");
+ $this->loginWithEncryption('test1');
- $view = new View("/test1/files");
+ $view = new View('/test1/files');
/** @var IMountManager $mountManager */
- $mountManager = \OC::$server->get(IMountManager::class);
+ $mountManager = Server::get(IMountManager::class);
- $encryptedMount = $mountManager->find("/test1/files/enc");
- $unencryptedMount = $mountManager->find("/test1/files/unenc");
+ $encryptedMount = $mountManager->find('/test1/files/enc');
+ $unencryptedMount = $mountManager->find('/test1/files/unenc');
$encryptedStorage = $encryptedMount->getStorage();
$unencryptedStorage = $unencryptedMount->getStorage();
$encryptedCache = $encryptedStorage->getCache();
@@ -56,15 +57,15 @@ class EncryptedStorageTest extends TestCase {
$this->assertTrue($encryptedStorage->instanceOfStorage(Encryption::class));
$this->assertFalse($unencryptedStorage->instanceOfStorage(Encryption::class));
- $encryptedStorage->file_put_contents("foo.txt", "bar");
- $this->assertEquals("bar", $encryptedStorage->file_get_contents("foo.txt"));
- $this->assertStringStartsWith("HBEGIN:oc_encryption_module:", $unwrapped->file_get_contents("foo.txt"));
+ $encryptedStorage->file_put_contents('foo.txt', 'bar');
+ $this->assertEquals('bar', $encryptedStorage->file_get_contents('foo.txt'));
+ $this->assertStringStartsWith('HBEGIN:oc_encryption_module:', $unwrapped->file_get_contents('foo.txt'));
- $this->assertTrue($encryptedCache->get("foo.txt")->isEncrypted());
+ $this->assertTrue($encryptedCache->get('foo.txt')->isEncrypted());
- $view->rename("enc/foo.txt", "unenc/foo.txt");
+ $view->rename('enc/foo.txt', 'unenc/foo.txt');
- $this->assertEquals("bar", $unencryptedStorage->file_get_contents("foo.txt"));
- $this->assertFalse($unencryptedCache->get("foo.txt")->isEncrypted());
+ $this->assertEquals('bar', $unencryptedStorage->file_get_contents('foo.txt'));
+ $this->assertFalse($unencryptedCache->get('foo.txt')->isEncrypted());
}
}
diff --git a/apps/encryption/tests/HookManagerTest.php b/apps/encryption/tests/HookManagerTest.php
deleted file mode 100644
index 4a662f3bc4a..00000000000
--- a/apps/encryption/tests/HookManagerTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-namespace OCA\Encryption\Tests;
-
-use OCA\Encryption\HookManager;
-use OCA\Encryption\Hooks\Contracts\IHook;
-use OCP\IConfig;
-use Test\TestCase;
-
-class HookManagerTest extends TestCase {
-
- /**
- * @var HookManager
- */
- private static $instance;
-
-
- public function testRegisterHookWithArray() {
- self::$instance->registerHook([
- $this->getMockBuilder(IHook::class)->disableOriginalConstructor()->getMock(),
- $this->getMockBuilder(IHook::class)->disableOriginalConstructor()->getMock(),
- $this->createMock(IConfig::class)
- ]);
-
- $hookInstances = self::invokePrivate(self::$instance, 'hookInstances');
- // Make sure our type checking works
- $this->assertCount(2, $hookInstances);
- }
-
-
-
- public static function setUpBeforeClass(): void {
- parent::setUpBeforeClass();
- // have to make instance static to preserve data between tests
- self::$instance = new HookManager();
- }
-
-
- public function testRegisterHooksWithInstance() {
- $mock = $this->getMockBuilder(IHook::class)->disableOriginalConstructor()->getMock();
- /** @var \OCA\Encryption\Hooks\Contracts\IHook $mock */
- self::$instance->registerHook($mock);
-
- $hookInstances = self::invokePrivate(self::$instance, 'hookInstances');
- $this->assertCount(3, $hookInstances);
- }
-}
diff --git a/apps/encryption/tests/Hooks/UserHooksTest.php b/apps/encryption/tests/Hooks/UserHooksTest.php
deleted file mode 100644
index 5c67a5313b6..00000000000
--- a/apps/encryption/tests/Hooks/UserHooksTest.php
+++ /dev/null
@@ -1,370 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-namespace OCA\Encryption\Tests\Hooks;
-
-use OCA\Encryption\Crypto\Crypt;
-use OCA\Encryption\Hooks\UserHooks;
-use OCA\Encryption\KeyManager;
-use OCA\Encryption\Recovery;
-use OCA\Encryption\Session;
-use OCA\Encryption\Users\Setup;
-use OCA\Encryption\Util;
-use OCP\IUser;
-use OCP\IUserManager;
-use OCP\IUserSession;
-use PHPUnit\Framework\MockObject\MockObject;
-use Psr\Log\LoggerInterface;
-use Test\TestCase;
-
-/**
- * Class UserHooksTest
- *
- * @group DB
- * @package OCA\Encryption\Tests\Hooks
- */
-class UserHooksTest extends TestCase {
- /**
- * @var \PHPUnit\Framework\MockObject\MockObject
- */
- private $utilMock;
- /**
- * @var \PHPUnit\Framework\MockObject\MockObject
- */
- private $recoveryMock;
- /**
- * @var \PHPUnit\Framework\MockObject\MockObject
- */
- private $sessionMock;
- /**
- * @var \PHPUnit\Framework\MockObject\MockObject
- */
- private $keyManagerMock;
- /**
- * @var \PHPUnit\Framework\MockObject\MockObject
- */
- private $userManagerMock;
-
- /**
- * @var \PHPUnit\Framework\MockObject\MockObject
- */
- private $userSetupMock;
- /**
- * @var \PHPUnit\Framework\MockObject\MockObject
- */
- private $userSessionMock;
- /**
- * @var MockObject|IUser
- */
- private $user;
- /**
- * @var \PHPUnit\Framework\MockObject\MockObject
- */
- private $cryptMock;
- /**
- * @var \PHPUnit\Framework\MockObject\MockObject
- */
- private $loggerMock;
- /**
- * @var UserHooks
- */
- private $instance;
-
- private $params = ['uid' => 'testUser', 'password' => 'password'];
-
- public function testLogin() {
- $this->userSetupMock->expects($this->once())
- ->method('setupUser')
- ->willReturnOnConsecutiveCalls(true, false);
-
- $this->keyManagerMock->expects($this->once())
- ->method('init')
- ->with('testUser', 'password');
-
- $this->assertNull($this->instance->login($this->params));
- }
-
- public function testLogout() {
- $this->sessionMock->expects($this->once())
- ->method('clear');
- $this->instance->logout();
- $this->addToAssertionCount(1);
- }
-
- public function testPostCreateUser() {
- $this->userSetupMock->expects($this->once())
- ->method('setupUser');
-
- $this->instance->postCreateUser($this->params);
- $this->addToAssertionCount(1);
- }
-
- public function testPostDeleteUser() {
- $this->keyManagerMock->expects($this->once())
- ->method('deletePublicKey')
- ->with('testUser');
-
- $this->instance->postDeleteUser($this->params);
- $this->addToAssertionCount(1);
- }
-
- public function testPrePasswordReset() {
- $params = ['uid' => 'user1'];
- $expected = ['user1' => true];
- $this->instance->prePasswordReset($params);
- $passwordResetUsers = $this->invokePrivate($this->instance, 'passwordResetUsers');
-
- $this->assertSame($expected, $passwordResetUsers);
- }
-
- public function testPostPasswordReset() {
- $params = ['uid' => 'user1', 'password' => 'password'];
- $this->invokePrivate($this->instance, 'passwordResetUsers', [['user1' => true]]);
- $this->keyManagerMock->expects($this->once())->method('backupUserKeys')
- ->with('passwordReset', 'user1');
- $this->keyManagerMock->expects($this->once())->method('deleteUserKeys')
- ->with('user1');
- $this->userSetupMock->expects($this->once())->method('setupUser')
- ->with('user1', 'password');
-
- $this->instance->postPasswordReset($params);
- $passwordResetUsers = $this->invokePrivate($this->instance, 'passwordResetUsers');
- $this->assertEmpty($passwordResetUsers);
- }
-
- /**
- * @dataProvider dataTestPreSetPassphrase
- */
- public function testPreSetPassphrase($canChange) {
- /** @var UserHooks | \PHPUnit\Framework\MockObject\MockObject $instance */
- $instance = $this->getMockBuilder(UserHooks::class)
- ->setConstructorArgs(
- [
- $this->keyManagerMock,
- $this->userManagerMock,
- $this->loggerMock,
- $this->userSetupMock,
- $this->userSessionMock,
- $this->utilMock,
- $this->sessionMock,
- $this->cryptMock,
- $this->recoveryMock
- ]
- )
- ->setMethods(['setPassphrase'])
- ->getMock();
-
- $userMock = $this->createMock(IUser::class);
-
- $this->userManagerMock->expects($this->once())
- ->method('get')
- ->with($this->params['uid'])
- ->willReturn($userMock);
- $userMock->expects($this->once())
- ->method('canChangePassword')
- ->willReturn($canChange);
-
- if ($canChange) {
- // in this case the password will be changed in the post hook
- $instance->expects($this->never())->method('setPassphrase');
- } else {
- // if user can't change the password we update the encryption
- // key password already in the pre hook
- $instance->expects($this->once())
- ->method('setPassphrase')
- ->with($this->params);
- }
-
- $instance->preSetPassphrase($this->params);
- }
-
- public function dataTestPreSetPassphrase() {
- return [
- [true],
- [false]
- ];
- }
-
- public function XtestSetPassphrase() {
- $this->sessionMock->expects($this->once())
- ->method('getPrivateKey')
- ->willReturn(true);
-
- $this->cryptMock->expects($this->exactly(4))
- ->method('encryptPrivateKey')
- ->willReturn(true);
-
- $this->cryptMock->expects($this->any())
- ->method('generateHeader')
- ->willReturn(Crypt::HEADER_START . ':Cipher:test:' . Crypt::HEADER_END);
-
- $this->keyManagerMock->expects($this->exactly(4))
- ->method('setPrivateKey')
- ->willReturnCallback(function ($user, $key) {
- $header = substr($key, 0, strlen(Crypt::HEADER_START));
- $this->assertSame(
- Crypt::HEADER_START,
- $header, 'every encrypted file should start with a header');
- });
-
- $this->assertNull($this->instance->setPassphrase($this->params));
- $this->params['recoveryPassword'] = 'password';
-
- $this->recoveryMock->expects($this->exactly(3))
- ->method('isRecoveryEnabledForUser')
- ->with('testUser1')
- ->willReturnOnConsecutiveCalls(true, false);
-
-
- $this->instance = $this->getMockBuilder(UserHooks::class)
- ->setConstructorArgs(
- [
- $this->keyManagerMock,
- $this->userManagerMock,
- $this->loggerMock,
- $this->userSetupMock,
- $this->userSessionMock,
- $this->utilMock,
- $this->sessionMock,
- $this->cryptMock,
- $this->recoveryMock
- ]
- )->setMethods(['initMountPoints'])->getMock();
-
- $this->instance->expects($this->exactly(3))->method('initMountPoints');
-
- $this->params['uid'] = 'testUser1';
-
- // Test first if statement
- $this->assertNull($this->instance->setPassphrase($this->params));
-
- // Test Second if conditional
- $this->keyManagerMock->expects($this->exactly(2))
- ->method('userHasKeys')
- ->with('testUser1')
- ->willReturn(true);
-
- $this->assertNull($this->instance->setPassphrase($this->params));
-
- // Test third and final if condition
- $this->utilMock->expects($this->once())
- ->method('userHasFiles')
- ->with('testUser1')
- ->willReturn(false);
-
- $this->cryptMock->expects($this->once())
- ->method('createKeyPair');
-
- $this->keyManagerMock->expects($this->once())
- ->method('setPrivateKey');
-
- $this->recoveryMock->expects($this->once())
- ->method('recoverUsersFiles')
- ->with('password', 'testUser1');
-
- $this->assertNull($this->instance->setPassphrase($this->params));
- }
-
- public function testSetPassphraseResetUserMode() {
- $params = ['uid' => 'user1', 'password' => 'password'];
- $this->invokePrivate($this->instance, 'passwordResetUsers', [[$params['uid'] => true]]);
- $this->sessionMock->expects($this->never())->method('getPrivateKey');
- $this->keyManagerMock->expects($this->never())->method('setPrivateKey');
- $this->assertTrue($this->instance->setPassphrase($params));
- $this->invokePrivate($this->instance, 'passwordResetUsers', [[]]);
- }
-
- public function XtestSetPasswordNoUser() {
- $userSessionMock = $this->getMockBuilder(IUserSession::class)
- ->disableOriginalConstructor()
- ->getMock();
-
- $userSessionMock->expects($this->any())->method('getUser')->willReturn(null);
-
- $this->recoveryMock->expects($this->once())
- ->method('isRecoveryEnabledForUser')
- ->with('testUser')
- ->willReturn(false);
-
- $userHooks = $this->getMockBuilder(UserHooks::class)
- ->setConstructorArgs(
- [
- $this->keyManagerMock,
- $this->userManagerMock,
- $this->loggerMock,
- $this->userSetupMock,
- $userSessionMock,
- $this->utilMock,
- $this->sessionMock,
- $this->cryptMock,
- $this->recoveryMock
- ]
- )->setMethods(['initMountPoints'])->getMock();
-
- /** @var \OCA\Encryption\Hooks\UserHooks $userHooks */
- $this->assertNull($userHooks->setPassphrase($this->params));
- }
-
- protected function setUp(): void {
- parent::setUp();
- $this->loggerMock = $this->createMock(LoggerInterface::class);
- $this->keyManagerMock = $this->getMockBuilder(KeyManager::class)
- ->disableOriginalConstructor()
- ->getMock();
- $this->userManagerMock = $this->getMockBuilder(IUserManager::class)
- ->disableOriginalConstructor()
- ->getMock();
- $this->userSetupMock = $this->getMockBuilder(Setup::class)
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->user = $this->createMock(IUser::class);
- $this->user->expects($this->any())
- ->method('getUID')
- ->willReturn('testUser');
-
- $this->userSessionMock = $this->createMock(IUserSession::class);
- $this->userSessionMock->expects($this->any())
- ->method('getUser')
- ->willReturn($this->user);
-
- $utilMock = $this->getMockBuilder(Util::class)
- ->disableOriginalConstructor()
- ->getMock();
-
- $sessionMock = $this->getMockBuilder(Session::class)
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->cryptMock = $this->getMockBuilder(Crypt::class)
- ->disableOriginalConstructor()
- ->getMock();
- $recoveryMock = $this->getMockBuilder(Recovery::class)
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->sessionMock = $sessionMock;
- $this->recoveryMock = $recoveryMock;
- $this->utilMock = $utilMock;
- $this->utilMock->expects($this->any())->method('isMasterKeyEnabled')->willReturn(false);
-
- $this->instance = $this->getMockBuilder(UserHooks::class)
- ->setConstructorArgs(
- [
- $this->keyManagerMock,
- $this->userManagerMock,
- $this->loggerMock,
- $this->userSetupMock,
- $this->userSessionMock,
- $this->utilMock,
- $this->sessionMock,
- $this->cryptMock,
- $this->recoveryMock
- ]
- )->setMethods(['setupFS'])->getMock();
- }
-}
diff --git a/apps/encryption/tests/KeyManagerTest.php b/apps/encryption/tests/KeyManagerTest.php
index b408c9e180b..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.
@@ -10,12 +12,15 @@ namespace OCA\Encryption\Tests;
use OC\Files\FileInfo;
use OC\Files\View;
use OCA\Encryption\Crypto\Crypt;
+use OCA\Encryption\Crypto\Encryption;
+use OCA\Encryption\Exceptions\PrivateKeyMissingException;
+use OCA\Encryption\Exceptions\PublicKeyMissingException;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Session;
use OCA\Encryption\Util;
use OCP\Encryption\Keys\IStorage;
use OCP\Files\Cache\ICache;
-use OCP\Files\Storage;
+use OCP\Files\Storage\IStorage as FilesIStorage;
use OCP\IConfig;
use OCP\IUserSession;
use OCP\Lock\ILockingProvider;
@@ -25,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 \OCA\Encryption\Crypto\Crypt|\PHPUnit\Framework\MockObject\MockObject */
- private $cryptMock;
+ protected KeyManager $instance;
- /** @var \OCP\IUserSession|\PHPUnit\Framework\MockObject\MockObject */
- private $userMock;
-
- /** @var \OCA\Encryption\Session|\PHPUnit\Framework\MockObject\MockObject */
- private $sessionMock;
-
- /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
- private $logMock;
-
- /** @var \OCA\Encryption\Util|\PHPUnit\Framework\MockObject\MockObject */
- private $utilMock;
-
- /** @var \OCP\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();
@@ -95,7 +78,7 @@ class KeyManagerTest extends TestCase {
);
}
- public function testDeleteShareKey() {
+ public function testDeleteShareKey(): void {
$this->keyStorageMock->expects($this->any())
->method('deleteFileKey')
->with($this->equalTo('/path'), $this->equalTo('keyId.shareKey'))
@@ -106,7 +89,7 @@ class KeyManagerTest extends TestCase {
);
}
- public function testGetPrivateKey() {
+ public function testGetPrivateKey(): void {
$this->keyStorageMock->expects($this->any())
->method('getUserKey')
->with($this->equalTo($this->userId), $this->equalTo('privateKey'))
@@ -118,7 +101,7 @@ class KeyManagerTest extends TestCase {
);
}
- public function testGetPublicKey() {
+ public function testGetPublicKey(): void {
$this->keyStorageMock->expects($this->any())
->method('getUserKey')
->with($this->equalTo($this->userId), $this->equalTo('publicKey'))
@@ -130,7 +113,7 @@ class KeyManagerTest extends TestCase {
);
}
- public function testRecoveryKeyExists() {
+ public function testRecoveryKeyExists(): void {
$this->keyStorageMock->expects($this->any())
->method('getSystemUserKey')
->with($this->equalTo($this->systemKeyId . '.publicKey'))
@@ -140,7 +123,7 @@ class KeyManagerTest extends TestCase {
$this->assertTrue($this->instance->recoveryKeyExists());
}
- public function testCheckRecoveryKeyPassword() {
+ public function testCheckRecoveryKeyPassword(): void {
$this->keyStorageMock->expects($this->any())
->method('getSystemUserKey')
->with($this->equalTo($this->systemKeyId . '.privateKey'))
@@ -153,7 +136,7 @@ class KeyManagerTest extends TestCase {
$this->assertTrue($this->instance->checkRecoveryPassword('pass'));
}
- public function testSetPublicKey() {
+ public function testSetPublicKey(): void {
$this->keyStorageMock->expects($this->any())
->method('setUserKey')
->with(
@@ -168,7 +151,7 @@ class KeyManagerTest extends TestCase {
);
}
- public function testSetPrivateKey() {
+ public function testSetPrivateKey(): void {
$this->keyStorageMock->expects($this->any())
->method('setUserKey')
->with(
@@ -183,10 +166,8 @@ class KeyManagerTest extends TestCase {
);
}
- /**
- * @dataProvider dataTestUserHasKeys
- */
- public function testUserHasKeys($key, $expected) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestUserHasKeys')]
+ public function testUserHasKeys($key, $expected): void {
$this->keyStorageMock->expects($this->exactly(2))
->method('getUserKey')
->with($this->equalTo($this->userId), $this->anything())
@@ -198,7 +179,7 @@ class KeyManagerTest extends TestCase {
);
}
- public function dataTestUserHasKeys() {
+ public static function dataTestUserHasKeys(): array {
return [
['key', true],
['', false]
@@ -206,8 +187,8 @@ class KeyManagerTest extends TestCase {
}
- public function testUserHasKeysMissingPrivateKey() {
- $this->expectException(\OCA\Encryption\Exceptions\PrivateKeyMissingException::class);
+ public function testUserHasKeysMissingPrivateKey(): void {
+ $this->expectException(PrivateKeyMissingException::class);
$this->keyStorageMock->expects($this->exactly(2))
->method('getUserKey')
@@ -222,8 +203,8 @@ class KeyManagerTest extends TestCase {
}
- public function testUserHasKeysMissingPublicKey() {
- $this->expectException(\OCA\Encryption\Exceptions\PublicKeyMissingException::class);
+ public function testUserHasKeysMissingPublicKey(): void {
+ $this->expectException(PublicKeyMissingException::class);
$this->keyStorageMock->expects($this->exactly(2))
->method('getUserKey')
@@ -238,12 +219,11 @@ class KeyManagerTest extends TestCase {
}
/**
- * @dataProvider dataTestInit
- *
* @param bool $useMasterKey
*/
- public function testInit($useMasterKey) {
- /** @var \OCA\Encryption\KeyManager|\PHPUnit\Framework\MockObject\MockObject $instance */
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestInit')]
+ public function testInit($useMasterKey): void {
+ /** @var KeyManager&MockObject $instance */
$instance = $this->getMockBuilder(KeyManager::class)
->setConstructorArgs(
[
@@ -256,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');
@@ -287,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]
@@ -297,7 +282,7 @@ class KeyManagerTest extends TestCase {
}
- public function testSetRecoveryKey() {
+ public function testSetRecoveryKey(): void {
$this->keyStorageMock->expects($this->exactly(2))
->method('setSystemUserKey')
->willReturn(true);
@@ -313,7 +298,7 @@ class KeyManagerTest extends TestCase {
);
}
- public function testSetSystemPrivateKey() {
+ public function testSetSystemPrivateKey(): void {
$this->keyStorageMock->expects($this->exactly(1))
->method('setSystemUserKey')
->with($this->equalTo('keyId.privateKey'), $this->equalTo('key'))
@@ -325,7 +310,7 @@ class KeyManagerTest extends TestCase {
);
}
- public function testGetSystemPrivateKey() {
+ public function testGetSystemPrivateKey(): void {
$this->keyStorageMock->expects($this->exactly(1))
->method('getSystemUserKey')
->with($this->equalTo('keyId.privateKey'))
@@ -337,7 +322,7 @@ class KeyManagerTest extends TestCase {
);
}
- public function testGetEncryptedFileKey() {
+ public function testGetEncryptedFileKey(): void {
$this->keyStorageMock->expects($this->once())
->method('getFileKey')
->with('/', 'fileKey')
@@ -346,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'],
@@ -368,14 +353,14 @@ class KeyManagerTest extends TestCase {
}
/**
- * @dataProvider dataTestGetFileKey
*
* @param $uid
* @param $isMasterKeyEnabled
* @param $privateKey
* @param $expected
*/
- public function testGetFileKey($uid, $isMasterKeyEnabled, $privateKey, $encryptedFileKey, $expected) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetFileKey')]
+ public function testGetFileKey($uid, $isMasterKeyEnabled, $privateKey, $encryptedFileKey, $expected): void {
$path = '/foo.txt';
if ($isMasterKeyEnabled) {
@@ -392,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);
@@ -446,7 +427,7 @@ class KeyManagerTest extends TestCase {
);
}
- public function testDeletePrivateKey() {
+ public function testDeletePrivateKey(): void {
$this->keyStorageMock->expects($this->once())
->method('deleteUserKey')
->with('user1', 'privateKey')
@@ -457,7 +438,7 @@ class KeyManagerTest extends TestCase {
[$this->userId]));
}
- public function testDeleteAllFileKeys() {
+ public function testDeleteAllFileKeys(): void {
$this->keyStorageMock->expects($this->once())
->method('deleteAllFileKeys')
->willReturn(true);
@@ -468,14 +449,14 @@ 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
*/
- public function testAddSystemKeys($accessList, $publicKeys, $uid, $expectedKeys) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestAddSystemKeys')]
+ public function testAddSystemKeys($accessList, $publicKeys, $uid, $expectedKeys): void {
$publicShareKeyId = 'publicShareKey';
$recoveryKeyId = 'recoveryKey';
@@ -512,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']],
@@ -521,13 +502,13 @@ class KeyManagerTest extends TestCase {
];
}
- public function testGetMasterKeyId() {
+ public function testGetMasterKeyId(): void {
$this->assertSame('systemKeyId', $this->instance->getMasterKeyId());
}
- public function testGetPublicMasterKey() {
+ public function testGetPublicMasterKey(): void {
$this->keyStorageMock->expects($this->once())->method('getSystemUserKey')
- ->with('systemKeyId.publicKey', \OCA\Encryption\Crypto\Encryption::ID)
+ ->with('systemKeyId.publicKey', Encryption::ID)
->willReturn(true);
$this->assertTrue(
@@ -535,7 +516,7 @@ class KeyManagerTest extends TestCase {
);
}
- public function testGetMasterKeyPassword() {
+ public function testGetMasterKeyPassword(): void {
$this->configMock->expects($this->once())->method('getSystemValue')->with('secret')
->willReturn('password');
@@ -545,7 +526,7 @@ class KeyManagerTest extends TestCase {
}
- public function testGetMasterKeyPasswordException() {
+ public function testGetMasterKeyPasswordException(): void {
$this->expectException(\Exception::class);
$this->configMock->expects($this->once())->method('getSystemValue')->with('secret')
@@ -555,12 +536,11 @@ class KeyManagerTest extends TestCase {
}
/**
- * @dataProvider dataTestValidateMasterKey
- *
* @param $masterKey
*/
- public function testValidateMasterKey($masterKey) {
- /** @var \OCA\Encryption\KeyManager | \PHPUnit\Framework\MockObject\MockObject $instance */
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestValidateMasterKey')]
+ public function testValidateMasterKey($masterKey): void {
+ /** @var KeyManager&MockObject $instance */
$instance = $this->getMockBuilder(KeyManager::class)
->setConstructorArgs(
[
@@ -573,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')
@@ -589,7 +569,7 @@ class KeyManagerTest extends TestCase {
$this->cryptMock->expects($this->once())->method('createKeyPair')
->willReturn(['publicKey' => 'public', 'privateKey' => 'private']);
$this->keyStorageMock->expects($this->once())->method('setSystemUserKey')
- ->with('systemKeyId.publicKey', 'public', \OCA\Encryption\Crypto\Encryption::ID);
+ ->with('systemKeyId.publicKey', 'public', Encryption::ID);
$this->cryptMock->expects($this->once())->method('encryptPrivateKey')
->with('private', 'masterKeyPassword', 'systemKeyId')
->willReturn('EncryptedKey');
@@ -607,21 +587,20 @@ class KeyManagerTest extends TestCase {
$instance->validateMasterKey();
}
- public function testValidateMasterKeyLocked() {
- /** @var \OCA\Encryption\KeyManager | \PHPUnit_Framework_MockObject_MockObject $instance */
+ public function testValidateMasterKeyLocked(): void {
+ /** @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')
@@ -643,14 +622,14 @@ class KeyManagerTest extends TestCase {
$instance->validateMasterKey();
}
- public function dataTestValidateMasterKey() {
+ public static function dataTestValidateMasterKey(): array {
return [
['masterKey'],
['']
];
}
- public function testGetVersionWithoutFileInfo() {
+ public function testGetVersionWithoutFileInfo(): void {
$view = $this->getMockBuilder(View::class)
->disableOriginalConstructor()->getMock();
$view->expects($this->once())
@@ -658,11 +637,11 @@ class KeyManagerTest extends TestCase {
->with('/admin/files/myfile.txt')
->willReturn(false);
- /** @var \OC\Files\View $view */
+ /** @var View $view */
$this->assertSame(0, $this->instance->getVersion('/admin/files/myfile.txt', $view));
}
- public function testGetVersionWithFileInfo() {
+ public function testGetVersionWithFileInfo(): void {
$view = $this->getMockBuilder(View::class)
->disableOriginalConstructor()->getMock();
$fileInfo = $this->getMockBuilder(FileInfo::class)
@@ -675,11 +654,11 @@ class KeyManagerTest extends TestCase {
->with('/admin/files/myfile.txt')
->willReturn($fileInfo);
- /** @var \OC\Files\View $view */
+ /** @var View $view */
$this->assertSame(1337, $this->instance->getVersion('/admin/files/myfile.txt', $view));
}
- public function testSetVersionWithFileInfo() {
+ public function testSetVersionWithFileInfo(): void {
$view = $this->getMockBuilder(View::class)
->disableOriginalConstructor()->getMock();
$cache = $this->getMockBuilder(ICache::class)
@@ -687,7 +666,7 @@ class KeyManagerTest extends TestCase {
$cache->expects($this->once())
->method('update')
->with(123, ['encrypted' => 5, 'encryptedVersion' => 5]);
- $storage = $this->getMockBuilder(Storage::class)
+ $storage = $this->getMockBuilder(FilesIStorage::class)
->disableOriginalConstructor()->getMock();
$storage->expects($this->once())
->method('getCache')
@@ -705,11 +684,11 @@ class KeyManagerTest extends TestCase {
->with('/admin/files/myfile.txt')
->willReturn($fileInfo);
- /** @var \OC\Files\View $view */
+ /** @var View $view */
$this->instance->setVersion('/admin/files/myfile.txt', 5, $view);
}
- public function testSetVersionWithoutFileInfo() {
+ public function testSetVersionWithoutFileInfo(): void {
$view = $this->getMockBuilder(View::class)
->disableOriginalConstructor()->getMock();
$view->expects($this->once())
@@ -717,11 +696,11 @@ class KeyManagerTest extends TestCase {
->with('/admin/files/myfile.txt')
->willReturn(false);
- /** @var \OC\Files\View $view */
+ /** @var View $view */
$this->instance->setVersion('/admin/files/myfile.txt', 5, $view);
}
- public function testBackupUserKeys() {
+ public function testBackupUserKeys(): void {
$this->keyStorageMock->expects($this->once())->method('backupUserKeys')
->with('OC_DEFAULT_MODULE', 'test', 'user1');
$this->instance->backupUserKeys('test', 'user1');
diff --git a/apps/encryption/tests/Listeners/UserEventsListenersTest.php b/apps/encryption/tests/Listeners/UserEventsListenersTest.php
new file mode 100644
index 00000000000..cb31523f105
--- /dev/null
+++ b/apps/encryption/tests/Listeners/UserEventsListenersTest.php
@@ -0,0 +1,258 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\Encryption\Tests\Listeners;
+
+use OC\Core\Events\BeforePasswordResetEvent;
+use OC\Core\Events\PasswordResetEvent;
+use OC\Files\SetupManager;
+use OCA\Encryption\KeyManager;
+use OCA\Encryption\Listeners\UserEventsListener;
+use OCA\Encryption\Services\PassphraseService;
+use OCA\Encryption\Session;
+use OCA\Encryption\Users\Setup;
+use OCA\Encryption\Util;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\IUserSession;
+use OCP\User\Events\BeforePasswordUpdatedEvent;
+use OCP\User\Events\PasswordUpdatedEvent;
+use OCP\User\Events\UserCreatedEvent;
+use OCP\User\Events\UserDeletedEvent;
+use OCP\User\Events\UserLoggedInEvent;
+use OCP\User\Events\UserLoggedOutEvent;
+use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
+
+/**
+ * @group DB
+ */
+class UserEventsListenersTest extends TestCase {
+
+ protected Util&MockObject $util;
+ protected Setup&MockObject $userSetup;
+ protected Session&MockObject $session;
+ protected KeyManager&MockObject $keyManager;
+ protected IUserManager&MockObject $userManager;
+ protected IUserSession&MockObject $userSession;
+ protected SetupManager&MockObject $setupManager;
+ protected PassphraseService&MockObject $passphraseService;
+
+ protected UserEventsListener $instance;
+
+ public function setUp(): void {
+ parent::setUp();
+
+ $this->util = $this->createMock(Util::class);
+ $this->userSetup = $this->createMock(Setup::class);
+ $this->session = $this->createMock(Session::class);
+ $this->keyManager = $this->createMock(KeyManager::class);
+ $this->userManager = $this->createMock(IUserManager::class);
+ $this->userSession = $this->createMock(IUserSession::class);
+ $this->setupManager = $this->createMock(SetupManager::class);
+ $this->passphraseService = $this->createMock(PassphraseService::class);
+
+ $this->instance = new UserEventsListener(
+ $this->util,
+ $this->userSetup,
+ $this->session,
+ $this->keyManager,
+ $this->userManager,
+ $this->userSession,
+ $this->setupManager,
+ $this->passphraseService,
+ );
+ }
+
+ public function testLogin(): void {
+ $this->userSetup->expects(self::once())
+ ->method('setupUser')
+ ->willReturn(true);
+
+ $this->keyManager->expects(self::once())
+ ->method('init')
+ ->with('testUser', 'password');
+
+ $this->util->method('isMasterKeyEnabled')->willReturn(false);
+
+ $user = $this->createMock(IUser::class);
+ $user->expects(self::any())
+ ->method('getUID')
+ ->willReturn('testUser');
+ $event = $this->createMock(UserLoggedInEvent::class);
+ $event->expects(self::atLeastOnce())
+ ->method('getUser')
+ ->willReturn($user);
+ $event->expects(self::atLeastOnce())
+ ->method('getPassword')
+ ->willReturn('password');
+
+ $this->instance->handle($event);
+ }
+
+ public function testLoginMasterKey(): void {
+ $this->util->method('isMasterKeyEnabled')->willReturn(true);
+
+ $this->userSetup->expects(self::never())
+ ->method('setupUser');
+
+ $this->keyManager->expects(self::once())
+ ->method('init')
+ ->with('testUser', 'password');
+
+ $user = $this->createMock(IUser::class);
+ $user->expects(self::any())
+ ->method('getUID')
+ ->willReturn('testUser');
+
+ $event = $this->createMock(UserLoggedInEvent::class);
+ $event->expects(self::atLeastOnce())
+ ->method('getUser')
+ ->willReturn($user);
+ $event->expects(self::atLeastOnce())
+ ->method('getPassword')
+ ->willReturn('password');
+
+ $this->instance->handle($event);
+ }
+
+ public function testLogout(): void {
+ $this->session->expects(self::once())
+ ->method('clear');
+
+ $event = $this->createMock(UserLoggedOutEvent::class);
+ $this->instance->handle($event);
+ }
+
+ public function testUserCreated(): void {
+ $this->userSetup->expects(self::once())
+ ->method('setupUser')
+ ->with('testUser', 'password');
+
+ $event = $this->createMock(UserCreatedEvent::class);
+ $event->expects(self::atLeastOnce())
+ ->method('getUid')
+ ->willReturn('testUser');
+ $event->expects(self::atLeastOnce())
+ ->method('getPassword')
+ ->willReturn('password');
+
+ $this->instance->handle($event);
+ }
+
+ public function testUserDeleted(): void {
+ $this->keyManager->expects(self::once())
+ ->method('deletePublicKey')
+ ->with('testUser');
+
+ $event = $this->createMock(UserDeletedEvent::class);
+ $event->expects(self::atLeastOnce())
+ ->method('getUid')
+ ->willReturn('testUser');
+ $this->instance->handle($event);
+ }
+
+ public function testBeforePasswordUpdated(): void {
+ $this->passphraseService->expects(self::never())
+ ->method('setPassphraseForUser');
+
+ $user = $this->createMock(IUser::class);
+ $user->expects(self::atLeastOnce())
+ ->method('canChangePassword')
+ ->willReturn(true);
+
+ $event = $this->createMock(BeforePasswordUpdatedEvent::class);
+ $event->expects(self::atLeastOnce())
+ ->method('getUser')
+ ->willReturn($user);
+ $event->expects(self::atLeastOnce())
+ ->method('getPassword')
+ ->willReturn('password');
+ $this->instance->handle($event);
+ }
+
+ public function testBeforePasswordUpdated_CannotChangePassword(): void {
+ $this->passphraseService->expects(self::once())
+ ->method('setPassphraseForUser')
+ ->with('testUser', 'password');
+
+ $user = $this->createMock(IUser::class);
+ $user->expects(self::atLeastOnce())
+ ->method('getUID')
+ ->willReturn('testUser');
+ $user->expects(self::atLeastOnce())
+ ->method('canChangePassword')
+ ->willReturn(false);
+
+ $event = $this->createMock(BeforePasswordUpdatedEvent::class);
+ $event->expects(self::atLeastOnce())
+ ->method('getUser')
+ ->willReturn($user);
+ $event->expects(self::atLeastOnce())
+ ->method('getPassword')
+ ->willReturn('password');
+ $this->instance->handle($event);
+ }
+
+ public function testPasswordUpdated(): void {
+ $this->passphraseService->expects(self::once())
+ ->method('setPassphraseForUser')
+ ->with('testUser', 'password');
+
+ $event = $this->createMock(PasswordUpdatedEvent::class);
+ $event->expects(self::atLeastOnce())
+ ->method('getUid')
+ ->willReturn('testUser');
+ $event->expects(self::atLeastOnce())
+ ->method('getPassword')
+ ->willReturn('password');
+
+ $this->instance->handle($event);
+ }
+
+ public function testBeforePasswordReset(): void {
+ $this->passphraseService->expects(self::once())
+ ->method('setProcessingReset')
+ ->with('testUser');
+
+ $event = $this->createMock(BeforePasswordResetEvent::class);
+ $event->expects(self::atLeastOnce())
+ ->method('getUid')
+ ->willReturn('testUser');
+ $this->instance->handle($event);
+ }
+
+ public function testPasswordReset(): void {
+ // backup required
+ $this->keyManager->expects(self::once())
+ ->method('backupUserKeys')
+ ->with('passwordReset', 'testUser');
+ // delete old keys
+ $this->keyManager->expects(self::once())
+ ->method('deleteUserKeys')
+ ->with('testUser');
+ // create new keys
+ $this->userSetup->expects(self::once())
+ ->method('setupUser')
+ ->with('testUser', 'password');
+ // reset ends
+ $this->passphraseService->expects(self::once())
+ ->method('setProcessingReset')
+ ->with('testUser', false);
+
+ $event = $this->createMock(PasswordResetEvent::class);
+ $event->expects(self::atLeastOnce())
+ ->method('getUid')
+ ->willReturn('testUser');
+ $event->expects(self::atLeastOnce())
+ ->method('getPassword')
+ ->willReturn('password');
+ $this->instance->handle($event);
+ }
+
+}
diff --git a/apps/encryption/tests/PassphraseServiceTest.php b/apps/encryption/tests/PassphraseServiceTest.php
new file mode 100644
index 00000000000..c2dc9d8173c
--- /dev/null
+++ b/apps/encryption/tests/PassphraseServiceTest.php
@@ -0,0 +1,196 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\Encryption\Tests;
+
+use OCA\Encryption\Crypto\Crypt;
+use OCA\Encryption\KeyManager;
+use OCA\Encryption\Recovery;
+use OCA\Encryption\Services\PassphraseService;
+use OCA\Encryption\Session;
+use OCA\Encryption\Util;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
+use Test\TestCase;
+
+/**
+ * @group DB
+ */
+class PassphraseServiceTest extends TestCase {
+
+ protected Util&MockObject $util;
+ protected Crypt&MockObject $crypt;
+ protected Session&MockObject $session;
+ protected Recovery&MockObject $recovery;
+ protected KeyManager&MockObject $keyManager;
+ protected IUserManager&MockObject $userManager;
+ protected IUserSession&MockObject $userSession;
+
+ protected PassphraseService $instance;
+
+ public function setUp(): void {
+ parent::setUp();
+
+ $this->util = $this->createMock(Util::class);
+ $this->crypt = $this->createMock(Crypt::class);
+ $this->session = $this->createMock(Session::class);
+ $this->recovery = $this->createMock(Recovery::class);
+ $this->keyManager = $this->createMock(KeyManager::class);
+ $this->userManager = $this->createMock(IUserManager::class);
+ $this->userSession = $this->createMock(IUserSession::class);
+
+ $this->instance = new PassphraseService(
+ $this->util,
+ $this->crypt,
+ $this->session,
+ $this->recovery,
+ $this->keyManager,
+ $this->createMock(LoggerInterface::class),
+ $this->userManager,
+ $this->userSession,
+ );
+ }
+
+ public function testSetProcessingReset(): void {
+ $this->instance->setProcessingReset('userId');
+ $this->assertEquals(['userId' => true], $this->invokePrivate($this->instance, 'passwordResetUsers'));
+ }
+
+ public function testUnsetProcessingReset(): void {
+ $this->instance->setProcessingReset('userId');
+ $this->assertEquals(['userId' => true], $this->invokePrivate($this->instance, 'passwordResetUsers'));
+ $this->instance->setProcessingReset('userId', false);
+ $this->assertEquals([], $this->invokePrivate($this->instance, 'passwordResetUsers'));
+ }
+
+ /**
+ * Check that the passphrase setting skips if a reset is processed
+ */
+ public function testSetPassphraseResetUserMode(): void {
+ $this->session->expects(self::never())
+ ->method('getPrivateKey');
+ $this->keyManager->expects(self::never())
+ ->method('setPrivateKey');
+
+ $this->instance->setProcessingReset('userId');
+ $this->assertTrue($this->instance->setPassphraseForUser('userId', 'password'));
+ }
+
+ public function testSetPassphrase_currentUser() {
+ $instance = $this->getMockBuilder(PassphraseService::class)
+ ->onlyMethods(['initMountPoints'])
+ ->setConstructorArgs([
+ $this->util,
+ $this->crypt,
+ $this->session,
+ $this->recovery,
+ $this->keyManager,
+ $this->createMock(LoggerInterface::class),
+ $this->userManager,
+ $this->userSession,
+ ])
+ ->getMock();
+
+ $user = $this->createMock(IUser::class);
+ $user->method('getUID')->willReturn('testUser');
+ $this->userSession->expects(self::atLeastOnce())
+ ->method('getUser')
+ ->willReturn($user);
+ $this->userManager->expects(self::atLeastOnce())
+ ->method('get')
+ ->with('testUser')
+ ->willReturn($user);
+ $this->session->expects(self::any())
+ ->method('getPrivateKey')
+ ->willReturn('private-key');
+ $this->crypt->expects(self::any())
+ ->method('encryptPrivateKey')
+ ->with('private-key')
+ ->willReturn('encrypted-key');
+ $this->crypt->expects(self::any())
+ ->method('generateHeader')
+ ->willReturn('crypt-header: ');
+
+ $this->keyManager->expects(self::atLeastOnce())
+ ->method('setPrivateKey')
+ ->with('testUser', 'crypt-header: encrypted-key');
+
+ $this->assertTrue($instance->setPassphraseForUser('testUser', 'password'));
+ }
+
+ public function testSetPassphrase_currentUserFails() {
+ $instance = $this->getMockBuilder(PassphraseService::class)
+ ->onlyMethods(['initMountPoints'])
+ ->setConstructorArgs([
+ $this->util,
+ $this->crypt,
+ $this->session,
+ $this->recovery,
+ $this->keyManager,
+ $this->createMock(LoggerInterface::class),
+ $this->userManager,
+ $this->userSession,
+ ])
+ ->getMock();
+
+ $user = $this->createMock(IUser::class);
+ $user->method('getUID')->willReturn('testUser');
+ $this->userManager->expects(self::atLeastOnce())
+ ->method('get')
+ ->with('testUser')
+ ->willReturn($user);
+ $this->userSession->expects(self::atLeastOnce())
+ ->method('getUser')
+ ->willReturn($user);
+ $this->session->expects(self::any())
+ ->method('getPrivateKey')
+ ->willReturn('private-key');
+ $this->crypt->expects(self::any())
+ ->method('encryptPrivateKey')
+ ->with('private-key')
+ ->willReturn(false);
+
+ $this->keyManager->expects(self::never())
+ ->method('setPrivateKey');
+
+ $this->assertFalse($instance->setPassphraseForUser('testUser', 'password'));
+ }
+
+ public function testSetPassphrase_currentUserNotExists() {
+ $instance = $this->getMockBuilder(PassphraseService::class)
+ ->onlyMethods(['initMountPoints'])
+ ->setConstructorArgs([
+ $this->util,
+ $this->crypt,
+ $this->session,
+ $this->recovery,
+ $this->keyManager,
+ $this->createMock(LoggerInterface::class),
+ $this->userManager,
+ $this->userSession,
+ ])
+ ->getMock();
+
+ $user = $this->createMock(IUser::class);
+ $user->method('getUID')->willReturn('testUser');
+ $this->userManager->expects(self::atLeastOnce())
+ ->method('get')
+ ->with('testUser')
+ ->willReturn(null);
+ $this->userSession->expects(self::never())
+ ->method('getUser');
+ $this->keyManager->expects(self::never())
+ ->method('setPrivateKey');
+
+ $this->assertFalse($instance->setPassphraseForUser('testUser', 'password'));
+ }
+
+}
diff --git a/apps/encryption/tests/RecoveryTest.php b/apps/encryption/tests/RecoveryTest.php
index a4f4ff7fd02..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.
@@ -21,15 +23,15 @@ use Test\TestCase;
class RecoveryTest extends TestCase {
private static $tempStorage = [];
/**
- * @var \OCP\Encryption\IFile|\PHPUnit\Framework\MockObject\MockObject
+ * @var IFile|\PHPUnit\Framework\MockObject\MockObject
*/
private $fileMock;
/**
- * @var \OC\Files\View|\PHPUnit\Framework\MockObject\MockObject
+ * @var View|\PHPUnit\Framework\MockObject\MockObject
*/
private $viewMock;
/**
- * @var \OCP\IUserSession|\PHPUnit\Framework\MockObject\MockObject
+ * @var IUserSession|\PHPUnit\Framework\MockObject\MockObject
*/
private $userSessionMock;
/**
@@ -37,15 +39,15 @@ class RecoveryTest extends TestCase {
*/
private $user;
/**
- * @var \OCA\Encryption\KeyManager|\PHPUnit\Framework\MockObject\MockObject
+ * @var KeyManager|\PHPUnit\Framework\MockObject\MockObject
*/
private $keyManagerMock;
/**
- * @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject
+ * @var IConfig|\PHPUnit\Framework\MockObject\MockObject
*/
private $configMock;
/**
- * @var \OCA\Encryption\Crypto\Crypt|\PHPUnit\Framework\MockObject\MockObject
+ * @var Crypt|\PHPUnit\Framework\MockObject\MockObject
*/
private $cryptMock;
/**
@@ -53,7 +55,7 @@ class RecoveryTest extends TestCase {
*/
private $instance;
- public function testEnableAdminRecoverySuccessful() {
+ public function testEnableAdminRecoverySuccessful(): void {
$this->keyManagerMock->expects($this->exactly(2))
->method('recoveryKeyExists')
->willReturnOnConsecutiveCalls(false, true);
@@ -80,7 +82,7 @@ class RecoveryTest extends TestCase {
$this->assertTrue($this->instance->enableAdminRecovery('password'));
}
- public function testEnableAdminRecoveryCouldNotCheckPassword() {
+ public function testEnableAdminRecoveryCouldNotCheckPassword(): void {
$this->keyManagerMock->expects($this->exactly(2))
->method('recoveryKeyExists')
->willReturnOnConsecutiveCalls(false, true);
@@ -107,7 +109,7 @@ class RecoveryTest extends TestCase {
$this->assertFalse($this->instance->enableAdminRecovery('password'));
}
- public function testEnableAdminRecoveryCouldNotCreateKey() {
+ public function testEnableAdminRecoveryCouldNotCreateKey(): void {
$this->keyManagerMock->expects($this->once())
->method('recoveryKeyExists')
->willReturn(false);
@@ -119,7 +121,7 @@ class RecoveryTest extends TestCase {
$this->assertFalse($this->instance->enableAdminRecovery('password'));
}
- public function testChangeRecoveryKeyPasswordSuccessful() {
+ public function testChangeRecoveryKeyPasswordSuccessful(): void {
$this->assertFalse($this->instance->changeRecoveryKeyPassword('password',
'passwordOld'));
@@ -137,7 +139,7 @@ class RecoveryTest extends TestCase {
'passwordOld'));
}
- public function testChangeRecoveryKeyPasswordCouldNotDecryptPrivateRecoveryKey() {
+ public function testChangeRecoveryKeyPasswordCouldNotDecryptPrivateRecoveryKey(): void {
$this->assertFalse($this->instance->changeRecoveryKeyPassword('password', 'passwordOld'));
$this->keyManagerMock->expects($this->once())
@@ -150,7 +152,7 @@ class RecoveryTest extends TestCase {
$this->assertFalse($this->instance->changeRecoveryKeyPassword('password', 'passwordOld'));
}
- public function testDisableAdminRecovery() {
+ public function testDisableAdminRecovery(): void {
$this->keyManagerMock->expects($this->exactly(2))
->method('checkRecoveryPassword')
->willReturnOnConsecutiveCalls(true, false);
@@ -162,7 +164,7 @@ class RecoveryTest extends TestCase {
$this->assertFalse($this->instance->disableAdminRecovery('password'));
}
- public function testIsRecoveryEnabledForUser() {
+ public function testIsRecoveryEnabledForUser(): void {
$this->configMock->expects($this->exactly(2))
->method('getUserValue')
->willReturnOnConsecutiveCalls('1', '0');
@@ -171,13 +173,13 @@ class RecoveryTest extends TestCase {
$this->assertFalse($this->instance->isRecoveryEnabledForUser('admin'));
}
- public function testIsRecoveryKeyEnabled() {
+ public function testIsRecoveryKeyEnabled(): void {
$this->assertFalse($this->instance->isRecoveryKeyEnabled());
self::$tempStorage['recoveryAdminEnabled'] = '1';
$this->assertTrue($this->instance->isRecoveryKeyEnabled());
}
- public function testSetRecoveryFolderForUser() {
+ public function testSetRecoveryFolderForUser(): void {
$this->viewMock->expects($this->exactly(2))
->method('getDirectoryContent')
->willReturn([]);
@@ -185,7 +187,7 @@ class RecoveryTest extends TestCase {
$this->assertTrue($this->instance->setRecoveryForUser('1'));
}
- public function testRecoverUserFiles() {
+ public function testRecoverUserFiles(): void {
$this->viewMock->expects($this->once())
->method('getDirectoryContent')
->willReturn([]);
@@ -197,7 +199,7 @@ class RecoveryTest extends TestCase {
$this->addToAssertionCount(1);
}
- public function testRecoverFile() {
+ public function testRecoverFile(): void {
$this->keyManagerMock->expects($this->once())
->method('getEncryptedFileKey')
->willReturn(true);
diff --git a/apps/encryption/tests/SessionTest.php b/apps/encryption/tests/SessionTest.php
index 098120e2b03..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.
@@ -7,22 +9,20 @@
*/
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 \OCP\ISession|\PHPUnit\Framework\MockObject\MockObject */
- private $sessionMock;
+ protected Session $instance;
+ protected ISession&MockObject $sessionMock;
- public function testThatGetPrivateKeyThrowsExceptionWhenNotSet() {
- $this->expectException(\OCA\Encryption\Exceptions\PrivateKeyMissingException::class);
+ public function testThatGetPrivateKeyThrowsExceptionWhenNotSet(): void {
+ $this->expectException(PrivateKeyMissingException::class);
$this->expectExceptionMessage('Private Key missing for user: please try to log-out and log-in again');
$this->instance->getPrivateKey();
@@ -31,7 +31,7 @@ class SessionTest extends TestCase {
/**
* @depends testThatGetPrivateKeyThrowsExceptionWhenNotSet
*/
- public function testSetAndGetPrivateKey() {
+ public function testSetAndGetPrivateKey(): void {
$this->instance->setPrivateKey('dummyPrivateKey');
$this->assertEquals('dummyPrivateKey', $this->instance->getPrivateKey());
}
@@ -39,7 +39,7 @@ class SessionTest extends TestCase {
/**
* @depends testSetAndGetPrivateKey
*/
- public function testIsPrivateKeySet() {
+ public function testIsPrivateKeySet(): void {
$this->instance->setPrivateKey('dummyPrivateKey');
$this->assertTrue($this->instance->isPrivateKeySet());
@@ -50,21 +50,21 @@ class SessionTest extends TestCase {
self::$tempStorage['privateKey'] = 'dummyPrivateKey';
}
- public function testDecryptAllModeActivated() {
+ public function testDecryptAllModeActivated(): void {
$this->instance->prepareDecryptAll('user1', 'usersKey');
$this->assertTrue($this->instance->decryptAllModeActivated());
$this->assertSame('user1', $this->instance->getDecryptAllUid());
$this->assertSame('usersKey', $this->instance->getDecryptAllKey());
}
- public function testDecryptAllModeDeactivated() {
+ public function testDecryptAllModeDeactivated(): void {
$this->assertFalse($this->instance->decryptAllModeActivated());
}
/**
* @expectExceptionMessage 'Please activate decrypt all mode first'
*/
- public function testGetDecryptAllUidException() {
+ public function testGetDecryptAllUidException(): void {
$this->expectException(\Exception::class);
$this->instance->getDecryptAllUid();
@@ -73,7 +73,7 @@ class SessionTest extends TestCase {
/**
* @expectExceptionMessage 'No uid found while in decrypt all mode'
*/
- public function testGetDecryptAllUidException2() {
+ public function testGetDecryptAllUidException2(): void {
$this->expectException(\Exception::class);
$this->instance->prepareDecryptAll(null, 'key');
@@ -83,8 +83,8 @@ class SessionTest extends TestCase {
/**
* @expectExceptionMessage 'Please activate decrypt all mode first'
*/
- public function testGetDecryptAllKeyException() {
- $this->expectException(\OCA\Encryption\Exceptions\PrivateKeyMissingException::class);
+ public function testGetDecryptAllKeyException(): void {
+ $this->expectException(PrivateKeyMissingException::class);
$this->instance->getDecryptAllKey();
}
@@ -92,15 +92,15 @@ class SessionTest extends TestCase {
/**
* @expectExceptionMessage 'No key found while in decrypt all mode'
*/
- public function testGetDecryptAllKeyException2() {
- $this->expectException(\OCA\Encryption\Exceptions\PrivateKeyMissingException::class);
+ public function testGetDecryptAllKeyException2(): void {
+ $this->expectException(PrivateKeyMissingException::class);
$this->instance->prepareDecryptAll('user', null);
$this->instance->getDecryptAllKey();
}
- public function testSetAndGetStatusWillSetAndReturn() {
+ public function testSetAndGetStatusWillSetAndReturn(): void {
// Check if get status will return 0 if it has not been set before
$this->assertEquals(0, $this->instance->getStatus());
@@ -115,16 +115,17 @@ class SessionTest extends TestCase {
}
/**
- * @dataProvider dataTestIsReady
*
* @param int $status
* @param bool $expected
*/
- public function testIsReady($status, $expected) {
- /** @var Session | \PHPUnit\Framework\MockObject\MockObject $instance */
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsReady')]
+ public function testIsReady($status, $expected): void {
+ /** @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);
@@ -132,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],
@@ -167,7 +168,7 @@ class SessionTest extends TestCase {
}
- public function testClearWillRemoveValues() {
+ public function testClearWillRemoveValues(): void {
$this->instance->setPrivateKey('privateKey');
$this->instance->setStatus('initStatus');
$this->instance->prepareDecryptAll('user', 'key');
@@ -183,15 +184,15 @@ class SessionTest extends TestCase {
$this->sessionMock->expects($this->any())
->method('set')
- ->willReturnCallback([$this, "setValueTester"]);
+ ->willReturnCallback([$this, 'setValueTester']);
$this->sessionMock->expects($this->any())
->method('get')
- ->willReturnCallback([$this, "getValueTester"]);
+ ->willReturnCallback([$this, 'getValueTester']);
$this->sessionMock->expects($this->any())
->method('remove')
- ->willReturnCallback([$this, "removeValueTester"]);
+ ->willReturnCallback([$this, 'removeValueTester']);
$this->instance = new Session($this->sessionMock);
diff --git a/apps/encryption/tests/Settings/AdminTest.php b/apps/encryption/tests/Settings/AdminTest.php
index 80f7803badd..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();
@@ -51,10 +50,10 @@ class AdminTest extends TestCase {
);
}
- public function testGetForm() {
+ 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',
@@ -73,11 +72,11 @@ class AdminTest extends TestCase {
$this->assertEquals($expected, $this->admin->getForm());
}
- public function testGetSection() {
+ public function testGetSection(): void {
$this->assertSame('security', $this->admin->getSection());
}
- public function testGetPriority() {
+ public function testGetPriority(): void {
$this->assertSame(11, $this->admin->getPriority());
}
}
diff --git a/apps/encryption/tests/Users/SetupTest.php b/apps/encryption/tests/Users/SetupTest.php
index 96d2357269e..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 \OCA\Encryption\KeyManager|\PHPUnit\Framework\MockObject\MockObject
- */
- private $keyManagerMock;
- /**
- * @var \OCA\Encryption\Crypto\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();
@@ -42,7 +38,7 @@ class SetupTest extends TestCase {
}
- public function testSetupSystem() {
+ public function testSetupSystem(): void {
$this->keyManagerMock->expects($this->once())->method('validateShareKey');
$this->keyManagerMock->expects($this->once())->method('validateMasterKey');
@@ -50,12 +46,12 @@ class SetupTest extends TestCase {
}
/**
- * @dataProvider dataTestSetupUser
*
* @param bool $hasKeys
* @param bool $expected
*/
- public function testSetupUser($hasKeys, $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 3bfc0efb516..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.
@@ -11,7 +13,7 @@ use OC\Files\View;
use OCA\Encryption\Crypto\Crypt;
use OCA\Encryption\Util;
use OCP\Files\Mount\IMountPoint;
-use OCP\Files\Storage;
+use OCP\Files\Storage\IStorage;
use OCP\IConfig;
use OCP\IUser;
use OCP\IUserManager;
@@ -20,29 +22,21 @@ use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class UtilTest extends TestCase {
- private static $tempStorage = [];
-
- /** @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject */
- private $configMock;
-
- /** @var \OC\Files\View|\PHPUnit\Framework\MockObject\MockObject */
- private $filesMock;
-
- /** @var \OCP\IUserManager|\PHPUnit\Framework\MockObject\MockObject */
- private $userManagerMock;
- /** @var \OCP\Files\Mount\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() {
+ public function testSetRecoveryForUser(): void {
$this->instance->setRecoveryForUser('1');
$this->assertArrayHasKey('recoveryEnabled', self::$tempStorage);
}
- public function testIsRecoveryEnabledForUser() {
+ public function testIsRecoveryEnabledForUser(): void {
$this->assertTrue($this->instance->isRecoveryEnabledForUser('admin'));
// Assert recovery will return default value if not set
@@ -50,7 +44,7 @@ class UtilTest extends TestCase {
$this->assertEquals(0, $this->instance->isRecoveryEnabledForUser('admin'));
}
- public function testUserHasFiles() {
+ public function testUserHasFiles(): void {
$this->filesMock->expects($this->once())
->method('file_exists')
->willReturn(true);
@@ -64,7 +58,7 @@ class UtilTest extends TestCase {
$this->filesMock = $this->createMock(View::class);
$this->userManagerMock = $this->createMock(IUserManager::class);
- /** @var \OCA\Encryption\Crypto\Crypt $cryptMock */
+ /** @var Crypt $cryptMock */
$cryptMock = $this->getMockBuilder(Crypt::class)
->disableOriginalConstructor()
->getMock();
@@ -121,12 +115,12 @@ class UtilTest extends TestCase {
}
/**
- * @dataProvider dataTestIsMasterKeyEnabled
*
* @param string $value
* @param bool $expect
*/
- public function testIsMasterKeyEnabled($value, $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);
$this->assertSame($expect,
@@ -134,7 +128,7 @@ class UtilTest extends TestCase {
);
}
- public function dataTestIsMasterKeyEnabled() {
+ public static function dataTestIsMasterKeyEnabled(): array {
return [
['0', false],
['1', true]
@@ -142,11 +136,11 @@ class UtilTest extends TestCase {
}
/**
- * @dataProvider dataTestShouldEncryptHomeStorage
* @param string $returnValue return value from getAppValue()
* @param bool $expected
*/
- public function testShouldEncryptHomeStorage($returnValue, $expected) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestShouldEncryptHomeStorage')]
+ public function testShouldEncryptHomeStorage($returnValue, $expected): void {
$this->configMock->expects($this->once())->method('getAppValue')
->with('encryption', 'encryptHomeStorage', '1')
->willReturn($returnValue);
@@ -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,25 +157,25 @@ class UtilTest extends TestCase {
}
/**
- * @dataProvider dataTestSetEncryptHomeStorage
* @param $value
* @param $expected
*/
- public function testSetEncryptHomeStorage($value, $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']
];
}
- public function testGetStorage() {
- $return = $this->getMockBuilder(Storage::class)
+ public function testGetStorage(): void {
+ $return = $this->getMockBuilder(IStorage::class)
->disableOriginalConstructor()
->getMock();