aboutsummaryrefslogtreecommitdiffstats
path: root/apps/encryption
diff options
context:
space:
mode:
Diffstat (limited to 'apps/encryption')
-rw-r--r--apps/encryption/.noopenapi0
-rw-r--r--apps/encryption/appinfo/app.php38
-rw-r--r--apps/encryption/appinfo/info.xml21
-rw-r--r--apps/encryption/appinfo/routes.php23
-rw-r--r--apps/encryption/composer/composer/ClassLoader.php108
-rw-r--r--apps/encryption/composer/composer/InstalledVersions.php17
-rw-r--r--apps/encryption/composer/composer/autoload_classmap.php6
-rw-r--r--apps/encryption/composer/composer/autoload_static.php6
-rw-r--r--apps/encryption/composer/composer/installed.php4
-rw-r--r--apps/encryption/css/settings-admin.css19
-rw-r--r--apps/encryption/css/settings-personal.css6
-rw-r--r--apps/encryption/css/settings-personal.css.map2
-rw-r--r--apps/encryption/css/settings-personal.css.map.license3
-rw-r--r--apps/encryption/css/settings-personal.scss9
-rw-r--r--apps/encryption/img/app.svg2
-rw-r--r--apps/encryption/js/encryption.js7
-rw-r--r--apps/encryption/js/settings-admin.js9
-rw-r--r--apps/encryption/js/settings-personal.js6
-rw-r--r--apps/encryption/l10n/ar.js61
-rw-r--r--apps/encryption/l10n/ar.json61
-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.js11
-rw-r--r--apps/encryption/l10n/bg.json11
-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.js7
-rw-r--r--apps/encryption/l10n/ca.json7
-rw-r--r--apps/encryption/l10n/cs.js14
-rw-r--r--apps/encryption/l10n/cs.json14
-rw-r--r--apps/encryption/l10n/da.js19
-rw-r--r--apps/encryption/l10n/da.json19
-rw-r--r--apps/encryption/l10n/de.js28
-rw-r--r--apps/encryption/l10n/de.json28
-rw-r--r--apps/encryption/l10n/de_DE.js20
-rw-r--r--apps/encryption/l10n/de_DE.json20
-rw-r--r--apps/encryption/l10n/el.js7
-rw-r--r--apps/encryption/l10n/el.json7
-rw-r--r--apps/encryption/l10n/en_GB.js14
-rw-r--r--apps/encryption/l10n/en_GB.json14
-rw-r--r--apps/encryption/l10n/eo.js5
-rw-r--r--apps/encryption/l10n/eo.json5
-rw-r--r--apps/encryption/l10n/es.js16
-rw-r--r--apps/encryption/l10n/es.json16
-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.js12
-rw-r--r--apps/encryption/l10n/es_EC.json12
-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.js6
-rw-r--r--apps/encryption/l10n/es_MX.json6
-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.js75
-rw-r--r--apps/encryption/l10n/et_EE.json75
-rw-r--r--apps/encryption/l10n/eu.js13
-rw-r--r--apps/encryption/l10n/eu.json13
-rw-r--r--apps/encryption/l10n/fa.js16
-rw-r--r--apps/encryption/l10n/fa.json16
-rw-r--r--apps/encryption/l10n/fi.js5
-rw-r--r--apps/encryption/l10n/fi.json5
-rw-r--r--apps/encryption/l10n/fr.js46
-rw-r--r--apps/encryption/l10n/fr.json46
-rw-r--r--apps/encryption/l10n/ga.js65
-rw-r--r--apps/encryption/l10n/ga.json63
-rw-r--r--apps/encryption/l10n/gl.js66
-rw-r--r--apps/encryption/l10n/gl.json66
-rw-r--r--apps/encryption/l10n/he.js7
-rw-r--r--apps/encryption/l10n/he.json7
-rw-r--r--apps/encryption/l10n/hr.js5
-rw-r--r--apps/encryption/l10n/hr.json5
-rw-r--r--apps/encryption/l10n/hu.js14
-rw-r--r--apps/encryption/l10n/hu.json14
-rw-r--r--apps/encryption/l10n/ia.js7
-rw-r--r--apps/encryption/l10n/ia.json5
-rw-r--r--apps/encryption/l10n/id.js12
-rw-r--r--apps/encryption/l10n/id.json12
-rw-r--r--apps/encryption/l10n/is.js5
-rw-r--r--apps/encryption/l10n/is.json5
-rw-r--r--apps/encryption/l10n/it.js8
-rw-r--r--apps/encryption/l10n/it.json8
-rw-r--r--apps/encryption/l10n/ja.js14
-rw-r--r--apps/encryption/l10n/ja.json14
-rw-r--r--apps/encryption/l10n/ka.js63
-rw-r--r--apps/encryption/l10n/ka.json61
-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.js16
-rw-r--r--apps/encryption/l10n/ko.json16
-rw-r--r--apps/encryption/l10n/lb.js9
-rw-r--r--apps/encryption/l10n/lb.json7
-rw-r--r--apps/encryption/l10n/lt_LT.js5
-rw-r--r--apps/encryption/l10n/lt_LT.json5
-rw-r--r--apps/encryption/l10n/lv.js27
-rw-r--r--apps/encryption/l10n/lv.json27
-rw-r--r--apps/encryption/l10n/mk.js17
-rw-r--r--apps/encryption/l10n/mk.json15
-rw-r--r--apps/encryption/l10n/nb.js19
-rw-r--r--apps/encryption/l10n/nb.json19
-rw-r--r--apps/encryption/l10n/nl.js30
-rw-r--r--apps/encryption/l10n/nl.json30
-rw-r--r--apps/encryption/l10n/oc.js59
-rw-r--r--apps/encryption/l10n/oc.json57
-rw-r--r--apps/encryption/l10n/pl.js13
-rw-r--r--apps/encryption/l10n/pl.json13
-rw-r--r--apps/encryption/l10n/pt_BR.js18
-rw-r--r--apps/encryption/l10n/pt_BR.json18
-rw-r--r--apps/encryption/l10n/pt_PT.js15
-rw-r--r--apps/encryption/l10n/pt_PT.json15
-rw-r--r--apps/encryption/l10n/ro.js2
-rw-r--r--apps/encryption/l10n/ro.json2
-rw-r--r--apps/encryption/l10n/ru.js13
-rw-r--r--apps/encryption/l10n/ru.json13
-rw-r--r--apps/encryption/l10n/sc.js11
-rw-r--r--apps/encryption/l10n/sc.json11
-rw-r--r--apps/encryption/l10n/sk.js14
-rw-r--r--apps/encryption/l10n/sk.json14
-rw-r--r--apps/encryption/l10n/sl.js5
-rw-r--r--apps/encryption/l10n/sl.json5
-rw-r--r--apps/encryption/l10n/sq.js4
-rw-r--r--apps/encryption/l10n/sq.json4
-rw-r--r--apps/encryption/l10n/sr.js14
-rw-r--r--apps/encryption/l10n/sr.json14
-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.js14
-rw-r--r--apps/encryption/l10n/sv.json14
-rw-r--r--apps/encryption/l10n/sw.js65
-rw-r--r--apps/encryption/l10n/sw.json63
-rw-r--r--apps/encryption/l10n/th.js10
-rw-r--r--apps/encryption/l10n/th.json10
-rw-r--r--apps/encryption/l10n/tr.js62
-rw-r--r--apps/encryption/l10n/tr.json62
-rw-r--r--apps/encryption/l10n/ug.js64
-rw-r--r--apps/encryption/l10n/ug.json62
-rw-r--r--apps/encryption/l10n/uk.js17
-rw-r--r--apps/encryption/l10n/uk.json17
-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.js22
-rw-r--r--apps/encryption/l10n/zh_CN.json22
-rw-r--r--apps/encryption/l10n/zh_HK.js16
-rw-r--r--apps/encryption/l10n/zh_HK.json16
-rw-r--r--apps/encryption/l10n/zh_TW.js48
-rw-r--r--apps/encryption/l10n/zh_TW.json48
-rw-r--r--apps/encryption/lib/AppInfo/Application.php154
-rw-r--r--apps/encryption/lib/Command/DisableMasterKey.php84
-rw-r--r--apps/encryption/lib/Command/DropLegacyFileKey.php150
-rw-r--r--apps/encryption/lib/Command/EnableMasterKey.php76
-rw-r--r--apps/encryption/lib/Command/FixEncryptedVersion.php118
-rw-r--r--apps/encryption/lib/Command/FixKeyLocation.php358
-rw-r--r--apps/encryption/lib/Command/RecoverUser.php63
-rw-r--r--apps/encryption/lib/Command/ScanLegacyFormat.php71
-rw-r--r--apps/encryption/lib/Controller/RecoveryController.php61
-rw-r--r--apps/encryption/lib/Controller/SettingsController.php91
-rw-r--r--apps/encryption/lib/Controller/StatusController.php57
-rw-r--r--apps/encryption/lib/Crypto/Crypt.php368
-rw-r--r--apps/encryption/lib/Crypto/DecryptAll.php58
-rw-r--r--apps/encryption/lib/Crypto/EncryptAll.php214
-rw-r--r--apps/encryption/lib/Crypto/Encryption.php181
-rw-r--r--apps/encryption/lib/Exceptions/MultiKeyDecryptException.php22
-rw-r--r--apps/encryption/lib/Exceptions/MultiKeyEncryptException.php22
-rw-r--r--apps/encryption/lib/Exceptions/PrivateKeyMissingException.php27
-rw-r--r--apps/encryption/lib/Exceptions/PublicKeyMissingException.php25
-rw-r--r--apps/encryption/lib/HookManager.php59
-rw-r--r--apps/encryption/lib/Hooks/Contracts/IHook.php31
-rw-r--r--apps/encryption/lib/Hooks/UserHooks.php346
-rw-r--r--apps/encryption/lib/KeyManager.php216
-rw-r--r--apps/encryption/lib/Listeners/UserEventsListener.php144
-rw-r--r--apps/encryption/lib/Migration/SetMasterKeyStatus.php31
-rw-r--r--apps/encryption/lib/Recovery.php117
-rw-r--r--apps/encryption/lib/Services/PassphraseService.php148
-rw-r--r--apps/encryption/lib/Session.php37
-rw-r--r--apps/encryption/lib/Settings/Admin.php69
-rw-r--r--apps/encryption/lib/Settings/Personal.php47
-rw-r--r--apps/encryption/lib/Users/Setup.php40
-rw-r--r--apps/encryption/lib/Util.php101
-rw-r--r--apps/encryption/templates/altmail.php16
-rw-r--r--apps/encryption/templates/mail.php38
-rw-r--r--apps/encryption/templates/settings-admin.php46
-rw-r--r--apps/encryption/templates/settings-personal.php46
-rw-r--r--apps/encryption/tests/Command/FixEncryptedVersionTest.php105
-rw-r--r--apps/encryption/tests/Command/TestEnableMasterKey.php43
-rw-r--r--apps/encryption/tests/Controller/RecoveryControllerTest.php67
-rw-r--r--apps/encryption/tests/Controller/SettingsControllerTest.php95
-rw-r--r--apps/encryption/tests/Controller/StatusControllerTest.php54
-rw-r--r--apps/encryption/tests/Crypto/CryptTest.php211
-rw-r--r--apps/encryption/tests/Crypto/DecryptAllTest.php59
-rw-r--r--apps/encryption/tests/Crypto/EncryptAllTest.php243
-rw-r--r--apps/encryption/tests/Crypto/EncryptionTest.php171
-rw-r--r--apps/encryption/tests/EncryptedStorageTest.php71
-rw-r--r--apps/encryption/tests/HookManagerTest.php69
-rw-r--r--apps/encryption/tests/Hooks/UserHooksTest.php391
-rw-r--r--apps/encryption/tests/KeyManagerTest.php308
-rw-r--r--apps/encryption/tests/Listeners/UserEventsListenersTest.php258
-rw-r--r--apps/encryption/tests/PassphraseServiceTest.php196
-rw-r--r--apps/encryption/tests/RecoveryTest.php78
-rw-r--r--apps/encryption/tests/SessionTest.php84
-rw-r--r--apps/encryption/tests/Settings/AdminTest.php65
-rw-r--r--apps/encryption/tests/Users/SetupTest.php54
-rw-r--r--apps/encryption/tests/UtilTest.php87
236 files changed, 4299 insertions, 5318 deletions
diff --git a/apps/encryption/.noopenapi b/apps/encryption/.noopenapi
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/apps/encryption/.noopenapi
diff --git a/apps/encryption/appinfo/app.php b/apps/encryption/appinfo/app.php
deleted file mode 100644
index c42a0435a14..00000000000
--- a/apps/encryption/appinfo/app.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-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 70ffa686925..58f18f4d950 100644
--- a/apps/encryption/appinfo/info.xml
+++ b/apps/encryption/appinfo/info.xml
@@ -1,20 +1,20 @@
<?xml version="1.0"?>
+<!--
+ - SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ - SPDX-FileCopyrightText: 2015-2016 ownCloud, Inc.
+ - SPDX-License-Identifier: AGPL-3.0-only
+ -->
<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
<id>encryption</id>
<name>Default encryption module</name>
<summary>Default encryption module for server-side encryption</summary>
<description>
- 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.
- The module won't 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 a unencrypted system.
- Please read the documentation to know all implications before you decide
- to enable 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.
+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.14.0</version>
+ <version>2.20.0</version>
<licence>agpl</licence>
<author>Bjoern Schiessle</author>
<author>Clark Tomlinson</author>
@@ -31,7 +31,7 @@
<dependencies>
<lib>openssl</lib>
- <nextcloud min-version="26" max-version="26"/>
+ <nextcloud min-version="32" max-version="32"/>
</dependencies>
<repair-steps>
@@ -47,6 +47,7 @@
<command>OCA\Encryption\Command\ScanLegacyFormat</command>
<command>OCA\Encryption\Command\FixEncryptedVersion</command>
<command>OCA\Encryption\Command\FixKeyLocation</command>
+ <command>OCA\Encryption\Command\DropLegacyFileKey</command>
</commands>
<settings>
diff --git a/apps/encryption/appinfo/routes.php b/apps/encryption/appinfo/routes.php
index 5abe0ce6687..891f12e6e25 100644
--- a/apps/encryption/appinfo/routes.php
+++ b/apps/encryption/appinfo/routes.php
@@ -1,27 +1,10 @@
<?php
declare(strict_types=1);
-
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
return [
'routes' => [
diff --git a/apps/encryption/composer/composer/ClassLoader.php b/apps/encryption/composer/composer/ClassLoader.php
index fd56bd7d840..7824d8f7eaf 100644
--- a/apps/encryption/composer/composer/ClassLoader.php
+++ b/apps/encryption/composer/composer/ClassLoader.php
@@ -45,35 +45,34 @@ class ClassLoader
/** @var \Closure(string):void */
private static $includeFile;
- /** @var ?string */
+ /** @var string|null */
private $vendorDir;
// PSR-4
/**
- * @var array[]
- * @psalm-var array<string, array<string, int>>
+ * @var array<string, array<string, int>>
*/
private $prefixLengthsPsr4 = array();
/**
- * @var array[]
- * @psalm-var array<string, array<int, string>>
+ * @var array<string, list<string>>
*/
private $prefixDirsPsr4 = array();
/**
- * @var array[]
- * @psalm-var array<string, string>
+ * @var list<string>
*/
private $fallbackDirsPsr4 = array();
// PSR-0
/**
- * @var array[]
- * @psalm-var array<string, array<string, string[]>>
+ * List of PSR-0 prefixes
+ *
+ * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
+ *
+ * @var array<string, array<string, list<string>>>
*/
private $prefixesPsr0 = array();
/**
- * @var array[]
- * @psalm-var array<string, string>
+ * @var list<string>
*/
private $fallbackDirsPsr0 = array();
@@ -81,8 +80,7 @@ class ClassLoader
private $useIncludePath = false;
/**
- * @var string[]
- * @psalm-var array<string, string>
+ * @var array<string, string>
*/
private $classMap = array();
@@ -90,21 +88,20 @@ class ClassLoader
private $classMapAuthoritative = false;
/**
- * @var bool[]
- * @psalm-var array<string, bool>
+ * @var array<string, bool>
*/
private $missingClasses = array();
- /** @var ?string */
+ /** @var string|null */
private $apcuPrefix;
/**
- * @var self[]
+ * @var array<string, self>
*/
private static $registeredLoaders = array();
/**
- * @param ?string $vendorDir
+ * @param string|null $vendorDir
*/
public function __construct($vendorDir = null)
{
@@ -113,7 +110,7 @@ class ClassLoader
}
/**
- * @return string[]
+ * @return array<string, list<string>>
*/
public function getPrefixes()
{
@@ -125,8 +122,7 @@ class ClassLoader
}
/**
- * @return array[]
- * @psalm-return array<string, array<int, string>>
+ * @return array<string, list<string>>
*/
public function getPrefixesPsr4()
{
@@ -134,8 +130,7 @@ class ClassLoader
}
/**
- * @return array[]
- * @psalm-return array<string, string>
+ * @return list<string>
*/
public function getFallbackDirs()
{
@@ -143,8 +138,7 @@ class ClassLoader
}
/**
- * @return array[]
- * @psalm-return array<string, string>
+ * @return list<string>
*/
public function getFallbackDirsPsr4()
{
@@ -152,8 +146,7 @@ class ClassLoader
}
/**
- * @return string[] Array of classname => path
- * @psalm-return array<string, string>
+ * @return array<string, string> Array of classname => path
*/
public function getClassMap()
{
@@ -161,8 +154,7 @@ class ClassLoader
}
/**
- * @param string[] $classMap Class to filename map
- * @psalm-param array<string, string> $classMap
+ * @param array<string, string> $classMap Class to filename map
*
* @return void
*/
@@ -179,24 +171,25 @@ class ClassLoader
* Registers a set of PSR-0 directories for a given prefix, either
* appending or prepending to the ones previously set for this prefix.
*
- * @param string $prefix The prefix
- * @param string[]|string $paths The PSR-0 root directories
- * @param bool $prepend Whether to prepend the directories
+ * @param string $prefix The prefix
+ * @param list<string>|string $paths The PSR-0 root directories
+ * @param bool $prepend Whether to prepend the directories
*
* @return void
*/
public function add($prefix, $paths, $prepend = false)
{
+ $paths = (array) $paths;
if (!$prefix) {
if ($prepend) {
$this->fallbackDirsPsr0 = array_merge(
- (array) $paths,
+ $paths,
$this->fallbackDirsPsr0
);
} else {
$this->fallbackDirsPsr0 = array_merge(
$this->fallbackDirsPsr0,
- (array) $paths
+ $paths
);
}
@@ -205,19 +198,19 @@ class ClassLoader
$first = $prefix[0];
if (!isset($this->prefixesPsr0[$first][$prefix])) {
- $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+ $this->prefixesPsr0[$first][$prefix] = $paths;
return;
}
if ($prepend) {
$this->prefixesPsr0[$first][$prefix] = array_merge(
- (array) $paths,
+ $paths,
$this->prefixesPsr0[$first][$prefix]
);
} else {
$this->prefixesPsr0[$first][$prefix] = array_merge(
$this->prefixesPsr0[$first][$prefix],
- (array) $paths
+ $paths
);
}
}
@@ -226,9 +219,9 @@ class ClassLoader
* Registers a set of PSR-4 directories for a given namespace, either
* appending or prepending to the ones previously set for this namespace.
*
- * @param string $prefix The prefix/namespace, with trailing '\\'
- * @param string[]|string $paths The PSR-4 base directories
- * @param bool $prepend Whether to prepend the directories
+ * @param string $prefix The prefix/namespace, with trailing '\\'
+ * @param list<string>|string $paths The PSR-4 base directories
+ * @param bool $prepend Whether to prepend the directories
*
* @throws \InvalidArgumentException
*
@@ -236,17 +229,18 @@ class ClassLoader
*/
public function addPsr4($prefix, $paths, $prepend = false)
{
+ $paths = (array) $paths;
if (!$prefix) {
// Register directories for the root namespace.
if ($prepend) {
$this->fallbackDirsPsr4 = array_merge(
- (array) $paths,
+ $paths,
$this->fallbackDirsPsr4
);
} else {
$this->fallbackDirsPsr4 = array_merge(
$this->fallbackDirsPsr4,
- (array) $paths
+ $paths
);
}
} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
@@ -256,18 +250,18 @@ class ClassLoader
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
- $this->prefixDirsPsr4[$prefix] = (array) $paths;
+ $this->prefixDirsPsr4[$prefix] = $paths;
} elseif ($prepend) {
// Prepend directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
- (array) $paths,
+ $paths,
$this->prefixDirsPsr4[$prefix]
);
} else {
// Append directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
$this->prefixDirsPsr4[$prefix],
- (array) $paths
+ $paths
);
}
}
@@ -276,8 +270,8 @@ class ClassLoader
* Registers a set of PSR-0 directories for a given prefix,
* replacing any others previously set for this prefix.
*
- * @param string $prefix The prefix
- * @param string[]|string $paths The PSR-0 base directories
+ * @param string $prefix The prefix
+ * @param list<string>|string $paths The PSR-0 base directories
*
* @return void
*/
@@ -294,8 +288,8 @@ class ClassLoader
* Registers a set of PSR-4 directories for a given namespace,
* replacing any others previously set for this namespace.
*
- * @param string $prefix The prefix/namespace, with trailing '\\'
- * @param string[]|string $paths The PSR-4 base directories
+ * @param string $prefix The prefix/namespace, with trailing '\\'
+ * @param list<string>|string $paths The PSR-4 base directories
*
* @throws \InvalidArgumentException
*
@@ -429,7 +423,8 @@ class ClassLoader
public function loadClass($class)
{
if ($file = $this->findFile($class)) {
- (self::$includeFile)($file);
+ $includeFile = self::$includeFile;
+ $includeFile($file);
return true;
}
@@ -480,9 +475,9 @@ class ClassLoader
}
/**
- * Returns the currently registered loaders indexed by their corresponding vendor directories.
+ * Returns the currently registered loaders keyed by their corresponding vendor directories.
*
- * @return self[]
+ * @return array<string, self>
*/
public static function getRegisteredLoaders()
{
@@ -560,7 +555,10 @@ class ClassLoader
return false;
}
- private static function initializeIncludeClosure(): void
+ /**
+ * @return void
+ */
+ private static function initializeIncludeClosure()
{
if (self::$includeFile !== null) {
return;
@@ -574,8 +572,8 @@ class ClassLoader
* @param string $file
* @return void
*/
- self::$includeFile = static function($file) {
+ self::$includeFile = \Closure::bind(static function($file) {
include $file;
- };
+ }, null, null);
}
}
diff --git a/apps/encryption/composer/composer/InstalledVersions.php b/apps/encryption/composer/composer/InstalledVersions.php
index c6b54af7ba2..51e734a774b 100644
--- a/apps/encryption/composer/composer/InstalledVersions.php
+++ b/apps/encryption/composer/composer/InstalledVersions.php
@@ -98,7 +98,7 @@ class InstalledVersions
{
foreach (self::getInstalled() as $installed) {
if (isset($installed['versions'][$packageName])) {
- return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+ return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
}
}
@@ -119,7 +119,7 @@ class InstalledVersions
*/
public static function satisfies(VersionParser $parser, $packageName, $constraint)
{
- $constraint = $parser->parseConstraints($constraint);
+ $constraint = $parser->parseConstraints((string) $constraint);
$provided = $parser->parseConstraints(self::getVersionRanges($packageName));
return $provided->matches($constraint);
@@ -328,7 +328,9 @@ class InstalledVersions
if (isset(self::$installedByVendor[$vendorDir])) {
$installed[] = self::$installedByVendor[$vendorDir];
} elseif (is_file($vendorDir.'/composer/installed.php')) {
- $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
+ /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+ $required = require $vendorDir.'/composer/installed.php';
+ $installed[] = self::$installedByVendor[$vendorDir] = $required;
if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
self::$installed = $installed[count($installed) - 1];
}
@@ -340,12 +342,17 @@ class InstalledVersions
// only require the installed.php file if this file is loaded from its dumped location,
// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
if (substr(__DIR__, -8, 1) !== 'C') {
- self::$installed = require __DIR__ . '/installed.php';
+ /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+ $required = require __DIR__ . '/installed.php';
+ self::$installed = $required;
} else {
self::$installed = array();
}
}
- $installed[] = self::$installed;
+
+ if (self::$installed !== array()) {
+ $installed[] = self::$installed;
+ }
return $installed;
}
diff --git a/apps/encryption/composer/composer/autoload_classmap.php b/apps/encryption/composer/composer/autoload_classmap.php
index 9f9ab4e406f..814f39653e9 100644
--- a/apps/encryption/composer/composer/autoload_classmap.php
+++ b/apps/encryption/composer/composer/autoload_classmap.php
@@ -9,6 +9,7 @@ return array(
'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
'OCA\\Encryption\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
'OCA\\Encryption\\Command\\DisableMasterKey' => $baseDir . '/../lib/Command/DisableMasterKey.php',
+ 'OCA\\Encryption\\Command\\DropLegacyFileKey' => $baseDir . '/../lib/Command/DropLegacyFileKey.php',
'OCA\\Encryption\\Command\\EnableMasterKey' => $baseDir . '/../lib/Command/EnableMasterKey.php',
'OCA\\Encryption\\Command\\FixEncryptedVersion' => $baseDir . '/../lib/Command/FixEncryptedVersion.php',
'OCA\\Encryption\\Command\\FixKeyLocation' => $baseDir . '/../lib/Command/FixKeyLocation.php',
@@ -25,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 8f50f064997..af5e5192520 100644
--- a/apps/encryption/composer/composer/autoload_static.php
+++ b/apps/encryption/composer/composer/autoload_static.php
@@ -24,6 +24,7 @@ class ComposerStaticInitEncryption
'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
'OCA\\Encryption\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
'OCA\\Encryption\\Command\\DisableMasterKey' => __DIR__ . '/..' . '/../lib/Command/DisableMasterKey.php',
+ 'OCA\\Encryption\\Command\\DropLegacyFileKey' => __DIR__ . '/..' . '/../lib/Command/DropLegacyFileKey.php',
'OCA\\Encryption\\Command\\EnableMasterKey' => __DIR__ . '/..' . '/../lib/Command/EnableMasterKey.php',
'OCA\\Encryption\\Command\\FixEncryptedVersion' => __DIR__ . '/..' . '/../lib/Command/FixEncryptedVersion.php',
'OCA\\Encryption\\Command\\FixKeyLocation' => __DIR__ . '/..' . '/../lib/Command/FixKeyLocation.php',
@@ -40,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/composer/composer/installed.php b/apps/encryption/composer/composer/installed.php
index a1f6a8636b4..1a66c7f2416 100644
--- a/apps/encryption/composer/composer/installed.php
+++ b/apps/encryption/composer/composer/installed.php
@@ -3,7 +3,7 @@
'name' => '__root__',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => 'd51429a47232bbf46a2be832ecfa711f102da802',
+ 'reference' => 'b1797842784b250fb01ed5e3bf130705eb94751b',
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
@@ -13,7 +13,7 @@
'__root__' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => 'd51429a47232bbf46a2be832ecfa711f102da802',
+ 'reference' => 'b1797842784b250fb01ed5e3bf130705eb94751b',
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
diff --git a/apps/encryption/css/settings-admin.css b/apps/encryption/css/settings-admin.css
index 47360e6bcf6..a2e5f9b225e 100644
--- a/apps/encryption/css/settings-admin.css
+++ b/apps/encryption/css/settings-admin.css
@@ -1,21 +1,6 @@
/**
- * @author Björn Schießle <schiessle@owncloud.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2015 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
#encryptionAPI input[type=password] {
diff --git a/apps/encryption/css/settings-personal.css b/apps/encryption/css/settings-personal.css
index 774b14a44ee..adcd2c0b83b 100644
--- a/apps/encryption/css/settings-personal.css
+++ b/apps/encryption/css/settings-personal.css
@@ -1 +1,5 @@
-#encryptAllError,#encryptAllSuccess,#recoveryEnabledError,#recoveryEnabledSuccess{display:none}.nav-icon-basic-encryption-module{background-image:var(--icon-encryption-dark)}/*# sourceMappingURL=settings-personal.css.map */
+/*!
+ * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2013 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */#encryptAllError,#encryptAllSuccess,#recoveryEnabledError,#recoveryEnabledSuccess{display:none}.nav-icon-basic-encryption-module{background-image:var(--icon-encryption-dark)}/*# sourceMappingURL=settings-personal.css.map */
diff --git a/apps/encryption/css/settings-personal.css.map b/apps/encryption/css/settings-personal.css.map
index a2b352f3df0..153f4e4009a 100644
--- a/apps/encryption/css/settings-personal.css.map
+++ b/apps/encryption/css/settings-personal.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["settings-personal.scss"],"names":[],"mappings":"AAIA,kFAIC,aAID,kCACC","file":"settings-personal.css"} \ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["settings-personal.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAAA,GAKA,kFAIC,aAID,kCACC","file":"settings-personal.css"} \ No newline at end of file
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/css/settings-personal.scss b/apps/encryption/css/settings-personal.scss
index 59981356573..2e0c9ebd787 100644
--- a/apps/encryption/css/settings-personal.scss
+++ b/apps/encryption/css/settings-personal.scss
@@ -1,7 +1,8 @@
-/* Copyright (c) 2013, Sam Tuke, <samtuke@owncloud.com>
- This file is licensed under the Affero General Public License version 3 or later.
- See the COPYING-README file. */
-
+/*!
+ * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2013 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
#encryptAllError,
#encryptAllSuccess,
#recoveryEnabledError,
diff --git a/apps/encryption/img/app.svg b/apps/encryption/img/app.svg
index d99aa6f578e..ae1202bf4e2 100644
--- a/apps/encryption/img/app.svg
+++ b/apps/encryption/img/app.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 71 100"><path d="M35.5 6.25c-13.807 0-25 11.193-25 25v12.5H4.25V87.5h62.5V43.75H60.5v-12.5c0-13.807-11.194-25-25-25zm0 12.5c6.904 0 12.5 5.596 12.5 12.5v12.5H23v-12.5c0-6.904 5.596-12.5 12.5-12.5z" fill="#fff"/><path d="M4.653 65.678v-21.61h5.82l.308-7.52c.404-9.786.707-11.478 2.82-15.76 1.322-2.676 2.526-4.333 4.78-6.575 9.53-9.487 23.32-9.89 33.515-.98 2.4 2.097 5.513 6.726 6.588 9.798.92 2.63 1.643 10.055 1.666 17.118l.01 3.92h6.357v43.22H4.653v-21.61zm43.76-25.953c-.127-2.39-.3-4.423-.385-4.52-.085-.097-.155 1.762-.155 4.13v4.31H23.335l-.148-2.86-.148-2.86-.084 3.07-.083 3.073H48.64l-.228-4.343zM26.372 23.2c.678-.875 1.125-1.59.994-1.59-.393 0-3.647 4.276-3.647 4.794 0 .263.32.008.71-.568a64.69 64.69 0 0 1 1.943-2.637zm20.064 1.906c-.336-.64-1.342-1.832-2.236-2.648l-1.624-1.482 1.54 1.694c.846.932 1.758 2.123 2.027 2.648.27.524.582.953.696.953.114 0-.067-.523-.403-1.164zm-15.29-5.534c-.207-.205-2.665 1.11-2.956 1.58-.133.216.51-.02 1.428-.522.92-.503 1.606-.98 1.528-1.058z" fill="none"/></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/js/encryption.js b/apps/encryption/js/encryption.js
index 6a04e897615..6157387c663 100644
--- a/apps/encryption/js/encryption.js
+++ b/apps/encryption/js/encryption.js
@@ -1,8 +1,7 @@
/**
- * Copyright (c) 2014
- * Bjoern Schiessle <schiessle@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2014-2015 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
/**
diff --git a/apps/encryption/js/settings-admin.js b/apps/encryption/js/settings-admin.js
index 5252dc69e98..61b42a23add 100644
--- a/apps/encryption/js/settings-admin.js
+++ b/apps/encryption/js/settings-admin.js
@@ -1,10 +1,7 @@
/**
- * Copyright (c) 2013
- * Sam Tuke <samtuke@owncloud.com>
- * Robin Appelman <icewind1991@gmail.com>
- * Bjoern Schiessle <schiessle@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2013-2015 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
window.addEventListener('DOMContentLoaded', function () {
diff --git a/apps/encryption/js/settings-personal.js b/apps/encryption/js/settings-personal.js
index dec54e3e23a..1797dc0ff53 100644
--- a/apps/encryption/js/settings-personal.js
+++ b/apps/encryption/js/settings-personal.js
@@ -1,7 +1,7 @@
/**
- * Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2013-2015 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
OC.Encryption = _.extend(OC.Encryption || {}, {
diff --git a/apps/encryption/l10n/ar.js b/apps/encryption/l10n/ar.js
index a12c571ea46..f8cc148d1a8 100644
--- a/apps/encryption/l10n/ar.js
+++ b/apps/encryption/l10n/ar.js
@@ -1,20 +1,59 @@
OC.L10N.register(
"encryption",
{
- "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!" : "لا يمكن تعطيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
- "Password successfully changed." : "تم تغيير كلمة المرور بنجاح.",
- "Could not change the password. Maybe the old password was not correct." : "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.",
+ "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" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "لا يمكن فك التشفير من هذا الملف, من الممكن ان يكون هذا الملف مُشارك. يرجى سؤال صاحب الملف لإعادة مشاركتة معك.",
+ "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." : "يرجى تسجيل الدخول إلى واجهة الويب، و الانتقال إلى قسم \"الأمان\" 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" : "تم تمكين تطبيق التشفير، ولكن لم تتم تهيئة المفاتيح الخاصة بك. يرجى تسجيل الخروج ثم تسجيل الدخول من جديد.",
+ "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:" : "تعديل كلمة المرور استعادة المفتاح:",
- "Change Password" : "عدل كلمة السر",
- " If you don't remember your old password you can ask your administrator to recover your files." : "اذا كنت لاتتذكر كلمة السر تستطيع ان تطلب من المدير ان يستعيد ملفاتك.",
+ "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:" : "قم بتعيين كلمة مرور المفتاح الخاص القديم على كلمة مرور تسجيل الدخول الحالية:",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "إذا كنت لا تتذكر كلمة مرورك القديمة، فيمكنك أن تطلب من المشرف استرداد ملفاتك.",
"Old log-in password" : "كلمة المرور القديمة الخاصة بالدخول",
"Current log-in password" : "كلمة المرور الحالية الخاصة بالدخول",
"Update Private Key Password" : "تحديث كلمة المرور لـ المفتاح الخاص",
diff --git a/apps/encryption/l10n/ar.json b/apps/encryption/l10n/ar.json
index 464504b883d..a99cca63d1e 100644
--- a/apps/encryption/l10n/ar.json
+++ b/apps/encryption/l10n/ar.json
@@ -1,18 +1,57 @@
{ "translations": {
- "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!" : "لا يمكن تعطيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
- "Password successfully changed." : "تم تغيير كلمة المرور بنجاح.",
- "Could not change the password. Maybe the old password was not correct." : "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.",
+ "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" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "لا يمكن فك التشفير من هذا الملف, من الممكن ان يكون هذا الملف مُشارك. يرجى سؤال صاحب الملف لإعادة مشاركتة معك.",
+ "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." : "يرجى تسجيل الدخول إلى واجهة الويب، و الانتقال إلى قسم \"الأمان\" 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" : "تم تمكين تطبيق التشفير، ولكن لم تتم تهيئة المفاتيح الخاصة بك. يرجى تسجيل الخروج ثم تسجيل الدخول من جديد.",
+ "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:" : "تعديل كلمة المرور استعادة المفتاح:",
- "Change Password" : "عدل كلمة السر",
- " If you don't remember your old password you can ask your administrator to recover your files." : "اذا كنت لاتتذكر كلمة السر تستطيع ان تطلب من المدير ان يستعيد ملفاتك.",
+ "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:" : "قم بتعيين كلمة مرور المفتاح الخاص القديم على كلمة مرور تسجيل الدخول الحالية:",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "إذا كنت لا تتذكر كلمة مرورك القديمة، فيمكنك أن تطلب من المشرف استرداد ملفاتك.",
"Old log-in password" : "كلمة المرور القديمة الخاصة بالدخول",
"Current log-in password" : "كلمة المرور الحالية الخاصة بالدخول",
"Update Private Key Password" : "تحديث كلمة المرور لـ المفتاح الخاص",
diff --git a/apps/encryption/l10n/ast.js b/apps/encryption/l10n/ast.js
deleted file mode 100644
index eb732bada56..00000000000
--- a/apps/encryption/l10n/ast.js
+++ /dev/null
@@ -1,29 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Recovery key successfully enabled" : "Habilitóse la recuperación de ficheros",
- "Could not enable recovery key. Please check your recovery key password!" : "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña.",
- "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
- "Could not disable recovery key. Please check your recovery key password!" : "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
- "Password successfully changed." : "Camudóse la contraseña",
- "Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
- "Private key password successfully updated." : "Contraseña de clave privada anovada correchamente.",
- "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clave privada non válida pa Encryption. Por favor, anueva la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.",
- "The share will expire on %s." : "La compartición va caducar el %s.",
- "Cheers!" : "¡Salú!",
- "Recovery key password" : "Contraseña de clave de recuperación",
- "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
- "Change Password" : "Camudar contraseña",
- "Set your old private key password to your current log-in password:" : "Afita la contraseña de clave privada vieya pa la to contraseña d'aniciu de sesión actual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.",
- "Old log-in password" : "Contraseña d'accesu vieya",
- "Current log-in password" : "Contraseña d'accesu actual",
- "Update Private Key Password" : "Anovar Contraseña de Clave Privada",
- "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña",
- "Enabled" : "Habilitar",
- "Disabled" : "Deshabilitáu"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/ast.json b/apps/encryption/l10n/ast.json
deleted file mode 100644
index 501e4757acf..00000000000
--- a/apps/encryption/l10n/ast.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{ "translations": {
- "Recovery key successfully enabled" : "Habilitóse la recuperación de ficheros",
- "Could not enable recovery key. Please check your recovery key password!" : "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña.",
- "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
- "Could not disable recovery key. Please check your recovery key password!" : "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
- "Password successfully changed." : "Camudóse la contraseña",
- "Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
- "Private key password successfully updated." : "Contraseña de clave privada anovada correchamente.",
- "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clave privada non válida pa Encryption. Por favor, anueva la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.",
- "The share will expire on %s." : "La compartición va caducar el %s.",
- "Cheers!" : "¡Salú!",
- "Recovery key password" : "Contraseña de clave de recuperación",
- "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
- "Change Password" : "Camudar contraseña",
- "Set your old private key password to your current log-in password:" : "Afita la contraseña de clave privada vieya pa la to contraseña d'aniciu de sesión actual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.",
- "Old log-in password" : "Contraseña d'accesu vieya",
- "Current log-in password" : "Contraseña d'accesu actual",
- "Update Private Key Password" : "Anovar Contraseña de Clave Privada",
- "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña",
- "Enabled" : "Habilitar",
- "Disabled" : "Deshabilitáu"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/az.js b/apps/encryption/l10n/az.js
deleted file mode 100644
index d4190b66aab..00000000000
--- a/apps/encryption/l10n/az.js
+++ /dev/null
@@ -1,35 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Missing recovery key password" : "Bərpa açarının şifrəsi çatışmır",
- "Please repeat the recovery key password" : "Xahiş olunur bərpa açarı şifrəsini təkrarlayasınız",
- "Repeated recovery key password does not match the provided recovery key password" : "Təkrar daxil edilən bərpa açarı şifrəsi, öncə daxil edilən bərpa açarı ilə üst-üstə düşmür ",
- "Recovery key successfully enabled" : "Bərpa açarı uğurla aktivləşdi",
- "Could not enable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarının aktivləşdirilməsi mümkün olmadı. Xahiş olunur geriqaytarılma açarı üçün tələb edilən şifrəni yoxlayasınız.",
- "Recovery key successfully disabled" : "Bərpa açarı uğurla söndürüldü",
- "Could not disable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarını sondürmək olmur. Xahiş edirik geriqaytarılma key açarınızı yoxlayın.",
- "Please provide the old recovery password" : "Xahiş olunur köhnə bərpa açarını daxil edəsiniz",
- "Please provide a new recovery password" : "Xahiş olunur yeni bərpa açarı şifrəsini daxil esəsiniz",
- "Please repeat the new recovery password" : "Xahiş olunur yeni bərpa açarını təkrarlayasınız",
- "Password successfully changed." : "Şifrə uğurla dəyişdirildi.",
- "Could not change the password. Maybe the old password was not correct." : "Şifrəni dəyişmək olmur, ola bilər ki, köhnə şifrə düzgün olmayıb.",
- "Could not update the private key password." : "Gizli açarın şifrəsini yeniləmək mümkün olmadı.",
- "The old password was not correct, please try again." : "Köhnə şifrə düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
- "The current log-in password was not correct, please try again." : "Hal-hazırki istifadəçi şifrəsi düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
- "Private key password successfully updated." : "Gizli aşar şifrəsi uğurla yeniləndi.",
- "Cheers!" : "Şərəfə!",
- "Recovery key password" : "Açar şifrənin bərpa edilməsi",
- "Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
- "Change Password" : "Şifrəni dəyişdir",
- "Your private key password no longer matches your log-in password." : "Sizin gizli açar şifrəsi, artıq giriş adınızla uyğun gəlmir.",
- "Set your old private key password to your current log-in password:" : "Köhnə açar şifrənizi, sizin hal-hazırki giriş şifrənizə təyin edin: ",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Əgər siz köhnə şifrənizi xatırlamırsınızsa, öz inzibatçınızdan fayllarınızın bərpasını istəyə bilərsiniz.",
- "Old log-in password" : "Köhnə giriş şifrəsi",
- "Current log-in password" : "Hal-hazırki giriş şifrəsi",
- "Update Private Key Password" : "Gizli açar şifrəsini yenilə",
- "Enable password recovery:" : "Şifrə bərpasını işə sal:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu opsiyanın aktiv edilməsi sizə, şifrənin itdiyi hallarda bütün şifrələnmiş fayllarınıza yetkinin yenidən əldə edilməsinə şərait yaradacaq",
- "Enabled" : "İşə salınıb",
- "Disabled" : "Dayandırılıb"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/az.json b/apps/encryption/l10n/az.json
deleted file mode 100644
index 6e88e1740a7..00000000000
--- a/apps/encryption/l10n/az.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{ "translations": {
- "Missing recovery key password" : "Bərpa açarının şifrəsi çatışmır",
- "Please repeat the recovery key password" : "Xahiş olunur bərpa açarı şifrəsini təkrarlayasınız",
- "Repeated recovery key password does not match the provided recovery key password" : "Təkrar daxil edilən bərpa açarı şifrəsi, öncə daxil edilən bərpa açarı ilə üst-üstə düşmür ",
- "Recovery key successfully enabled" : "Bərpa açarı uğurla aktivləşdi",
- "Could not enable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarının aktivləşdirilməsi mümkün olmadı. Xahiş olunur geriqaytarılma açarı üçün tələb edilən şifrəni yoxlayasınız.",
- "Recovery key successfully disabled" : "Bərpa açarı uğurla söndürüldü",
- "Could not disable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarını sondürmək olmur. Xahiş edirik geriqaytarılma key açarınızı yoxlayın.",
- "Please provide the old recovery password" : "Xahiş olunur köhnə bərpa açarını daxil edəsiniz",
- "Please provide a new recovery password" : "Xahiş olunur yeni bərpa açarı şifrəsini daxil esəsiniz",
- "Please repeat the new recovery password" : "Xahiş olunur yeni bərpa açarını təkrarlayasınız",
- "Password successfully changed." : "Şifrə uğurla dəyişdirildi.",
- "Could not change the password. Maybe the old password was not correct." : "Şifrəni dəyişmək olmur, ola bilər ki, köhnə şifrə düzgün olmayıb.",
- "Could not update the private key password." : "Gizli açarın şifrəsini yeniləmək mümkün olmadı.",
- "The old password was not correct, please try again." : "Köhnə şifrə düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
- "The current log-in password was not correct, please try again." : "Hal-hazırki istifadəçi şifrəsi düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
- "Private key password successfully updated." : "Gizli aşar şifrəsi uğurla yeniləndi.",
- "Cheers!" : "Şərəfə!",
- "Recovery key password" : "Açar şifrənin bərpa edilməsi",
- "Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
- "Change Password" : "Şifrəni dəyişdir",
- "Your private key password no longer matches your log-in password." : "Sizin gizli açar şifrəsi, artıq giriş adınızla uyğun gəlmir.",
- "Set your old private key password to your current log-in password:" : "Köhnə açar şifrənizi, sizin hal-hazırki giriş şifrənizə təyin edin: ",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Əgər siz köhnə şifrənizi xatırlamırsınızsa, öz inzibatçınızdan fayllarınızın bərpasını istəyə bilərsiniz.",
- "Old log-in password" : "Köhnə giriş şifrəsi",
- "Current log-in password" : "Hal-hazırki giriş şifrəsi",
- "Update Private Key Password" : "Gizli açar şifrəsini yenilə",
- "Enable password recovery:" : "Şifrə bərpasını işə sal:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu opsiyanın aktiv edilməsi sizə, şifrənin itdiyi hallarda bütün şifrələnmiş fayllarınıza yetkinin yenidən əldə edilməsinə şərait yaradacaq",
- "Enabled" : "İşə salınıb",
- "Disabled" : "Dayandırılıb"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/bg.js b/apps/encryption/l10n/bg.js
index 9c36730aa54..009fb7d9aee 100644
--- a/apps/encryption/l10n/bg.js
+++ b/apps/encryption/l10n/bg.js
@@ -28,21 +28,19 @@ OC.L10N.register(
"Bad Signature" : "Лош подпис",
"Missing Signature" : "Липсва подпис",
"one-time password for server-side-encryption" : "еднократна парола за криптиране от страна на сървъра",
+ "Encryption password" : "Парола за криптиране",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Администрацията е активирала криптирането от страна на сървъра. Файловете ви бяха криптирани със следната парола <strong>%s</strong>",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Администрацията е активирала криптирането от страна на сървъра. Файловете ви са били криптирани с помощта на паролата „%s“",
"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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "За да използвате този модул за криптиране, трябва да активирате от страна на сървъра\nкриптирането в администраторските настройки. След като бъде активиран, този модул ще шифрова\nвсичките ви файлове прозрачно. Криптирането се основава на AES 256 ключове.\nМодулът няма да засяга съществуващи файлове, само новите файлове ще бъдат криптирани\nслед активиране на криптиране от страна на сървъра. Също така не е възможно да\nдеактивирайте криптирането отново и се върнете към нешифрована система.\nМоля, прочетете документацията, за да знаете всички последици, преди да решите\nда активирате сървърно криптиране.",
- "Hey there,\n\nThe administration 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" : "Здравей,\n\nАдминистрацията активира шифроването от страна на сървъра. Файловете ви са криптирани със следната парола \"%s\".\n\nМоля да влезете в уеб интерфейса, да отидете в раздела „основен модул за криптиране“ на вашите лични настройки и да актуализирате паролата си за криптиране, като въведете тази парола в полето „стара парола за влизане“ и текущата парола за вход.\n\n",
- "The share will expire on %s." : "Споделянето ще изтече на %s.",
- "Cheers!" : "Поздрави!",
- "Hey there,<br><br>The administration 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>" : "Здравей, <br><br>Администрацията активира шифроването от страна на сървъра. Файловете ви са криптирани със следната парола <strong>%s</strong>.<br><br> Моля да влезете в уеб интерфейса, да отидете в раздела „основен модул за криптиране“ на вашите лични настройки и да актуализирате паролата си за криптиране, като въведете тази парола в полето „стара парола за влизане“ и текущата парола за вход. <br><br>",
+ "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 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." : "Ключът за възстановяване е допълнителен ключ за криптиране, който се използва за криптиране на файлове. Той позволява възстановяване на файлове на потребител, ако потребителят си забрави паролата.",
"Recovery key password" : "Парола за възстановяане на ключа",
"Repeat recovery key password" : "Повторение на паролата за възстановяане на ключа",
"Change recovery key password:" : "Промени паролата за въстановяване на ключа:",
@@ -53,7 +51,6 @@ OC.L10N.register(
"Basic encryption module" : "Основен модул за криптиране",
"Your private key password no longer matches your log-in password." : "Личният ви ключ не съвпада с паролата за вписване.",
"Set your old private key password to your current log-in password:" : "Промени паролата за тайния ти включ на паролата за вписване:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ако не помниш старата парола помоли администратора да възстанови файловете ти.",
"Old log-in password" : "Стара парола за вписване",
"Current log-in password" : "Текуща парола за вписване",
"Update Private Key Password" : "Промени Тайната Парола за Ключа",
diff --git a/apps/encryption/l10n/bg.json b/apps/encryption/l10n/bg.json
index 2928d4d43b2..4a4ed94210e 100644
--- a/apps/encryption/l10n/bg.json
+++ b/apps/encryption/l10n/bg.json
@@ -26,21 +26,19 @@
"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“",
"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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "За да използвате този модул за криптиране, трябва да активирате от страна на сървъра\nкриптирането в администраторските настройки. След като бъде активиран, този модул ще шифрова\nвсичките ви файлове прозрачно. Криптирането се основава на AES 256 ключове.\nМодулът няма да засяга съществуващи файлове, само новите файлове ще бъдат криптирани\nслед активиране на криптиране от страна на сървъра. Също така не е възможно да\nдеактивирайте криптирането отново и се върнете към нешифрована система.\nМоля, прочетете документацията, за да знаете всички последици, преди да решите\nда активирате сървърно криптиране.",
- "Hey there,\n\nThe administration 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" : "Здравей,\n\nАдминистрацията активира шифроването от страна на сървъра. Файловете ви са криптирани със следната парола \"%s\".\n\nМоля да влезете в уеб интерфейса, да отидете в раздела „основен модул за криптиране“ на вашите лични настройки и да актуализирате паролата си за криптиране, като въведете тази парола в полето „стара парола за влизане“ и текущата парола за вход.\n\n",
- "The share will expire on %s." : "Споделянето ще изтече на %s.",
- "Cheers!" : "Поздрави!",
- "Hey there,<br><br>The administration 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>" : "Здравей, <br><br>Администрацията активира шифроването от страна на сървъра. Файловете ви са криптирани със следната парола <strong>%s</strong>.<br><br> Моля да влезете в уеб интерфейса, да отидете в раздела „основен модул за криптиране“ на вашите лични настройки и да актуализирате паролата си за криптиране, като въведете тази парола в полето „стара парола за влизане“ и текущата парола за вход. <br><br>",
+ "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 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." : "Ключът за възстановяване е допълнителен ключ за криптиране, който се използва за криптиране на файлове. Той позволява възстановяване на файлове на потребител, ако потребителят си забрави паролата.",
"Recovery key password" : "Парола за възстановяане на ключа",
"Repeat recovery key password" : "Повторение на паролата за възстановяане на ключа",
"Change recovery key password:" : "Промени паролата за въстановяване на ключа:",
@@ -51,7 +49,6 @@
"Basic encryption module" : "Основен модул за криптиране",
"Your private key password no longer matches your log-in password." : "Личният ви ключ не съвпада с паролата за вписване.",
"Set your old private key password to your current log-in password:" : "Промени паролата за тайния ти включ на паролата за вписване:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ако не помниш старата парола помоли администратора да възстанови файловете ти.",
"Old log-in password" : "Стара парола за вписване",
"Current log-in password" : "Текуща парола за вписване",
"Update Private Key Password" : "Промени Тайната Парола за Ключа",
diff --git a/apps/encryption/l10n/bn_BD.js b/apps/encryption/l10n/bn_BD.js
deleted file mode 100644
index 2d20f4caa26..00000000000
--- a/apps/encryption/l10n/bn_BD.js
+++ /dev/null
@@ -1,13 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
- "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
- "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
- "Cheers!" : "শুভেচ্ছা!",
- "Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
- "Change Password" : "কূটশব্দ পরিবর্তন করুন",
- "Enabled" : "কার্যকর",
- "Disabled" : "অকার্যকর"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/bn_BD.json b/apps/encryption/l10n/bn_BD.json
deleted file mode 100644
index 4c2c9c14b95..00000000000
--- a/apps/encryption/l10n/bn_BD.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{ "translations": {
- "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
- "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
- "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
- "Cheers!" : "শুভেচ্ছা!",
- "Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
- "Change Password" : "কূটশব্দ পরিবর্তন করুন",
- "Enabled" : "কার্যকর",
- "Disabled" : "অকার্যকর"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/bs.js b/apps/encryption/l10n/bs.js
deleted file mode 100644
index 41d7074d5a4..00000000000
--- a/apps/encryption/l10n/bs.js
+++ /dev/null
@@ -1,11 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molim ažurirajte lozinku svoga privatnog ključa u svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite",
- "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
- "Cheers!" : "Cheers!",
- "Enabled" : "Aktivirano",
- "Disabled" : "Onemogućeno"
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/encryption/l10n/bs.json b/apps/encryption/l10n/bs.json
deleted file mode 100644
index 0beb35f1558..00000000000
--- a/apps/encryption/l10n/bs.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "translations": {
- "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molim ažurirajte lozinku svoga privatnog ključa u svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite",
- "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
- "Cheers!" : "Cheers!",
- "Enabled" : "Aktivirano",
- "Disabled" : "Onemogućeno"
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/ca.js b/apps/encryption/l10n/ca.js
index a2fdc0b5ad3..fd531c313ab 100644
--- a/apps/encryption/l10n/ca.js
+++ b/apps/encryption/l10n/ca.js
@@ -32,17 +32,11 @@ OC.L10N.register(
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es pot llegir aquest fitxer, probablement aquest sigui un fitxer compartit. Demana al propietari del fitxer que torni a compartir el fitxer amb tu.",
"Default encryption module" : "Mòdul de xifratge per defecte",
"Default encryption module for server-side encryption" : "Mòdul criptogràfic per defecte per a xifratge de servidor",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Per fer servir aquest mòdul criptogràfic s’ha de habilitar xifratge en el servidor\n\t\tals paràmetres de l'administrador. Un cop habilitat, aquest mòdul xifrarà\n\t\ttots els vostres fitxers de forma transparent. El xifratge està basada en claus de AES 256.\n\t\tEl mòdul no tocarà fitxers existents, només es xifraràn els nous un cop s'hagi activat\n\t\tel xifratge en el servidor. Tampoc no és possible inhabilitar\n\t\tel xifratge i tornar a un sistema no xifrat.\n\t\tSi us plau llegiu la documentació per saber totes les implicacions abans de decidir\n\t\tactivar el xifratge en el servidor.",
- "Hey there,\n\nThe administration 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" : "Hola,\n\nL'administració ha habilitat el xifratge en el servidor. Els vostres fitxers s'han xifrat amb la contrasenya \"%s\".\n\nInicieu sessió a la interfície web, aneu a la secció \"Mòdul de xifratge bàsic\" dels vostres paràmetres personals i actualitzeu la vostra contrasenya de xifratge introduint aquesta contrasenya al camp \"Contrasenya d'inici de sessió antiga\" i la vostra contrasenya d'inici de sessió actual.\n\n",
- "The share will expire on %s." : "La compartició caduca el %s.",
- "Cheers!" : "Salut!",
- "Hey there,<br><br>The administration 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>" : "Hola,<br><br> L'administració ha habilitat el xifratge en el servidor. Els vostres fitxers s'han xifrat amb la contrasenya <strong>%s</strong>.<br><br>Si us plau, inicieu sessió a la interfície web, aneu a la secció \"Mòdul de xifratge bàsic\" dels vostres paràmetres personals i actualitzeu la vostra contrasenya de xifratge introduint aquesta contrasenya al camp \"Contrasenya d'inici de sessió antiga\" i la vostra contrasenya d'inici de sessió actual.<br><br>",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació de xifratge està activada però les claus no estan inicialitzades, tanqueu la sessió i inicieu-ne una de nova.",
"Encrypt the home storage" : "Xifra l'emmagatzematge de casa",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Si activeu aquesta opció, es xifraran tots els fitxers emmagatzemats a l’emmagatzematge principal; en cas contrari, només es xifraran els fitxers d’emmagatzematge extern",
"Enable recovery key" : "Habilita la clau de recuperació",
"Disable recovery key" : "Inhabilita la clau de recuperació",
- "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.",
"Recovery key password" : "Clau de recuperació de la contrasenya",
"Repeat recovery key password" : "Repetiu la contrasenya de la clau de recuperació",
"Change recovery key password:" : "Canvia la clau de recuperació de contrasenya:",
@@ -53,7 +47,6 @@ OC.L10N.register(
"Basic encryption module" : "Mòdul de xifratge bàsic",
"Your private key password no longer matches your log-in password." : "La clau privada ja no es correspon amb la contrasenya d'inici de sessió:",
"Set your old private key password to your current log-in password:" : "Establiu la vostra antiga clau privada a l'actual contrasenya d'accés:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers.",
"Old log-in password" : "Contrasenya antiga d’inici de sessió",
"Current log-in password" : "Contrasenya actual d’inici de sessió",
"Update Private Key Password" : "Actualitza la contrasenya de clau privada",
diff --git a/apps/encryption/l10n/ca.json b/apps/encryption/l10n/ca.json
index 37ab6b7da87..80c09aa0b0d 100644
--- a/apps/encryption/l10n/ca.json
+++ b/apps/encryption/l10n/ca.json
@@ -30,17 +30,11 @@
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es pot llegir aquest fitxer, probablement aquest sigui un fitxer compartit. Demana al propietari del fitxer que torni a compartir el fitxer amb tu.",
"Default encryption module" : "Mòdul de xifratge per defecte",
"Default encryption module for server-side encryption" : "Mòdul criptogràfic per defecte per a xifratge de servidor",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Per fer servir aquest mòdul criptogràfic s’ha de habilitar xifratge en el servidor\n\t\tals paràmetres de l'administrador. Un cop habilitat, aquest mòdul xifrarà\n\t\ttots els vostres fitxers de forma transparent. El xifratge està basada en claus de AES 256.\n\t\tEl mòdul no tocarà fitxers existents, només es xifraràn els nous un cop s'hagi activat\n\t\tel xifratge en el servidor. Tampoc no és possible inhabilitar\n\t\tel xifratge i tornar a un sistema no xifrat.\n\t\tSi us plau llegiu la documentació per saber totes les implicacions abans de decidir\n\t\tactivar el xifratge en el servidor.",
- "Hey there,\n\nThe administration 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" : "Hola,\n\nL'administració ha habilitat el xifratge en el servidor. Els vostres fitxers s'han xifrat amb la contrasenya \"%s\".\n\nInicieu sessió a la interfície web, aneu a la secció \"Mòdul de xifratge bàsic\" dels vostres paràmetres personals i actualitzeu la vostra contrasenya de xifratge introduint aquesta contrasenya al camp \"Contrasenya d'inici de sessió antiga\" i la vostra contrasenya d'inici de sessió actual.\n\n",
- "The share will expire on %s." : "La compartició caduca el %s.",
- "Cheers!" : "Salut!",
- "Hey there,<br><br>The administration 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>" : "Hola,<br><br> L'administració ha habilitat el xifratge en el servidor. Els vostres fitxers s'han xifrat amb la contrasenya <strong>%s</strong>.<br><br>Si us plau, inicieu sessió a la interfície web, aneu a la secció \"Mòdul de xifratge bàsic\" dels vostres paràmetres personals i actualitzeu la vostra contrasenya de xifratge introduint aquesta contrasenya al camp \"Contrasenya d'inici de sessió antiga\" i la vostra contrasenya d'inici de sessió actual.<br><br>",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació de xifratge està activada però les claus no estan inicialitzades, tanqueu la sessió i inicieu-ne una de nova.",
"Encrypt the home storage" : "Xifra l'emmagatzematge de casa",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Si activeu aquesta opció, es xifraran tots els fitxers emmagatzemats a l’emmagatzematge principal; en cas contrari, només es xifraran els fitxers d’emmagatzematge extern",
"Enable recovery key" : "Habilita la clau de recuperació",
"Disable recovery key" : "Inhabilita la clau de recuperació",
- "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.",
"Recovery key password" : "Clau de recuperació de la contrasenya",
"Repeat recovery key password" : "Repetiu la contrasenya de la clau de recuperació",
"Change recovery key password:" : "Canvia la clau de recuperació de contrasenya:",
@@ -51,7 +45,6 @@
"Basic encryption module" : "Mòdul de xifratge bàsic",
"Your private key password no longer matches your log-in password." : "La clau privada ja no es correspon amb la contrasenya d'inici de sessió:",
"Set your old private key password to your current log-in password:" : "Establiu la vostra antiga clau privada a l'actual contrasenya d'accés:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers.",
"Old log-in password" : "Contrasenya antiga d’inici de sessió",
"Current log-in password" : "Contrasenya actual d’inici de sessió",
"Update Private Key Password" : "Actualitza la contrasenya de clau privada",
diff --git a/apps/encryption/l10n/cs.js b/apps/encryption/l10n/cs.js
index 02ecffa6096..97d6108a17d 100644
--- a/apps/encryption/l10n/cs.js
+++ b/apps/encryption/l10n/cs.js
@@ -28,21 +28,21 @@ OC.L10N.register(
"Bad Signature" : "Nesprávný podpis",
"Missing Signature" : "Chybějící podpis",
"one-time password for server-side-encryption" : "jednorázové heslo pro šifrování na straně serveru",
+ "Encryption password" : "Šifrovací heslo",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Správce zapnul šifrování na straně serveru. Vaše soubory byly zašifrovány pomocí hesla <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Správce zapnul šifrování na straně serveru. Vaše soubory byly zašifrovány pomocí hesla „%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." : "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.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nedaří rozšifrovat – pravděpodobně se jedná o nasdílený soubor. Požádejte jeho vlastníka, aby vám ho znovu nasdílel.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Z tohoto souboru se nedaří číst – pravděpodobně se jedná o nasdílený soubor. Požádejte jeho vlastníka, aby vám ho znovu nasdílel.",
"Default encryption module" : "Výchozí šifrovací modul",
"Default encryption module for server-side encryption" : "Výchozí modul pro šifrování na straně serveru",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Pro používání tohoto šifrovacího modulu je třeba zapnout šifrování na straně serveru\n\t\t ve správním nastavení. Jakmile je zapnutý, tento modul transparentně zašifruje\n\t\tvšechny vaše soubory. Šifrování je založeno na AES 256 klíčích.\n\t\tModul se nedotkne existujících souborů, zašifrovány budou pouze nové soubory\n\t\tpo zapnutí šifrování na straně serveru už není možné\n\t\tho zase vypnout a vrátit se k nešifrovanému systému.\n\t\tNež se rozhodnete zapnout šifrování na straně serveru\n\t\tpřečtěte si dokumentaci, abyste se seznámili se známými důsledky.",
- "Hey there,\n\nThe administration 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" : "Zdravíme,\n\nz důvodu zabezpečení, správci zapnuli šifrování dat na straně serveru. Vaše soubory byly zašifrovány za použití hesla „%s“.\n\nPřihlaste se do webového rozhraní, jděte do nastavení, sekce „Základní šifrovací modul“ a aktualizujte šifrovací heslo zadáním výše uvedeného hesla do kolonky „Původní přihlašovací heslo“ a pak jako nové nastavte to heslo, kterým se přihlašujete.\n\n",
- "The share will expire on %s." : "Platnost sdílení skončí %s.",
- "Cheers!" : "Díky!",
- "Hey there,<br><br>The administration 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>" : "Zdravíme,<br><br>z důvodu zabezpečení, správci zapnuli šifrování dat na straně serveru. Vaše soubory byly zašifrovány za použití hesla <strong>%s<strong>.<br><br>Přihlaste se do webového rozhraní, jděte do nastavení, sekce „Základní šifrovací modul“ a aktualizujte šifrovací heslo zadáním výše uvedeného hesla do kolonky „Původní přihlašovací heslo“ a pak jako nové nastavte to heslo, kterým se přihlašujete.<br><br>",
+ "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." : "Pro používání tohoto šifrovacího modulu je třeba zapnout šifrování na straně serveru v nastavení správy. Jakmile je zapnutý, tento modul transparentně zašifruje všechny vaše soubory. Šifrování je založeno na AES 256 klíčích.\nModul se nedotkne existujících souborů, zašifrovány budou pouze nové soubory po zapnutí šifrování na straně serveru už není možné ho zase vypnout a vrátit se k nešifrovanému systému.\nNež se rozhodnete zapnout šifrování na straně serveru přečtěte si dokumentaci, abyste se seznámili se známými důsledky.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale šifrovací klíče ještě nejsou inicializované. Odhlaste se a znovu se přihlaste",
"Encrypt the home storage" : "Zašifrovat domovské úložiště",
"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 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.",
+ "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:",
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Základní šifrovací modul",
"Your private key password no longer matches your log-in password." : "Heslo k vašemu soukromému klíči se už neshoduje s vaším přihlašovacím heslem.",
"Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
"Old log-in password" : "Původní přihlašovací heslo",
"Current log-in password" : "Stávající přihlašovací heslo",
"Update Private Key Password" : "Změnit heslo k soukromé části klíče",
diff --git a/apps/encryption/l10n/cs.json b/apps/encryption/l10n/cs.json
index 4b72da1d736..24b09516608 100644
--- a/apps/encryption/l10n/cs.json
+++ b/apps/encryption/l10n/cs.json
@@ -26,21 +26,21 @@
"Bad Signature" : "Nesprávný podpis",
"Missing Signature" : "Chybějící podpis",
"one-time password for server-side-encryption" : "jednorázové heslo pro šifrování na straně serveru",
+ "Encryption password" : "Šifrovací heslo",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Správce zapnul šifrování na straně serveru. Vaše soubory byly zašifrovány pomocí hesla <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Správce zapnul šifrování na straně serveru. Vaše soubory byly zašifrovány pomocí hesla „%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." : "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.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nedaří rozšifrovat – pravděpodobně se jedná o nasdílený soubor. Požádejte jeho vlastníka, aby vám ho znovu nasdílel.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Z tohoto souboru se nedaří číst – pravděpodobně se jedná o nasdílený soubor. Požádejte jeho vlastníka, aby vám ho znovu nasdílel.",
"Default encryption module" : "Výchozí šifrovací modul",
"Default encryption module for server-side encryption" : "Výchozí modul pro šifrování na straně serveru",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Pro používání tohoto šifrovacího modulu je třeba zapnout šifrování na straně serveru\n\t\t ve správním nastavení. Jakmile je zapnutý, tento modul transparentně zašifruje\n\t\tvšechny vaše soubory. Šifrování je založeno na AES 256 klíčích.\n\t\tModul se nedotkne existujících souborů, zašifrovány budou pouze nové soubory\n\t\tpo zapnutí šifrování na straně serveru už není možné\n\t\tho zase vypnout a vrátit se k nešifrovanému systému.\n\t\tNež se rozhodnete zapnout šifrování na straně serveru\n\t\tpřečtěte si dokumentaci, abyste se seznámili se známými důsledky.",
- "Hey there,\n\nThe administration 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" : "Zdravíme,\n\nz důvodu zabezpečení, správci zapnuli šifrování dat na straně serveru. Vaše soubory byly zašifrovány za použití hesla „%s“.\n\nPřihlaste se do webového rozhraní, jděte do nastavení, sekce „Základní šifrovací modul“ a aktualizujte šifrovací heslo zadáním výše uvedeného hesla do kolonky „Původní přihlašovací heslo“ a pak jako nové nastavte to heslo, kterým se přihlašujete.\n\n",
- "The share will expire on %s." : "Platnost sdílení skončí %s.",
- "Cheers!" : "Díky!",
- "Hey there,<br><br>The administration 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>" : "Zdravíme,<br><br>z důvodu zabezpečení, správci zapnuli šifrování dat na straně serveru. Vaše soubory byly zašifrovány za použití hesla <strong>%s<strong>.<br><br>Přihlaste se do webového rozhraní, jděte do nastavení, sekce „Základní šifrovací modul“ a aktualizujte šifrovací heslo zadáním výše uvedeného hesla do kolonky „Původní přihlašovací heslo“ a pak jako nové nastavte to heslo, kterým se přihlašujete.<br><br>",
+ "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." : "Pro používání tohoto šifrovacího modulu je třeba zapnout šifrování na straně serveru v nastavení správy. Jakmile je zapnutý, tento modul transparentně zašifruje všechny vaše soubory. Šifrování je založeno na AES 256 klíčích.\nModul se nedotkne existujících souborů, zašifrovány budou pouze nové soubory po zapnutí šifrování na straně serveru už není možné ho zase vypnout a vrátit se k nešifrovanému systému.\nNež se rozhodnete zapnout šifrování na straně serveru přečtěte si dokumentaci, abyste se seznámili se známými důsledky.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale šifrovací klíče ještě nejsou inicializované. Odhlaste se a znovu se přihlaste",
"Encrypt the home storage" : "Zašifrovat domovské úložiště",
"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 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.",
+ "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:",
@@ -51,7 +51,7 @@
"Basic encryption module" : "Základní šifrovací modul",
"Your private key password no longer matches your log-in password." : "Heslo k vašemu soukromému klíči se už neshoduje s vaším přihlašovacím heslem.",
"Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
"Old log-in password" : "Původní přihlašovací heslo",
"Current log-in password" : "Stávající přihlašovací heslo",
"Update Private Key Password" : "Změnit heslo k soukromé části klíče",
diff --git a/apps/encryption/l10n/da.js b/apps/encryption/l10n/da.js
index f0808ab5b70..2688722c16c 100644
--- a/apps/encryption/l10n/da.js
+++ b/apps/encryption/l10n/da.js
@@ -27,22 +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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "For at anvende dette krypteringsmodul, skal du aktivere kryptering på server-siden under administrator-indstillinger. Når dette modul er aktieret, vil det kryptere alle dine filer transparent. Krypteringen er baseret på AES 256-nøgler. Modulet rører ikke eksisterende filer, kun nye filer vil blive krypteret, efter at kryptering på server-siden er aktiveret. Det er ikke muligt at aktivere kryptering igen og skifte tilbage til et ukrypteret system. Læs venligst dokumentationen, så du kender konsekvenserne, før du beslutter dig for at slå kryptering til på server-siden.",
- "Hey there,\n\nThe administration 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" : "Hej med dig,\n\nAdministrationen aktiverede kryptering på serversiden. Dine filer blev krypteret ved hjælp af adgangskoden \"%s\".\n\nLog venligst ind på webgrænsefladen, gå til sektionen \"Grundlæggende krypteringsmodul\" i dine personlige indstillinger og opdater din krypteringsadgangskode ved at indtaste denne adgangskode i feltet \"Gammel login-adgangskode\" og din nuværende login-adgangskode.\n\n",
- "The share will expire on %s." : "Delingen vil udløbe om %s.",
- "Cheers!" : "Hej!",
- "Hey there,<br><br>The administration 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>" : "He,<br><br>Administrationen aktiverede server-side-kryptering. Dine filer blev krypteret med adgangskoden <strong>%s</strong>.<br><br>Log venligst ind på webgrænsefladen, gå til sektionen \"Grundlæggende krypteringsmodul\" i dine personlige indstillinger og opdater din krypteringsadgangskode ved at indtaste denne adgangskode i feltet \"Gamle login-adgangskode\" og dit nuværende login-password.<br><br>",
+ "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",
- "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.",
+ "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:",
@@ -53,7 +53,6 @@ OC.L10N.register(
"Basic encryption module" : "Basis krypterings modul",
"Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
"Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
"Old log-in password" : "Gammel adgangskode",
"Current log-in password" : "Nuværende adgangskode",
"Update Private Key Password" : "Opdater Privat Nøgle Kodeord",
diff --git a/apps/encryption/l10n/da.json b/apps/encryption/l10n/da.json
index 244b272685a..688adab4704 100644
--- a/apps/encryption/l10n/da.json
+++ b/apps/encryption/l10n/da.json
@@ -25,22 +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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "For at anvende dette krypteringsmodul, skal du aktivere kryptering på server-siden under administrator-indstillinger. Når dette modul er aktieret, vil det kryptere alle dine filer transparent. Krypteringen er baseret på AES 256-nøgler. Modulet rører ikke eksisterende filer, kun nye filer vil blive krypteret, efter at kryptering på server-siden er aktiveret. Det er ikke muligt at aktivere kryptering igen og skifte tilbage til et ukrypteret system. Læs venligst dokumentationen, så du kender konsekvenserne, før du beslutter dig for at slå kryptering til på server-siden.",
- "Hey there,\n\nThe administration 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" : "Hej med dig,\n\nAdministrationen aktiverede kryptering på serversiden. Dine filer blev krypteret ved hjælp af adgangskoden \"%s\".\n\nLog venligst ind på webgrænsefladen, gå til sektionen \"Grundlæggende krypteringsmodul\" i dine personlige indstillinger og opdater din krypteringsadgangskode ved at indtaste denne adgangskode i feltet \"Gammel login-adgangskode\" og din nuværende login-adgangskode.\n\n",
- "The share will expire on %s." : "Delingen vil udløbe om %s.",
- "Cheers!" : "Hej!",
- "Hey there,<br><br>The administration 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>" : "He,<br><br>Administrationen aktiverede server-side-kryptering. Dine filer blev krypteret med adgangskoden <strong>%s</strong>.<br><br>Log venligst ind på webgrænsefladen, gå til sektionen \"Grundlæggende krypteringsmodul\" i dine personlige indstillinger og opdater din krypteringsadgangskode ved at indtaste denne adgangskode i feltet \"Gamle login-adgangskode\" og dit nuværende login-password.<br><br>",
+ "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",
- "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.",
+ "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:",
@@ -51,7 +51,6 @@
"Basic encryption module" : "Basis krypterings modul",
"Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
"Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
"Old log-in password" : "Gammel adgangskode",
"Current log-in password" : "Nuværende adgangskode",
"Update Private Key Password" : "Opdater Privat Nøgle Kodeord",
diff --git a/apps/encryption/l10n/de.js b/apps/encryption/l10n/de.js
index c471175ab11..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,33 +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 Administrationseinstellungen, 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",
- "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.",
+ "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. 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 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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Zur Verwendung dieses Verschlüsselungsmoduls muss serverseitige \n\t\tVerschlüsselung in den Admin-Einstellungen aktiviert werden. Nach der\n\t\tAktivierung werden alle Dateien verschlüsselt. Die Verschlüsselung basiert\n\t\tauf AES 256 Schlüsseln. Dieses Modul verschlüsselt nur neue Dateien,\n\t\texistierende Dateien werden nicht geädnert. Es ist nicht möglich die Ver-\n\t\tschlüsselung zu deaktivieren und zum Unverschlüsselten System zurück-\n\t\tzu kehren. Vor der Entscheidung das Verschlüsselungsmodul zu verwenden\n\t\tsollte unbedingt die Dokumentation aufmerksam gelesen werden.",
- "Hey there,\n\nThe administration 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" : "Hallo,\n\nder Administrator hat die serverseitige Verschlüsselung aktiviert. Deine Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte melde dich auf der Web-Oberfläche an, gehe zu deinen persönlichen Einstellungen und aktualisiere dort dein Verschlüsselungspasswort, indem du das Passwort in das 'altes Anmelde-Passwort' und in das 'aktuelles Anmelde-Passwort' Feld eingibst.\n\n",
- "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
- "Cheers!" : "Noch einen schönen Tag!",
- "Hey there,<br><br>The administration 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>" : "Hallo,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melde dich in der Web-Oberfläche an, gehe in Deine persönlichen Einstellungen. Dort findest du die Option 'Basisverschlüsselungsmodul' und aktualisiere dort dein Verschlüsselungspasswort indem du das Passwort in das 'alte Anmelde-Passwort' und in das 'aktuellen Anmelde-Passwort' Feld eingibst.<br><br>",
- "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",
+ "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 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 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.",
+ "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:",
@@ -51,9 +51,9 @@ OC.L10N.register(
"Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change Password" : "Passwort ändern",
"Basic encryption module" : "Basisverschlüsselungsmodul",
- "Your private key password no longer matches your log-in password." : "Das Passwort für deinen privaten Schlüssel stimmt nicht mehr mit deinem Anmelde-Passwort überein.",
+ "Your private key password no longer matches your log-in password." : "Das Passwort für den privaten Schlüssel stimmt nicht mehr mit dem Anmelde-Passwort überein.",
"Set your old private key password to your current log-in password:" : "Dein altes Passwort für den privaten Schlüssel auf dein aktuelles Anmeldepasswort setzen:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Falls du dich nicht an dein altes Passwort erinnern kannst, frage deinen Administrator, um deine Dateien wiederherzustellen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Wenn du dich nicht mehr an dein altes Passwort erinnern kannst, kannst du deine Administration bitten, deine Dateien wiederherzustellen.",
"Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Passwort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json
index a04862ae3f6..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,33 +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 Administrationseinstellungen, 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",
- "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.",
+ "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. 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 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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Zur Verwendung dieses Verschlüsselungsmoduls muss serverseitige \n\t\tVerschlüsselung in den Admin-Einstellungen aktiviert werden. Nach der\n\t\tAktivierung werden alle Dateien verschlüsselt. Die Verschlüsselung basiert\n\t\tauf AES 256 Schlüsseln. Dieses Modul verschlüsselt nur neue Dateien,\n\t\texistierende Dateien werden nicht geädnert. Es ist nicht möglich die Ver-\n\t\tschlüsselung zu deaktivieren und zum Unverschlüsselten System zurück-\n\t\tzu kehren. Vor der Entscheidung das Verschlüsselungsmodul zu verwenden\n\t\tsollte unbedingt die Dokumentation aufmerksam gelesen werden.",
- "Hey there,\n\nThe administration 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" : "Hallo,\n\nder Administrator hat die serverseitige Verschlüsselung aktiviert. Deine Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte melde dich auf der Web-Oberfläche an, gehe zu deinen persönlichen Einstellungen und aktualisiere dort dein Verschlüsselungspasswort, indem du das Passwort in das 'altes Anmelde-Passwort' und in das 'aktuelles Anmelde-Passwort' Feld eingibst.\n\n",
- "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
- "Cheers!" : "Noch einen schönen Tag!",
- "Hey there,<br><br>The administration 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>" : "Hallo,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melde dich in der Web-Oberfläche an, gehe in Deine persönlichen Einstellungen. Dort findest du die Option 'Basisverschlüsselungsmodul' und aktualisiere dort dein Verschlüsselungspasswort indem du das Passwort in das 'alte Anmelde-Passwort' und in das 'aktuellen Anmelde-Passwort' Feld eingibst.<br><br>",
- "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",
+ "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 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 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.",
+ "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:",
@@ -49,9 +49,9 @@
"Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change Password" : "Passwort ändern",
"Basic encryption module" : "Basisverschlüsselungsmodul",
- "Your private key password no longer matches your log-in password." : "Das Passwort für deinen privaten Schlüssel stimmt nicht mehr mit deinem Anmelde-Passwort überein.",
+ "Your private key password no longer matches your log-in password." : "Das Passwort für den privaten Schlüssel stimmt nicht mehr mit dem Anmelde-Passwort überein.",
"Set your old private key password to your current log-in password:" : "Dein altes Passwort für den privaten Schlüssel auf dein aktuelles Anmeldepasswort setzen:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Falls du dich nicht an dein altes Passwort erinnern kannst, frage deinen Administrator, um deine Dateien wiederherzustellen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Wenn du dich nicht mehr an dein altes Passwort erinnern kannst, kannst du deine Administration bitten, deine Dateien wiederherzustellen.",
"Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Passwort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js
index 6a8523be4ec..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,26 +23,26 @@ 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",
"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. Ihre 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. Ihre 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 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.",
"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 kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen 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 kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen 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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Zur Verwendung dieses Verschlüsselungsmoduls muss serverseitige\n\t\tVerschlüsselung in den Administrator-Einstellungen aktiviert werden. Nach der\n\t\tAktivierung werden alle Dateien verschlüsselt. Die Verschlüsselung basiert\n\t\tauf AES 256 Schlüsseln. Dieses Modul verschlüsselt nur neue Dateien,\n\t\texistierende Dateien werden nicht geändert. Es ist nicht möglich, die Ver-\n\t\tschlüsselung zu deaktivieren und zum unverschlüsselten System zurück-\n\t\tzukehren. Vor der Entscheidung, das Verschlüsselungsmodul zu verwenden,\n\t\tsollte unbedingt die Dokumentation aufmerksam gelesen werden.",
- "Hey there,\n\nThe administration 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" : "Hallo,\n\ndie Administration hat die servereitige Verschlüsselung aktiviert. Ihre Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte melden Sie sich auf der Web-Oberfläche an, gehen Sie zu Ihren persönlichen Einstellungen und aktualisieren Sie dort ihr Verschlüsselungspasswort, indem Sie das Passwort in das 'altes Anmelde-Passwort' und in das 'aktuelles Anmelde-Passwort' Feld eingeben.\n\n",
- "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
- "Cheers!" : "Noch einen schönen Tag!",
- "Hey there,<br><br>The administration 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>" : "Hallo,<br><br>die Administration hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melden Sie sich in der Web-Oberfläche an und gehen Sie in ihre persönlichen Einstellungen. Dort finden Sie die Option 'Basisverschlüsselungsmodul' und aktualisieren Sie dort Ihr Verschlüsselungspasswort indem Sie das Passwort in das 'altes Anmelde-Passwort-' und in das 'aktuelles Anmelde-Passwort' Feld eingeben.<br><br>",
+ "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, müssen Sie die serverseitige Verschlüsselung in den Administrationseinstellungen aktivieren. Sobald das Modul aktiviert ist, verschlüsselt es alle Ihre 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 lesen Sie die Dokumentation, um alle Auswirkungen zu kennen, bevor Sie sich entscheiden, 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 melden Sie sich ab und wieder an",
"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 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.",
+ "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üssel",
"Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change recovery key password:" : "Passwort für den Wiederherstellungsschlüssel ändern",
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Basisverschlüsselungsmodul",
"Your private key password no longer matches your log-in password." : "Das Passwort für Ihren privaten Schlüssel stimmt nicht mehr mit Ihrem Anmelde-Passwort überein.",
"Set your old private key password to your current log-in password:" : "Ihr altes Passwort für den privaten Schlüssel auf Ihr aktuelles Anmeldepasswort setzen:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Wenn Sie sich nicht mehr an Ihr altes Passwort erinnern, können Sie Ihre Administration bitten, Ihre Dateien wiederherzustellen.",
"Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Anmeldepasswort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json
index 6e6c2f30597..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,26 +21,26 @@
"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",
"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. Ihre 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. Ihre 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 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.",
"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 kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen 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 kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen 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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Zur Verwendung dieses Verschlüsselungsmoduls muss serverseitige\n\t\tVerschlüsselung in den Administrator-Einstellungen aktiviert werden. Nach der\n\t\tAktivierung werden alle Dateien verschlüsselt. Die Verschlüsselung basiert\n\t\tauf AES 256 Schlüsseln. Dieses Modul verschlüsselt nur neue Dateien,\n\t\texistierende Dateien werden nicht geändert. Es ist nicht möglich, die Ver-\n\t\tschlüsselung zu deaktivieren und zum unverschlüsselten System zurück-\n\t\tzukehren. Vor der Entscheidung, das Verschlüsselungsmodul zu verwenden,\n\t\tsollte unbedingt die Dokumentation aufmerksam gelesen werden.",
- "Hey there,\n\nThe administration 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" : "Hallo,\n\ndie Administration hat die servereitige Verschlüsselung aktiviert. Ihre Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte melden Sie sich auf der Web-Oberfläche an, gehen Sie zu Ihren persönlichen Einstellungen und aktualisieren Sie dort ihr Verschlüsselungspasswort, indem Sie das Passwort in das 'altes Anmelde-Passwort' und in das 'aktuelles Anmelde-Passwort' Feld eingeben.\n\n",
- "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
- "Cheers!" : "Noch einen schönen Tag!",
- "Hey there,<br><br>The administration 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>" : "Hallo,<br><br>die Administration hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melden Sie sich in der Web-Oberfläche an und gehen Sie in ihre persönlichen Einstellungen. Dort finden Sie die Option 'Basisverschlüsselungsmodul' und aktualisieren Sie dort Ihr Verschlüsselungspasswort indem Sie das Passwort in das 'altes Anmelde-Passwort-' und in das 'aktuelles Anmelde-Passwort' Feld eingeben.<br><br>",
+ "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, müssen Sie die serverseitige Verschlüsselung in den Administrationseinstellungen aktivieren. Sobald das Modul aktiviert ist, verschlüsselt es alle Ihre 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 lesen Sie die Dokumentation, um alle Auswirkungen zu kennen, bevor Sie sich entscheiden, 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 melden Sie sich ab und wieder an",
"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 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.",
+ "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üssel",
"Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change recovery key password:" : "Passwort für den Wiederherstellungsschlüssel ändern",
@@ -51,7 +51,7 @@
"Basic encryption module" : "Basisverschlüsselungsmodul",
"Your private key password no longer matches your log-in password." : "Das Passwort für Ihren privaten Schlüssel stimmt nicht mehr mit Ihrem Anmelde-Passwort überein.",
"Set your old private key password to your current log-in password:" : "Ihr altes Passwort für den privaten Schlüssel auf Ihr aktuelles Anmeldepasswort setzen:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Wenn Sie sich nicht mehr an Ihr altes Passwort erinnern, können Sie Ihre Administration bitten, Ihre Dateien wiederherzustellen.",
"Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Anmeldepasswort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
diff --git a/apps/encryption/l10n/el.js b/apps/encryption/l10n/el.js
index 67077f31899..6b555d16261 100644
--- a/apps/encryption/l10n/el.js
+++ b/apps/encryption/l10n/el.js
@@ -32,17 +32,11 @@ OC.L10N.register(
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Δεν ήταν δυνατό να διαβαστεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλούμε ζητήστε από τον κάτοχο του αρχείου να το ξαναμοιραστεί μαζί σας.",
"Default encryption module" : "Προεπιλεγμένη μονάδα κρυπτογράφησης",
"Default encryption module for server-side encryption" : "Προεπιλεγμένο πρόσθετο κρυπτασφάλισης για τον διακομιστή",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Για την χρήση του πρόσθετου κρυπτογράφησης πρέπει να το ενεργοποιήσετε από τον διακομιστή \n\t\tτην κρυπτογράφηση στις ρυθμίσεις διαχείρισης. Μόλις ενεργοποιηθεί το ρπόσθετο θα κρυπτογραφήσει\n\t\tόλα τα αρχεία σας χωρίς εξέρεση. Η κρυπρογράφηση βασίζεται σε κλειδιά AES 256.\n\t\tTο πρόσθετο θα κρυπτογραφεί μόνο νέα αρχεία\n\t\tμετά την ενεγοποίηση απο τον διακομιστή. Επίσης δεν είναι δυνατό να\n\t\tαπενεργοποιηθεί η κρυπτογράφηση και να λειτουργήσει ξανά με το προηγούμενο σύστημα.\n\t\tΠαρακαλώ διαβάστε την τεκμηρίωση πρίν αποφασίσετε\n\t\tτην ενεργοποίηση κρυπτογράφησης του διακομιστή σας.",
- "Hey there,\n\nThe administration 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" : "Χαίρετε,\n\nΟ διαχειριστής ενεργοποίησε την κρυπτογράφηση στο διακομιστή. Τα αρχεία σας κρυπτογραφήθηκαν με τον κωδικό '%s'.\n\nΠαρακαλούμε συνδεθείτε στην εφαρμογή ιστού, πηγαίνετε στην ενότητα \"Βασική μονάδα κρυπτογράφησης\" στις προσωπικές σας ρυθμίσεις και ενημερώστε τον κωδικό κρυπτογράφησης εισάγοντας αυτό τον κωδικό στο πεδίο \"Παλιός κωδικός σύνδεσης\" και τον τωρινό σας κωδικό σύνδεσης.\n",
- "The share will expire on %s." : "Ο διαμοιρασμός θα λήξει σε %s.",
- "Cheers!" : "Χαιρετισμούς!",
- "Hey there,<br><br>The administration 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>" : "Χαίρετε,<br><br>Ο διαχειριστής ενεργοποίησε την κρυπτογράφηση στο διακομιστή. Τα αρχεία σας κρυπτογραφήθηκαν με τον κωδικό <strong>%s</strong>.<br><br>Παρακαλούμε συνδεθείτε στην εφαρμογή ιστού, πηγαίνετε στην ενότητα ¨\"Βασική μονάδα κρυπτογράφησης\" των προσωπικών σας ρυθμίσεων και ενημερώστε τον κωδικό κρυπτογράφησης εισάγοντας αυτό τον κωδικό στο πεδίο \"Παλιός κωδικός σύνδεσης\" και τον τωρινό σας κωδικό σύνδεσης.",
"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 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." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται για να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν αυτός/αυτή ξεχάσει τον κωδικό πρόσβασης.",
"Recovery key password" : "Επαναφορά κωδικού κλειδιού",
"Repeat recovery key password" : "Επαναλάβετε τον κωδικό του κλειδιού ανάκτησης",
"Change recovery key password:" : "Αλλαγή κλειδιού επαναφοράς κωδικού:",
@@ -53,7 +47,6 @@ OC.L10N.register(
"Basic encryption module" : "Βασική μονάδα κρυπτογράφησης",
"Your private key password no longer matches your log-in password." : "Ο κωδικός του ιδιωτικού κλειδιού σας δεν ταιριάζει πλέον με τον κωδικό σύνδεσής σας.",
"Set your old private key password to your current log-in password:" : "Ορίστε τον παλιό σας κωδικό ιδιωτικού κλειδιού στον τρέχοντα κωδικό σύνδεσης.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Εάν δεν θυμάστε τον παλιό σας κωδικό μπορείτε να ζητήσετε από τον διαχειριστή σας να επανακτήσει τα αρχεία σας.",
"Old log-in password" : "Παλαιό συνθηματικό εισόδου",
"Current log-in password" : "Τρέχον συνθηματικό πρόσβασης",
"Update Private Key Password" : "Ενημέρωση Προσωπικού Κλειδού Πρόσβασης",
diff --git a/apps/encryption/l10n/el.json b/apps/encryption/l10n/el.json
index 4b69ee5763c..bcf3189a2f7 100644
--- a/apps/encryption/l10n/el.json
+++ b/apps/encryption/l10n/el.json
@@ -30,17 +30,11 @@
"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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Για την χρήση του πρόσθετου κρυπτογράφησης πρέπει να το ενεργοποιήσετε από τον διακομιστή \n\t\tτην κρυπτογράφηση στις ρυθμίσεις διαχείρισης. Μόλις ενεργοποιηθεί το ρπόσθετο θα κρυπτογραφήσει\n\t\tόλα τα αρχεία σας χωρίς εξέρεση. Η κρυπρογράφηση βασίζεται σε κλειδιά AES 256.\n\t\tTο πρόσθετο θα κρυπτογραφεί μόνο νέα αρχεία\n\t\tμετά την ενεγοποίηση απο τον διακομιστή. Επίσης δεν είναι δυνατό να\n\t\tαπενεργοποιηθεί η κρυπτογράφηση και να λειτουργήσει ξανά με το προηγούμενο σύστημα.\n\t\tΠαρακαλώ διαβάστε την τεκμηρίωση πρίν αποφασίσετε\n\t\tτην ενεργοποίηση κρυπτογράφησης του διακομιστή σας.",
- "Hey there,\n\nThe administration 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" : "Χαίρετε,\n\nΟ διαχειριστής ενεργοποίησε την κρυπτογράφηση στο διακομιστή. Τα αρχεία σας κρυπτογραφήθηκαν με τον κωδικό '%s'.\n\nΠαρακαλούμε συνδεθείτε στην εφαρμογή ιστού, πηγαίνετε στην ενότητα \"Βασική μονάδα κρυπτογράφησης\" στις προσωπικές σας ρυθμίσεις και ενημερώστε τον κωδικό κρυπτογράφησης εισάγοντας αυτό τον κωδικό στο πεδίο \"Παλιός κωδικός σύνδεσης\" και τον τωρινό σας κωδικό σύνδεσης.\n",
- "The share will expire on %s." : "Ο διαμοιρασμός θα λήξει σε %s.",
- "Cheers!" : "Χαιρετισμούς!",
- "Hey there,<br><br>The administration 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>" : "Χαίρετε,<br><br>Ο διαχειριστής ενεργοποίησε την κρυπτογράφηση στο διακομιστή. Τα αρχεία σας κρυπτογραφήθηκαν με τον κωδικό <strong>%s</strong>.<br><br>Παρακαλούμε συνδεθείτε στην εφαρμογή ιστού, πηγαίνετε στην ενότητα ¨\"Βασική μονάδα κρυπτογράφησης\" των προσωπικών σας ρυθμίσεων και ενημερώστε τον κωδικό κρυπτογράφησης εισάγοντας αυτό τον κωδικό στο πεδίο \"Παλιός κωδικός σύνδεσης\" και τον τωρινό σας κωδικό σύνδεσης.",
"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 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." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται για να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν αυτός/αυτή ξεχάσει τον κωδικό πρόσβασης.",
"Recovery key password" : "Επαναφορά κωδικού κλειδιού",
"Repeat recovery key password" : "Επαναλάβετε τον κωδικό του κλειδιού ανάκτησης",
"Change recovery key password:" : "Αλλαγή κλειδιού επαναφοράς κωδικού:",
@@ -51,7 +45,6 @@
"Basic encryption module" : "Βασική μονάδα κρυπτογράφησης",
"Your private key password no longer matches your log-in password." : "Ο κωδικός του ιδιωτικού κλειδιού σας δεν ταιριάζει πλέον με τον κωδικό σύνδεσής σας.",
"Set your old private key password to your current log-in password:" : "Ορίστε τον παλιό σας κωδικό ιδιωτικού κλειδιού στον τρέχοντα κωδικό σύνδεσης.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Εάν δεν θυμάστε τον παλιό σας κωδικό μπορείτε να ζητήσετε από τον διαχειριστή σας να επανακτήσει τα αρχεία σας.",
"Old log-in password" : "Παλαιό συνθηματικό εισόδου",
"Current log-in password" : "Τρέχον συνθηματικό πρόσβασης",
"Update Private Key Password" : "Ενημέρωση Προσωπικού Κλειδού Πρόσβασης",
diff --git a/apps/encryption/l10n/en_GB.js b/apps/encryption/l10n/en_GB.js
index 927de479957..8f3408f59e7 100644
--- a/apps/encryption/l10n/en_GB.js
+++ b/apps/encryption/l10n/en_GB.js
@@ -28,21 +28,21 @@ OC.L10N.register(
"Bad Signature" : "Bad Signature",
"Missing Signature" : "Missing Signature",
"one-time password for server-side-encryption" : "one-time password for server-side-encryption",
+ "Encryption password" : "Encryption password",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "The administration enabled server-side-encryption. Your files were encrypted using the password \"%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 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." : "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",
"Default encryption module for server-side encryption" : "Default encryption module for server-side encryption",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption.",
- "Hey there,\n\nThe administration 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" : "Hey there,\n\nThe administration 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",
- "The share will expire on %s." : "The share will expire on %s.",
- "Cheers!" : "Cheers!",
- "Hey there,<br><br>The administration 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>" : "Hey there,<br><br>The administration 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>",
+ "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." : "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.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption app is enabled but your keys are not initialised, please log-out and log-in again",
"Encrypt the home storage" : "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" : "Enable recovery key",
"Disable recovery key" : "Disable recovery key",
- "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.",
+ "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." : "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" : "Recovery key password",
"Repeat recovery key password" : "Repeat recovery key password",
"Change recovery key password:" : "Change recovery key password:",
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Basic encryption module",
"Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
"Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "If you do not remember your old password you can ask your administrator to recover your files.",
"Old log-in password" : "Old login password",
"Current log-in password" : "Current login password",
"Update Private Key Password" : "Update Private Key Password",
diff --git a/apps/encryption/l10n/en_GB.json b/apps/encryption/l10n/en_GB.json
index fef94ff3ba1..d66c1bb51ab 100644
--- a/apps/encryption/l10n/en_GB.json
+++ b/apps/encryption/l10n/en_GB.json
@@ -26,21 +26,21 @@
"Bad Signature" : "Bad Signature",
"Missing Signature" : "Missing Signature",
"one-time password for server-side-encryption" : "one-time password for server-side-encryption",
+ "Encryption password" : "Encryption password",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "The administration enabled server-side-encryption. Your files were encrypted using the password \"%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 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." : "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",
"Default encryption module for server-side encryption" : "Default encryption module for server-side encryption",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption.",
- "Hey there,\n\nThe administration 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" : "Hey there,\n\nThe administration 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",
- "The share will expire on %s." : "The share will expire on %s.",
- "Cheers!" : "Cheers!",
- "Hey there,<br><br>The administration 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>" : "Hey there,<br><br>The administration 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>",
+ "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." : "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.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption app is enabled but your keys are not initialised, please log-out and log-in again",
"Encrypt the home storage" : "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" : "Enable recovery key",
"Disable recovery key" : "Disable recovery key",
- "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.",
+ "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." : "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" : "Recovery key password",
"Repeat recovery key password" : "Repeat recovery key password",
"Change recovery key password:" : "Change recovery key password:",
@@ -51,7 +51,7 @@
"Basic encryption module" : "Basic encryption module",
"Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
"Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "If you do not remember your old password you can ask your administrator to recover your files.",
"Old log-in password" : "Old login password",
"Current log-in password" : "Current login password",
"Update Private Key Password" : "Update Private Key Password",
diff --git a/apps/encryption/l10n/eo.js b/apps/encryption/l10n/eo.js
index aebd761252c..36ecb37951b 100644
--- a/apps/encryption/l10n/eo.js
+++ b/apps/encryption/l10n/eo.js
@@ -30,15 +30,11 @@ OC.L10N.register(
"one-time password for server-side-encryption" : "unuuza pasvorto por ĉeservila ĉifrado",
"Default encryption module" : "Defaŭlta ĉifra modulo",
"Default encryption module for server-side encryption" : "Defaŭlta ĉifra modulo por ĉeservila ĉifrado",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Por uzi tiun ĉifran modulon, vi bezonas ŝalti ĉeservilan ĉifradon en la administraj agordoj. Tiu modulo ĉifros ĉiujn viajn dosierojn netrudiĝeme. La ĉifrado baziĝas sur AES-ŝlosiloj de 256 bitoj.\nLa modulo ne ĉifros ekzistantajn dosierojn, nur la venontajn, post kiam la ĉeservila ĉifrado estis ŝaltita. Ankaŭ ne eblas malŝalti la ĉifradon kaj reiri al neĉifrita sistemo.\nBv. legi la dokumentaron por scii ĉiujn konsekvencojn, antaŭ ol decidi, ĉu vi uzos ĉeservilan ĉifradon.",
- "The share will expire on %s." : "La kunhavo senvalidiĝos je %s.",
- "Cheers!" : "Ĝis!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Ĉifra aplikaĵo estas ŝaltita, sed viaj ŝlosiloj ne uziĝas. Bv. elsaluti kaj re-ensaluti.",
"Encrypt the home storage" : "Ĉifri la ĉefkonservejon",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ebligi tiun opcion ĉifras ĉiujn dosierojn de la ĉefkonservejo, alie nur dosieroj en ekstera konservejo ĉifriĝos.",
"Enable recovery key" : "Ŝalti restaŭroŝlosilon",
"Disable recovery key" : "Malŝalti restaŭroŝlosilon",
- "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.",
"Recovery key password" : "Pasvorto de restaŭroŝlosilo",
"Repeat recovery key password" : "Ripetu la pasvorton de restaŭroŝlosilo",
"Change recovery key password:" : "Ŝanĝi la pasvorton de la restaŭroŝlosilo:",
@@ -49,7 +45,6 @@ OC.L10N.register(
"Basic encryption module" : "Bazĉifrada modulo",
"Your private key password no longer matches your log-in password." : "La pasvorto de via privata ŝlosilo ne plu kongruas kun via ensaluta pasvorto.",
"Set your old private key password to your current log-in password:" : "Agordi la pasvorton de via antaŭa privata ŝlosilo al via nuna ensaluta pasvorto:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se vi ne memoras vian antaŭan pasvorton, vi povas peti al via administranto restaŭri viajn dosierojn.",
"Old log-in password" : "Malnova ensaluta pasvorto",
"Current log-in password" : "Nuna ensaluta pasvorto",
"Update Private Key Password" : "Ĝisdatigi la pasvorton de la malpublika ŝlosilo",
diff --git a/apps/encryption/l10n/eo.json b/apps/encryption/l10n/eo.json
index 054dc7e0f51..ee6bd31b4ab 100644
--- a/apps/encryption/l10n/eo.json
+++ b/apps/encryption/l10n/eo.json
@@ -28,15 +28,11 @@
"one-time password for server-side-encryption" : "unuuza pasvorto por ĉeservila ĉifrado",
"Default encryption module" : "Defaŭlta ĉifra modulo",
"Default encryption module for server-side encryption" : "Defaŭlta ĉifra modulo por ĉeservila ĉifrado",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Por uzi tiun ĉifran modulon, vi bezonas ŝalti ĉeservilan ĉifradon en la administraj agordoj. Tiu modulo ĉifros ĉiujn viajn dosierojn netrudiĝeme. La ĉifrado baziĝas sur AES-ŝlosiloj de 256 bitoj.\nLa modulo ne ĉifros ekzistantajn dosierojn, nur la venontajn, post kiam la ĉeservila ĉifrado estis ŝaltita. Ankaŭ ne eblas malŝalti la ĉifradon kaj reiri al neĉifrita sistemo.\nBv. legi la dokumentaron por scii ĉiujn konsekvencojn, antaŭ ol decidi, ĉu vi uzos ĉeservilan ĉifradon.",
- "The share will expire on %s." : "La kunhavo senvalidiĝos je %s.",
- "Cheers!" : "Ĝis!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Ĉifra aplikaĵo estas ŝaltita, sed viaj ŝlosiloj ne uziĝas. Bv. elsaluti kaj re-ensaluti.",
"Encrypt the home storage" : "Ĉifri la ĉefkonservejon",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ebligi tiun opcion ĉifras ĉiujn dosierojn de la ĉefkonservejo, alie nur dosieroj en ekstera konservejo ĉifriĝos.",
"Enable recovery key" : "Ŝalti restaŭroŝlosilon",
"Disable recovery key" : "Malŝalti restaŭroŝlosilon",
- "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.",
"Recovery key password" : "Pasvorto de restaŭroŝlosilo",
"Repeat recovery key password" : "Ripetu la pasvorton de restaŭroŝlosilo",
"Change recovery key password:" : "Ŝanĝi la pasvorton de la restaŭroŝlosilo:",
@@ -47,7 +43,6 @@
"Basic encryption module" : "Bazĉifrada modulo",
"Your private key password no longer matches your log-in password." : "La pasvorto de via privata ŝlosilo ne plu kongruas kun via ensaluta pasvorto.",
"Set your old private key password to your current log-in password:" : "Agordi la pasvorton de via antaŭa privata ŝlosilo al via nuna ensaluta pasvorto:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se vi ne memoras vian antaŭan pasvorton, vi povas peti al via administranto restaŭri viajn dosierojn.",
"Old log-in password" : "Malnova ensaluta pasvorto",
"Current log-in password" : "Nuna ensaluta pasvorto",
"Update Private Key Password" : "Ĝisdatigi la pasvorton de la malpublika ŝlosilo",
diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
index e422695af9d..114aa02968f 100644
--- a/apps/encryption/l10n/es.js
+++ b/apps/encryption/l10n/es.js
@@ -28,21 +28,21 @@ OC.L10N.register(
"Bad Signature" : "Firma errónea",
"Missing Signature" : "No se encuentra la firma",
"one-time password for server-side-encryption" : "Contraseña de un solo uso para el cifrado en el lado servidor",
+ "Encryption password" : "Contraseña de cifrado",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "La administración habilitó el cifrado del lado del servidor. Sus archivos fueron encriptados utilizando la contraseña <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "La administración habilitó el cifrado del lado del servidor. Sus archivos fueron encriptados utilizando la constraseña \"%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 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.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descifrar este archivo, probablemente se trate de un archivo compartido. Por favor, pida al propietario del archivo que vuelva a compartirlo con usted.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente se trate de un archivo compartido. Por favor, pida al propietario del archivo que vuelva a compartirlo con usted.",
"Default encryption module" : "Módulo de cifrado por defecto",
"Default encryption module for server-side encryption" : "Módulo de cifrado por defecto para el cifrado en el lado del servidor",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Para usar este módulo de cifrado necesitas activar\n\t\tel cifrado en el lado del servidor en la configuración de administrador. Una vez activado este módulo cifrará\n\t\ttodos tus archivos de forma transparente. El cifrado se basa en claves AES 256.\n\t\tEl módulo no tocará los archivos existentes, solo los archivos nuevos se cifrarán\n\t\tdespués de que se active el cifrado en el lado del servidor. Tampoco es posible\n\t\tdesactivar el cifrado y volver a un sistema sin cifrar.\n\t\tPor favor, lee la documentación para conocer todas las implicaciones antes de decidir\n\t\tactivar el cifrado en el lado del servidor.",
- "Hey there,\n\nThe administration 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" : "Hola,\n\nEl administrador habilitó el cifrado de datos del servidor. Tus archivos fueron cifrados con la contraseña \"%s\".\n\nPor favor, inicia sesión en la interfaz web, ve a la sección \"módulo de cifrado básico\" de tu área de ajustes personales y actualiza tu contraseña de cifrado introduciendo esta contraseña en el campo \"contraseña de inicio de sesión antigua\" y su contraseña de inicio de sesión actual.\n\n",
- "The share will expire on %s." : "El archivo dejará de ser compartido el %s.",
- "Cheers!" : "¡Saludos!",
- "Hey there,<br><br>The administration 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>" : "Hola,<br><br>El administrador ha activado el cifrado de datos del servidor. Tus archivos han sido cifrados usando la contraseña <strong>%s</strong>.<br><br>Por favor, inicia sesión desde la interfaz web, ve a la sección \"módulo de cifrado básico\" de tu área de ajustes personales y actualiza la contraseña de cifrado. Para ello, deberás introducir esta contraseña en el campo \"contraseña de acceso antigua\" y su contraseña de inicio de sesión actual.<br><br>",
+ "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 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.",
+ "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.",
"Recovery key password" : "Contraseña de clave de recuperación",
"Repeat recovery key password" : "Repita la contraseña de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de cifrado básico",
"Your private key password no longer matches your log-in password." : "Su contraseña de clave privada ya no coincide con su contraseña de acceso.",
"Set your old private key password to your current log-in password:" : "Establezca la contraseña de clave privada antigua para su contraseña de inicio de sesión actual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus archivos.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña, puede pedir a su administrador que recupere sus archivos.",
"Old log-in password" : "Contraseña de acceso antigua",
"Current log-in password" : "Contraseña de acceso actual",
"Update Private Key Password" : "Actualizar contraseña de clave privada",
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
index 167f0e9aa3c..9ec1c763bba 100644
--- a/apps/encryption/l10n/es.json
+++ b/apps/encryption/l10n/es.json
@@ -26,21 +26,21 @@
"Bad Signature" : "Firma errónea",
"Missing Signature" : "No se encuentra la firma",
"one-time password for server-side-encryption" : "Contraseña de un solo uso para el cifrado en el lado servidor",
+ "Encryption password" : "Contraseña de cifrado",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "La administración habilitó el cifrado del lado del servidor. Sus archivos fueron encriptados utilizando la contraseña <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "La administración habilitó el cifrado del lado del servidor. Sus archivos fueron encriptados utilizando la constraseña \"%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 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.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descifrar este archivo, probablemente se trate de un archivo compartido. Por favor, pida al propietario del archivo que vuelva a compartirlo con usted.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente se trate de un archivo compartido. Por favor, pida al propietario del archivo que vuelva a compartirlo con usted.",
"Default encryption module" : "Módulo de cifrado por defecto",
"Default encryption module for server-side encryption" : "Módulo de cifrado por defecto para el cifrado en el lado del servidor",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Para usar este módulo de cifrado necesitas activar\n\t\tel cifrado en el lado del servidor en la configuración de administrador. Una vez activado este módulo cifrará\n\t\ttodos tus archivos de forma transparente. El cifrado se basa en claves AES 256.\n\t\tEl módulo no tocará los archivos existentes, solo los archivos nuevos se cifrarán\n\t\tdespués de que se active el cifrado en el lado del servidor. Tampoco es posible\n\t\tdesactivar el cifrado y volver a un sistema sin cifrar.\n\t\tPor favor, lee la documentación para conocer todas las implicaciones antes de decidir\n\t\tactivar el cifrado en el lado del servidor.",
- "Hey there,\n\nThe administration 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" : "Hola,\n\nEl administrador habilitó el cifrado de datos del servidor. Tus archivos fueron cifrados con la contraseña \"%s\".\n\nPor favor, inicia sesión en la interfaz web, ve a la sección \"módulo de cifrado básico\" de tu área de ajustes personales y actualiza tu contraseña de cifrado introduciendo esta contraseña en el campo \"contraseña de inicio de sesión antigua\" y su contraseña de inicio de sesión actual.\n\n",
- "The share will expire on %s." : "El archivo dejará de ser compartido el %s.",
- "Cheers!" : "¡Saludos!",
- "Hey there,<br><br>The administration 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>" : "Hola,<br><br>El administrador ha activado el cifrado de datos del servidor. Tus archivos han sido cifrados usando la contraseña <strong>%s</strong>.<br><br>Por favor, inicia sesión desde la interfaz web, ve a la sección \"módulo de cifrado básico\" de tu área de ajustes personales y actualiza la contraseña de cifrado. Para ello, deberás introducir esta contraseña en el campo \"contraseña de acceso antigua\" y su contraseña de inicio de sesión actual.<br><br>",
+ "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 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.",
+ "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.",
"Recovery key password" : "Contraseña de clave de recuperación",
"Repeat recovery key password" : "Repita la contraseña de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
@@ -51,7 +51,7 @@
"Basic encryption module" : "Módulo de cifrado básico",
"Your private key password no longer matches your log-in password." : "Su contraseña de clave privada ya no coincide con su contraseña de acceso.",
"Set your old private key password to your current log-in password:" : "Establezca la contraseña de clave privada antigua para su contraseña de inicio de sesión actual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus archivos.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña, puede pedir a su administrador que recupere sus archivos.",
"Old log-in password" : "Contraseña de acceso antigua",
"Current log-in password" : "Contraseña de acceso actual",
"Update Private Key Password" : "Actualizar contraseña de clave privada",
diff --git a/apps/encryption/l10n/es_419.js b/apps/encryption/l10n/es_419.js
index 60e0b23b14f..fa5891cea44 100644
--- a/apps/encryption/l10n/es_419.js
+++ b/apps/encryption/l10n/es_419.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_419.json b/apps/encryption/l10n/es_419.json
index 2076394134a..d948e14e11e 100644
--- a/apps/encryption/l10n/es_419.json
+++ b/apps/encryption/l10n/es_419.json
@@ -27,14 +27,11 @@
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_AR.js b/apps/encryption/l10n/es_AR.js
index 4d9cf6d4244..c7284faff24 100644
--- a/apps/encryption/l10n/es_AR.js
+++ b/apps/encryption/l10n/es_AR.js
@@ -28,14 +28,11 @@ OC.L10N.register(
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero sus llaves no han sido inicializadas, favor de salir y volver a entrar a la sesion",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -46,7 +43,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Su contraseña de llave privada ya no corresónde con su contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establezca su contraseña de llave privada a su contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su contraseña anterior le puede pedir a su administrador que recupere sus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_AR.json b/apps/encryption/l10n/es_AR.json
index 611d6d3b0a1..3dbbaf32d30 100644
--- a/apps/encryption/l10n/es_AR.json
+++ b/apps/encryption/l10n/es_AR.json
@@ -26,14 +26,11 @@
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero sus llaves no han sido inicializadas, favor de salir y volver a entrar a la sesion",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -44,7 +41,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Su contraseña de llave privada ya no corresónde con su contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establezca su contraseña de llave privada a su contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su contraseña anterior le puede pedir a su administrador que recupere sus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_CL.js b/apps/encryption/l10n/es_CL.js
index 60e0b23b14f..fa5891cea44 100644
--- a/apps/encryption/l10n/es_CL.js
+++ b/apps/encryption/l10n/es_CL.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_CL.json b/apps/encryption/l10n/es_CL.json
index 2076394134a..d948e14e11e 100644
--- a/apps/encryption/l10n/es_CL.json
+++ b/apps/encryption/l10n/es_CL.json
@@ -27,14 +27,11 @@
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_CO.js b/apps/encryption/l10n/es_CO.js
index 60e0b23b14f..fa5891cea44 100644
--- a/apps/encryption/l10n/es_CO.js
+++ b/apps/encryption/l10n/es_CO.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_CO.json b/apps/encryption/l10n/es_CO.json
index 2076394134a..d948e14e11e 100644
--- a/apps/encryption/l10n/es_CO.json
+++ b/apps/encryption/l10n/es_CO.json
@@ -27,14 +27,11 @@
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_CR.js b/apps/encryption/l10n/es_CR.js
index 60e0b23b14f..fa5891cea44 100644
--- a/apps/encryption/l10n/es_CR.js
+++ b/apps/encryption/l10n/es_CR.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_CR.json b/apps/encryption/l10n/es_CR.json
index 2076394134a..d948e14e11e 100644
--- a/apps/encryption/l10n/es_CR.json
+++ b/apps/encryption/l10n/es_CR.json
@@ -27,14 +27,11 @@
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_DO.js b/apps/encryption/l10n/es_DO.js
index 60e0b23b14f..fa5891cea44 100644
--- a/apps/encryption/l10n/es_DO.js
+++ b/apps/encryption/l10n/es_DO.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_DO.json b/apps/encryption/l10n/es_DO.json
index 2076394134a..d948e14e11e 100644
--- a/apps/encryption/l10n/es_DO.json
+++ b/apps/encryption/l10n/es_DO.json
@@ -27,14 +27,11 @@
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_EC.js b/apps/encryption/l10n/es_EC.js
index 60e0b23b14f..79b263f05c5 100644
--- a/apps/encryption/l10n/es_EC.js
+++ b/apps/encryption/l10n/es_EC.js
@@ -28,15 +28,20 @@ OC.L10N.register(
"Bad Signature" : "Firma equivocada",
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
+ "Encryption password" : "Contraseña de cifrado",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "La administración habilitó el cifrado en el servidor. Sus archivos fueron cifrados usando la contraseña <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "La administración habilitó el cifrado en el servidor. Sus archivos fueron cifrados usando la contraseña \"%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, 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.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descifrar este archivo, probablemente es un archivo compartido. Por favor, pida al propietario del archivo que lo comparta de nuevo con usted.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente es un archivo compartido. Por favor, pida al propietario del archivo que lo comparta de nuevo con usted.",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
+ "Default encryption module for server-side encryption" : "Módulo de cifrado predeterminado para el cifrado en el 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 poder utilizar este módulo de cifrado, debe habilitar el cifrado en el servidor en la configuración del administrador. Una vez habilitado, este módulo cifrará todos sus archivos de forma transparente. El cifrado se basa en claves AES de 256 bits.\n El módulo no afectará a los archivos existentes, solo los nuevos archivos se cifrarán después de habilitar el cifrado en el servidor. Tampoco es posible desactivar el cifrado y volver a un sistema sin cifrar.\n Por favor, lea la documentación para conocer todas las implicaciones antes de decidir habilitar el cifrado en el servidor.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +52,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_EC.json b/apps/encryption/l10n/es_EC.json
index 2076394134a..d9b037fb088 100644
--- a/apps/encryption/l10n/es_EC.json
+++ b/apps/encryption/l10n/es_EC.json
@@ -26,15 +26,20 @@
"Bad Signature" : "Firma equivocada",
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
+ "Encryption password" : "Contraseña de cifrado",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "La administración habilitó el cifrado en el servidor. Sus archivos fueron cifrados usando la contraseña <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "La administración habilitó el cifrado en el servidor. Sus archivos fueron cifrados usando la contraseña \"%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, 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.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descifrar este archivo, probablemente es un archivo compartido. Por favor, pida al propietario del archivo que lo comparta de nuevo con usted.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente es un archivo compartido. Por favor, pida al propietario del archivo que lo comparta de nuevo con usted.",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
+ "Default encryption module for server-side encryption" : "Módulo de cifrado predeterminado para el cifrado en el 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 poder utilizar este módulo de cifrado, debe habilitar el cifrado en el servidor en la configuración del administrador. Una vez habilitado, este módulo cifrará todos sus archivos de forma transparente. El cifrado se basa en claves AES de 256 bits.\n El módulo no afectará a los archivos existentes, solo los nuevos archivos se cifrarán después de habilitar el cifrado en el servidor. Tampoco es posible desactivar el cifrado y volver a un sistema sin cifrar.\n Por favor, lea la documentación para conocer todas las implicaciones antes de decidir habilitar el cifrado en el servidor.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -45,7 +50,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_GT.js b/apps/encryption/l10n/es_GT.js
index 60e0b23b14f..fa5891cea44 100644
--- a/apps/encryption/l10n/es_GT.js
+++ b/apps/encryption/l10n/es_GT.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_GT.json b/apps/encryption/l10n/es_GT.json
index 2076394134a..d948e14e11e 100644
--- a/apps/encryption/l10n/es_GT.json
+++ b/apps/encryption/l10n/es_GT.json
@@ -27,14 +27,11 @@
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_HN.js b/apps/encryption/l10n/es_HN.js
index 60e0b23b14f..fa5891cea44 100644
--- a/apps/encryption/l10n/es_HN.js
+++ b/apps/encryption/l10n/es_HN.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_HN.json b/apps/encryption/l10n/es_HN.json
index 2076394134a..d948e14e11e 100644
--- a/apps/encryption/l10n/es_HN.json
+++ b/apps/encryption/l10n/es_HN.json
@@ -27,14 +27,11 @@
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_MX.js b/apps/encryption/l10n/es_MX.js
index bccd19ced51..c54e15075df 100644
--- a/apps/encryption/l10n/es_MX.js
+++ b/apps/encryption/l10n/es_MX.js
@@ -28,17 +28,14 @@ OC.L10N.register(
"Bad Signature" : "Firma equivocada",
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
+ "Encryption password" : "Contraseña de cifrado",
"Default encryption module" : "Módulo de encripción predeterminado",
"Default encryption module for server-side encryption" : "Modulo de encripción por defecto para encripción de lado del servidor",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Para poder usar este módulo de encripción necesitas habilitar la \n\t\tencripción del lado del servidor en las configuraciónes de administración. Una vez habilitado este modulo encriptará\n\t\ttodos tus archivos de forma transparente. La encripción se basa en llaves AES de 256.\n\t\tEl módulo no tocará archivos existentes, solo los nuevos archivos serán encriptados\n\t\tdespues de que la encripción del lado del servidor sea habilitada. Tampoco es posible \n\t\tdeshabilitar la encripción de nuevo y volver a un sistema no encriptado. \n\t\tPor favor lee la documentación para conocer todas las implicaciones antes de que\n\t\tdecidas habilitar la encripción del lado del servidor. ",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -49,7 +46,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_MX.json b/apps/encryption/l10n/es_MX.json
index f2ab671224f..b36dc2523e8 100644
--- a/apps/encryption/l10n/es_MX.json
+++ b/apps/encryption/l10n/es_MX.json
@@ -26,17 +26,14 @@
"Bad Signature" : "Firma equivocada",
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
+ "Encryption password" : "Contraseña de cifrado",
"Default encryption module" : "Módulo de encripción predeterminado",
"Default encryption module for server-side encryption" : "Modulo de encripción por defecto para encripción de lado del servidor",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Para poder usar este módulo de encripción necesitas habilitar la \n\t\tencripción del lado del servidor en las configuraciónes de administración. Una vez habilitado este modulo encriptará\n\t\ttodos tus archivos de forma transparente. La encripción se basa en llaves AES de 256.\n\t\tEl módulo no tocará archivos existentes, solo los nuevos archivos serán encriptados\n\t\tdespues de que la encripción del lado del servidor sea habilitada. Tampoco es posible \n\t\tdeshabilitar la encripción de nuevo y volver a un sistema no encriptado. \n\t\tPor favor lee la documentación para conocer todas las implicaciones antes de que\n\t\tdecidas habilitar la encripción del lado del servidor. ",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +44,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_NI.js b/apps/encryption/l10n/es_NI.js
index 60e0b23b14f..fa5891cea44 100644
--- a/apps/encryption/l10n/es_NI.js
+++ b/apps/encryption/l10n/es_NI.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_NI.json b/apps/encryption/l10n/es_NI.json
index 2076394134a..d948e14e11e 100644
--- a/apps/encryption/l10n/es_NI.json
+++ b/apps/encryption/l10n/es_NI.json
@@ -27,14 +27,11 @@
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PA.js b/apps/encryption/l10n/es_PA.js
index 60e0b23b14f..fa5891cea44 100644
--- a/apps/encryption/l10n/es_PA.js
+++ b/apps/encryption/l10n/es_PA.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PA.json b/apps/encryption/l10n/es_PA.json
index 2076394134a..d948e14e11e 100644
--- a/apps/encryption/l10n/es_PA.json
+++ b/apps/encryption/l10n/es_PA.json
@@ -27,14 +27,11 @@
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PE.js b/apps/encryption/l10n/es_PE.js
index 60e0b23b14f..fa5891cea44 100644
--- a/apps/encryption/l10n/es_PE.js
+++ b/apps/encryption/l10n/es_PE.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PE.json b/apps/encryption/l10n/es_PE.json
index 2076394134a..d948e14e11e 100644
--- a/apps/encryption/l10n/es_PE.json
+++ b/apps/encryption/l10n/es_PE.json
@@ -27,14 +27,11 @@
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PR.js b/apps/encryption/l10n/es_PR.js
index 60e0b23b14f..fa5891cea44 100644
--- a/apps/encryption/l10n/es_PR.js
+++ b/apps/encryption/l10n/es_PR.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PR.json b/apps/encryption/l10n/es_PR.json
index 2076394134a..d948e14e11e 100644
--- a/apps/encryption/l10n/es_PR.json
+++ b/apps/encryption/l10n/es_PR.json
@@ -27,14 +27,11 @@
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PY.js b/apps/encryption/l10n/es_PY.js
index 60e0b23b14f..fa5891cea44 100644
--- a/apps/encryption/l10n/es_PY.js
+++ b/apps/encryption/l10n/es_PY.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_PY.json b/apps/encryption/l10n/es_PY.json
index 2076394134a..d948e14e11e 100644
--- a/apps/encryption/l10n/es_PY.json
+++ b/apps/encryption/l10n/es_PY.json
@@ -27,14 +27,11 @@
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_SV.js b/apps/encryption/l10n/es_SV.js
index 60e0b23b14f..fa5891cea44 100644
--- a/apps/encryption/l10n/es_SV.js
+++ b/apps/encryption/l10n/es_SV.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_SV.json b/apps/encryption/l10n/es_SV.json
index 2076394134a..d948e14e11e 100644
--- a/apps/encryption/l10n/es_SV.json
+++ b/apps/encryption/l10n/es_SV.json
@@ -27,14 +27,11 @@
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_UY.js b/apps/encryption/l10n/es_UY.js
index 60e0b23b14f..fa5891cea44 100644
--- a/apps/encryption/l10n/es_UY.js
+++ b/apps/encryption/l10n/es_UY.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/es_UY.json b/apps/encryption/l10n/es_UY.json
index 2076394134a..d948e14e11e 100644
--- a/apps/encryption/l10n/es_UY.json
+++ b/apps/encryption/l10n/es_UY.json
@@ -27,14 +27,11 @@
"Missing Signature" : "Firma faltante",
"one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
"Default encryption module" : "Módulo de encripción predeterminado",
- "The share will expire on %s." : "El elemento compartido expirará el %s.",
- "Cheers!" : "¡Saludos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción esta habilitada pero tus llaves no han sido inicializadas, por favor sal y vuelve a entrar a tu sesión",
"Encrypt the home storage" : "Encriptar el almacenamiento de inicio",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Habilitar esta opción encripta todos los archivos almacenados en el almacenamiento principal, de otro modo, sólo los archivos en el almacenamiento externo serán encriptados",
"Enable recovery key" : "Habilitar llave de recuperación",
"Disable recovery key" : "Deshabilitar llave de recuperación",
- "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. ",
"Recovery key password" : "Contraseña de llave de recuperación",
"Repeat recovery key password" : "Repetir la contraseña de la llave de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la llave de recuperación:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "Módulo de encripción básica",
"Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
"Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
diff --git a/apps/encryption/l10n/et_EE.js b/apps/encryption/l10n/et_EE.js
index 93273a01464..70de2cc0c46 100644
--- a/apps/encryption/l10n/et_EE.js
+++ b/apps/encryption/l10n/et_EE.js
@@ -1,47 +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",
- "The share will expire on %s." : "Jagamine aegub %s.",
- "Cheers!" : "Terekest!",
+ "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 e25430bac35..bd7a9d32858 100644
--- a/apps/encryption/l10n/et_EE.json
+++ b/apps/encryption/l10n/et_EE.json
@@ -1,45 +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",
- "The share will expire on %s." : "Jagamine aegub %s.",
- "Cheers!" : "Terekest!",
+ "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 0fc85acf4b9..366077168f1 100644
--- a/apps/encryption/l10n/eu.js
+++ b/apps/encryption/l10n/eu.js
@@ -28,21 +28,21 @@ OC.L10N.register(
"Bad Signature" : "Sinadura ezegokia",
"Missing Signature" : "Sinadura falta da",
"one-time password for server-side-encryption" : "aldi bateko pasahitzak zerbitzari-aldeko zifratzerako",
+ "Encryption password" : "Zifratze-pasahitza",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Administrazioak zerbitzariaren aldeko zifratzea gaitu da. Zure fitxategiak zifratu dira pasahitza hau erabiliz <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Administrazioak zerbitzariaren aldeko zifratzea gaitu da. Zure fitxategiak zifratu dira pasahitza hau erabiliz \"%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." : "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.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ezin izan da fitxategi hau deszifratu, ziur aski partekatutako fitxategia izango da. Mesedez, fitxategiaren jabeari berriz partekatzeko eska iezaiozu.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ezin da fitxategi hau irakurri, ziur aski partekatutako fitxategia izango da. Mesedez, fitxategiaren jabeari berriz partekatzeko eska iezaiozu.",
"Default encryption module" : "Zifratze-modulu lehenetsia",
"Default encryption module for server-side encryption" : "Lehenetsitako zifratze modulua zerbitzari aldeko zifratzerako",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Zifratze modulu hau erabili ahal izateko zerbitzari mailako zifratzea gaitu behar duzu administratzailearen ezarpenetan.\n\nBehin aktibatuta modulu honek zure fitxategi guztiak modu gardenean zifratuko ditu. Zifratzea AES 256 gakoetan oinarritzen da.\n\nModuluak ez ditu aurretik dauden fitxategiak ukituko, soilik fitxategi berriak zifratuko dira zerbitzari mailako zifratzea ezari eta gero. \n\nEzin da zifratzea desgaitu eta zifratu gabeko sistema batera itzuli.\n\nIrakurri dokumentazioa zerbitzari mailako zifratzea hautatu aurretik honek zer dakarren jakiteko.",
- "Hey there,\n\nThe administration 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" : "Aupa,\n\nAdministrazioak zerbitzariaren aldeko enkriptatzea gaitu zuen. Zure fitxategiak \"1%s\" pasahitza erabiliz enkriptatu dira.\n\nMesedez, hasi saioa web-interfazean, joan zure ezarpen pertsonaletako \"Oinarrizko enkriptatze-modulua\" atalera eta eguneratu zure enkriptatze-pasahitza pasahitz hau \"Saio-hasteko pasahitz zaharra\" eremuan eta zure uneko saio-hasierako pasahitza sartuz.\n\n",
- "The share will expire on %s." : "Elkarbanaketa %s-n iraungiko da.",
- "Cheers!" : "Ongi izan!",
- "Hey there,<br><br>The administration 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>" : "Kaixo,<br><br>administrazioak zerbitzariaren aldeko enkriptatzea gaitu du. Zure fitxategiak <strong>%s</strong>.<br><br>pasahitza erabiliz enkriptatu dira. Mesedez, hasi saioa web interfazean, joan zure ezarpen pertsonaletako \"Oinarrizko enkriptatze-modulua\" atalera eta eguneratu zure enkriptatze-pasahitza pasahitz hau \"Saio-hasteko pasahitz zaharra\" eremuan eta zure uneko unean sartuz. saioa-pasahitza.<br><br>",
+ "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." : "Zifratze-modulu hau erabiltzeko, zerbitzariaren aldeko zifratzea gaitu behar duzu administratzailearen ezarpenetan. Gaituta dagoenean, modulu honek zure fitxategi guztiak garden zifratuko ditu. Zifratzea AES 256 gakoetan oinarritzen da.\nModuluak ez ditu lehendik dauden fitxategiak ukituko, zerbitzariaren aldeko zifratzea gaitu ondoren fitxategi berriak soilik zifratuko dira. Ezin da zifratzea berriro desgaitu eta zifratu gabeko sistema batera itzuli.\nIrakurri dokumentazioa ondorio guztiak ezagutzeko zerbitzariaren aldeko zifratzea gaitzea erabaki aurretik.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptatze aplikazioa gaituta dago, baina zure gakoak ez dira hasieratu, mesedez saioa itxi eta sar zaitez berriro",
"Encrypt the home storage" : "Zifratu etxe-biltegia",
"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 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.",
+ "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:",
@@ -53,7 +53,6 @@ OC.L10N.register(
"Basic encryption module" : "Oinarrizko zifratze-modulua",
"Your private key password no longer matches your log-in password." : "Zure gako pasahitza pribatua ez da dagoeneko bat etortzen zure sartzeko pasahitzarekin.",
"Set your old private key password to your current log-in password:" : "Ezarri zure gako pasahitz zaharra orain duzun sartzeko pasahitzan:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko.",
"Old log-in password" : "Sartzeko pasahitz zaharra",
"Current log-in password" : "Sartzeko oraingo pasahitza",
"Update Private Key Password" : "Eguneratu gako pasahitza pribatua",
diff --git a/apps/encryption/l10n/eu.json b/apps/encryption/l10n/eu.json
index ada3f3c2456..7cb7dca9b59 100644
--- a/apps/encryption/l10n/eu.json
+++ b/apps/encryption/l10n/eu.json
@@ -26,21 +26,21 @@
"Bad Signature" : "Sinadura ezegokia",
"Missing Signature" : "Sinadura falta da",
"one-time password for server-side-encryption" : "aldi bateko pasahitzak zerbitzari-aldeko zifratzerako",
+ "Encryption password" : "Zifratze-pasahitza",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Administrazioak zerbitzariaren aldeko zifratzea gaitu da. Zure fitxategiak zifratu dira pasahitza hau erabiliz <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Administrazioak zerbitzariaren aldeko zifratzea gaitu da. Zure fitxategiak zifratu dira pasahitza hau erabiliz \"%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." : "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.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ezin izan da fitxategi hau deszifratu, ziur aski partekatutako fitxategia izango da. Mesedez, fitxategiaren jabeari berriz partekatzeko eska iezaiozu.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ezin da fitxategi hau irakurri, ziur aski partekatutako fitxategia izango da. Mesedez, fitxategiaren jabeari berriz partekatzeko eska iezaiozu.",
"Default encryption module" : "Zifratze-modulu lehenetsia",
"Default encryption module for server-side encryption" : "Lehenetsitako zifratze modulua zerbitzari aldeko zifratzerako",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Zifratze modulu hau erabili ahal izateko zerbitzari mailako zifratzea gaitu behar duzu administratzailearen ezarpenetan.\n\nBehin aktibatuta modulu honek zure fitxategi guztiak modu gardenean zifratuko ditu. Zifratzea AES 256 gakoetan oinarritzen da.\n\nModuluak ez ditu aurretik dauden fitxategiak ukituko, soilik fitxategi berriak zifratuko dira zerbitzari mailako zifratzea ezari eta gero. \n\nEzin da zifratzea desgaitu eta zifratu gabeko sistema batera itzuli.\n\nIrakurri dokumentazioa zerbitzari mailako zifratzea hautatu aurretik honek zer dakarren jakiteko.",
- "Hey there,\n\nThe administration 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" : "Aupa,\n\nAdministrazioak zerbitzariaren aldeko enkriptatzea gaitu zuen. Zure fitxategiak \"1%s\" pasahitza erabiliz enkriptatu dira.\n\nMesedez, hasi saioa web-interfazean, joan zure ezarpen pertsonaletako \"Oinarrizko enkriptatze-modulua\" atalera eta eguneratu zure enkriptatze-pasahitza pasahitz hau \"Saio-hasteko pasahitz zaharra\" eremuan eta zure uneko saio-hasierako pasahitza sartuz.\n\n",
- "The share will expire on %s." : "Elkarbanaketa %s-n iraungiko da.",
- "Cheers!" : "Ongi izan!",
- "Hey there,<br><br>The administration 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>" : "Kaixo,<br><br>administrazioak zerbitzariaren aldeko enkriptatzea gaitu du. Zure fitxategiak <strong>%s</strong>.<br><br>pasahitza erabiliz enkriptatu dira. Mesedez, hasi saioa web interfazean, joan zure ezarpen pertsonaletako \"Oinarrizko enkriptatze-modulua\" atalera eta eguneratu zure enkriptatze-pasahitza pasahitz hau \"Saio-hasteko pasahitz zaharra\" eremuan eta zure uneko unean sartuz. saioa-pasahitza.<br><br>",
+ "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." : "Zifratze-modulu hau erabiltzeko, zerbitzariaren aldeko zifratzea gaitu behar duzu administratzailearen ezarpenetan. Gaituta dagoenean, modulu honek zure fitxategi guztiak garden zifratuko ditu. Zifratzea AES 256 gakoetan oinarritzen da.\nModuluak ez ditu lehendik dauden fitxategiak ukituko, zerbitzariaren aldeko zifratzea gaitu ondoren fitxategi berriak soilik zifratuko dira. Ezin da zifratzea berriro desgaitu eta zifratu gabeko sistema batera itzuli.\nIrakurri dokumentazioa ondorio guztiak ezagutzeko zerbitzariaren aldeko zifratzea gaitzea erabaki aurretik.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptatze aplikazioa gaituta dago, baina zure gakoak ez dira hasieratu, mesedez saioa itxi eta sar zaitez berriro",
"Encrypt the home storage" : "Zifratu etxe-biltegia",
"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 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.",
+ "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:",
@@ -51,7 +51,6 @@
"Basic encryption module" : "Oinarrizko zifratze-modulua",
"Your private key password no longer matches your log-in password." : "Zure gako pasahitza pribatua ez da dagoeneko bat etortzen zure sartzeko pasahitzarekin.",
"Set your old private key password to your current log-in password:" : "Ezarri zure gako pasahitz zaharra orain duzun sartzeko pasahitzan:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko.",
"Old log-in password" : "Sartzeko pasahitz zaharra",
"Current log-in password" : "Sartzeko oraingo pasahitza",
"Update Private Key Password" : "Eguneratu gako pasahitza pribatua",
diff --git a/apps/encryption/l10n/fa.js b/apps/encryption/l10n/fa.js
index dadebe7ace5..4bb30c0b93f 100644
--- a/apps/encryption/l10n/fa.js
+++ b/apps/encryption/l10n/fa.js
@@ -22,23 +22,26 @@ 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." : "برنامه رمزگذاری فعال شده است، اما کلیدهای شما اولیه نیستند. لطفاً دوباره به سیستم وارد شوید و وارد شوید.",
+ "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\"." : "The administration enabled server-side-encryption. Your files were encrypted using the password \"%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 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." : "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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "برای استفاده از این ماژول رمزگذاری باید سمت سرور را فعال کنید پس از فعال کردن ماژول رمزگذاری در تنظیمات مدیر، رمزگذاری می شود همه پرونده های شما با شفافیت رمزگذاری بر اساس کلید AES 256 است. ماژول پرونده های موجود را لمس نمی کند، فقط پرونده های جدید رمزگذاری می شوند پس از فعال کردن رمزگذاری سمت سرور ممکن نیست رمزنگاری را مجدد غیرفعال کنید و به یک سیستم رمز نشده بازگردید. قبل از انجام عملیات و فعال کردن رمزگذاری سمت سرور توضیحات را بخوانید.",
- "The share will expire on %s." : "اشتراک‌گذاری در %s منقضی خواهد شد.",
- "Cheers!" : "سلامتی!",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "برنامه رمزگذاری فعال شده است اما کلیدهای شما اولیه نیستند، لطفاً از سیستم خارج و دوباره وارد سیستم شوید.",
+ "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." : "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.",
+ "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 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." : "کلید بازیابی یک کلید رمزگذاری اضافی است که برای رمزگذاری پرونده ها استفاده می شود. اگر کاربر رمزعبور خود را فراموش کند ، امکان بازیابی پرونده های کاربر را فراهم می کند.",
"Recovery key password" : "رمزعبور کلید بازیابی",
"Repeat recovery key password" : "تکرار رمزعبور کلید بازیابی",
"Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
@@ -49,7 +52,6 @@ OC.L10N.register(
"Basic encryption module" : "ماژول رمزگذاری اولیه",
"Your private key password no longer matches your log-in password." : "رمز عبور محافظت شده شما با رمز عبور وارد شده مطابقت ندارد.",
"Set your old private key password to your current log-in password:" : "رمز عبور قبلی خود را بر روی رمز ورود فعلی تنظیم کنید.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "اگر رمزعبور قدیمی را فراموش کرده اید میتوانید از مدیر خود برای بازیابی فایل هایتان درخواست نمایید.",
"Old log-in password" : "رمزعبور قدیمی",
"Current log-in password" : "رمزعبور فعلی",
"Update Private Key Password" : "به روز رسانی رمزعبور کلید خصوصی",
diff --git a/apps/encryption/l10n/fa.json b/apps/encryption/l10n/fa.json
index b0afd9137e8..8e22154c859 100644
--- a/apps/encryption/l10n/fa.json
+++ b/apps/encryption/l10n/fa.json
@@ -20,23 +20,26 @@
"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." : "برنامه رمزگذاری فعال شده است، اما کلیدهای شما اولیه نیستند. لطفاً دوباره به سیستم وارد شوید و وارد شوید.",
+ "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\"." : "The administration enabled server-side-encryption. Your files were encrypted using the password \"%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 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." : "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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "برای استفاده از این ماژول رمزگذاری باید سمت سرور را فعال کنید پس از فعال کردن ماژول رمزگذاری در تنظیمات مدیر، رمزگذاری می شود همه پرونده های شما با شفافیت رمزگذاری بر اساس کلید AES 256 است. ماژول پرونده های موجود را لمس نمی کند، فقط پرونده های جدید رمزگذاری می شوند پس از فعال کردن رمزگذاری سمت سرور ممکن نیست رمزنگاری را مجدد غیرفعال کنید و به یک سیستم رمز نشده بازگردید. قبل از انجام عملیات و فعال کردن رمزگذاری سمت سرور توضیحات را بخوانید.",
- "The share will expire on %s." : "اشتراک‌گذاری در %s منقضی خواهد شد.",
- "Cheers!" : "سلامتی!",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "برنامه رمزگذاری فعال شده است اما کلیدهای شما اولیه نیستند، لطفاً از سیستم خارج و دوباره وارد سیستم شوید.",
+ "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." : "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.",
+ "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 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." : "کلید بازیابی یک کلید رمزگذاری اضافی است که برای رمزگذاری پرونده ها استفاده می شود. اگر کاربر رمزعبور خود را فراموش کند ، امکان بازیابی پرونده های کاربر را فراهم می کند.",
"Recovery key password" : "رمزعبور کلید بازیابی",
"Repeat recovery key password" : "تکرار رمزعبور کلید بازیابی",
"Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
@@ -47,7 +50,6 @@
"Basic encryption module" : "ماژول رمزگذاری اولیه",
"Your private key password no longer matches your log-in password." : "رمز عبور محافظت شده شما با رمز عبور وارد شده مطابقت ندارد.",
"Set your old private key password to your current log-in password:" : "رمز عبور قبلی خود را بر روی رمز ورود فعلی تنظیم کنید.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "اگر رمزعبور قدیمی را فراموش کرده اید میتوانید از مدیر خود برای بازیابی فایل هایتان درخواست نمایید.",
"Old log-in password" : "رمزعبور قدیمی",
"Current log-in password" : "رمزعبور فعلی",
"Update Private Key Password" : "به روز رسانی رمزعبور کلید خصوصی",
diff --git a/apps/encryption/l10n/fi.js b/apps/encryption/l10n/fi.js
index e467526e0c2..65eca4819a0 100644
--- a/apps/encryption/l10n/fi.js
+++ b/apps/encryption/l10n/fi.js
@@ -28,16 +28,14 @@ OC.L10N.register(
"Bad Signature" : "Virheellinen allekirjoitus",
"Missing Signature" : "Puuttuva allekirjoitus",
"one-time password for server-side-encryption" : "kertakäyttöinen salasana palvelinpään salausta varten",
+ "Encryption password" : "Salauksen salasana",
"Default encryption module" : "Oletus salausmoduuli",
"Default encryption module for server-side encryption" : "Oletusarvoinen salausmoduuli palvelimella tehtävään salaukseen",
- "The share will expire on %s." : "Jakaminen päättyy %s.",
- "Cheers!" : "Kiitos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on aktivoitu, mutta avaimia ei ole alustettu, kirjaudu uudelleen sisään",
"Encrypt the home storage" : "Salaa oma kotitila",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Tämän valinnan ollessa valittuna salataan kaikki päätallennustilaan tallennetut tiedostot. Muussa tapauksessa ainoastaan ulkoisessa tallennustilassa sijaitsevat tiedostot salataan.",
"Enable recovery key" : "Ota palautusavain käyttöön",
"Disable recovery key" : "Poista palautusavain käytöstä",
- "The recovery key is an extra encryption key that is used 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.",
"Recovery key password" : "Palautusavaimen salasana",
"Repeat recovery key password" : "Toista salausavaimen salasana",
"Change recovery key password:" : "Vaihda palautusavaimen salasana:",
@@ -48,7 +46,6 @@ OC.L10N.register(
"Basic encryption module" : "Perus salausmoduuli",
"Your private key password no longer matches your log-in password." : "Salaisen avaimesi salasana ei enää vastaa kirjautumissalasanaasi.",
"Set your old private key password to your current log-in password:" : "Aseta yksityisen avaimen vanha salasana vastaamaan nykyistä kirjautumissalasanaasi:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
"Old log-in password" : "Vanha kirjautumissalasana",
"Current log-in password" : "Nykyinen kirjautumissalasana",
"Update Private Key Password" : "Päivitä yksityisen avaimen salasana",
diff --git a/apps/encryption/l10n/fi.json b/apps/encryption/l10n/fi.json
index 045ab5d8bd5..cad9ed01b1b 100644
--- a/apps/encryption/l10n/fi.json
+++ b/apps/encryption/l10n/fi.json
@@ -26,16 +26,14 @@
"Bad Signature" : "Virheellinen allekirjoitus",
"Missing Signature" : "Puuttuva allekirjoitus",
"one-time password for server-side-encryption" : "kertakäyttöinen salasana palvelinpään salausta varten",
+ "Encryption password" : "Salauksen salasana",
"Default encryption module" : "Oletus salausmoduuli",
"Default encryption module for server-side encryption" : "Oletusarvoinen salausmoduuli palvelimella tehtävään salaukseen",
- "The share will expire on %s." : "Jakaminen päättyy %s.",
- "Cheers!" : "Kiitos!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on aktivoitu, mutta avaimia ei ole alustettu, kirjaudu uudelleen sisään",
"Encrypt the home storage" : "Salaa oma kotitila",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Tämän valinnan ollessa valittuna salataan kaikki päätallennustilaan tallennetut tiedostot. Muussa tapauksessa ainoastaan ulkoisessa tallennustilassa sijaitsevat tiedostot salataan.",
"Enable recovery key" : "Ota palautusavain käyttöön",
"Disable recovery key" : "Poista palautusavain käytöstä",
- "The recovery key is an extra encryption key that is used 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.",
"Recovery key password" : "Palautusavaimen salasana",
"Repeat recovery key password" : "Toista salausavaimen salasana",
"Change recovery key password:" : "Vaihda palautusavaimen salasana:",
@@ -46,7 +44,6 @@
"Basic encryption module" : "Perus salausmoduuli",
"Your private key password no longer matches your log-in password." : "Salaisen avaimesi salasana ei enää vastaa kirjautumissalasanaasi.",
"Set your old private key password to your current log-in password:" : "Aseta yksityisen avaimen vanha salasana vastaamaan nykyistä kirjautumissalasanaasi:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
"Old log-in password" : "Vanha kirjautumissalasana",
"Current log-in password" : "Nykyinen kirjautumissalasana",
"Update Private Key Password" : "Päivitä yksityisen avaimen salasana",
diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js
index 875bf63b29b..f24147117cf 100644
--- a/apps/encryption/l10n/fr.js
+++ b/apps/encryption/l10n/fr.js
@@ -1,13 +1,13 @@
OC.L10N.register(
"encryption",
{
- "Missing recovery key password" : "Mot de passe de la clef de récupération manquant",
- "Please repeat the recovery key password" : "Répétez le mot de passe de la clef de récupération",
- "Repeated recovery key password does not match the provided recovery key password" : "Le mot de passe de la clef de récupération et sa répétition ne sont pas identiques.",
- "Recovery key successfully enabled" : "Clef de récupération activée avec succès",
- "Could not enable recovery key. Please check your recovery key password!" : "Impossible d'activer la clef de récupération. Veuillez vérifier le mot de passe de votre clé de récupération !",
- "Recovery key successfully disabled" : "Clef de récupération désactivée avec succès",
- "Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clef de récupération. Veuillez vérifier le mot de passe de votre clef de récupération !",
+ "Missing recovery key password" : "Mot de passe de la clé de récupération manquant",
+ "Please repeat the recovery key password" : "Répétez le mot de passe de la clé de récupération",
+ "Repeated recovery key password does not match the provided recovery key password" : "Le mot de passe de la clé de récupération et sa répétition ne sont pas identiques.",
+ "Recovery key successfully enabled" : "Clé de récupération activée avec succès",
+ "Could not enable recovery key. Please check your recovery key password!" : "Impossible d'activer la clé de récupération. Veuillez vérifier le mot de passe de votre clé de récupération !",
+ "Recovery key successfully disabled" : "Clé de récupération désactivée avec succès",
+ "Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clé de récupération. Veuillez vérifier le mot de passe de votre clé de récupération !",
"Missing parameters" : "Paramètres manquants",
"Please provide the old recovery password" : "Veuillez entrer l'ancien mot de passe de récupération",
"Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération",
@@ -15,12 +15,12 @@ OC.L10N.register(
"Password successfully changed." : "Mot de passe modifié avec succès.",
"Could not change the password. Maybe the old password was not correct." : "Erreur lors du changement de mot de passe. L'ancien mot de passe est peut-être incorrect.",
"Recovery Key disabled" : "Clé de récupération désactivée",
- "Recovery Key enabled" : "Clef de récupération activée",
- "Could not enable the recovery key, please try again or contact your administrator" : "Impossible d'activer la clef de récupération. Veuillez essayer à nouveau ou contacter votre administrateur",
- "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clef privée.",
+ "Recovery Key enabled" : "Clé de récupération activée",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Impossible d'activer la clé de récupération. Veuillez essayer à nouveau ou contacter votre administrateur",
+ "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clé privée.",
"The old password was not correct, please try again." : "L'ancien mot de passe est incorrect. Veuillez réessayer.",
"The current log-in password was not correct, please try again." : "Le mot de passe de connexion actuel n'est pas correct, veuillez réessayer.",
- "Private key password successfully updated." : "Mot de passe de la clef privée mis à jour avec succès.",
+ "Private key password successfully updated." : "Mot de passe de la clé privée mis à jour avec succès.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clé privée invalide pour l'application de chiffrement. Veuillez mettre à jour le mot de passe de la clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
"Please enable server side encryption in the admin settings in order to use the encryption module." : "Veuillez activer le chiffrement côté serveur dans les paramètres d'administration pour utiliser le module de chiffrement.",
@@ -28,35 +28,35 @@ OC.L10N.register(
"Bad Signature" : "Mauvaise signature",
"Missing Signature" : "Signature manquante",
"one-time password for server-side-encryption" : "Mot de passe à usage unique pour le chiffrement côté serveur",
- "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de décrypter ce fichier, ceci est probablement un fichier partagé. Merci de demander à son propriétaire de repartager le fichier avec vous.",
+ "Encryption password" : "Mot de passe de chiffrement",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "L'administration a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés en utilisant le mot de passe <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "L'administration a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés en utilisant le mot de passe \"%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." : "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.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier, ceci est probablement un fichier partagé. Merci de demander à son propriétaire de repartager le fichier avec vous.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, ceci est probablement un fichier partagé. Merci de demander à son propriétaire de repartager le fichier avec vous.",
"Default encryption module" : "Module de chiffrement par défaut",
"Default encryption module for server-side encryption" : "Module de chiffrement par défaut pour le chiffrement côté serveur",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Pour utiliser ce module de chiffrement, vous devez activer le chiffrement côté serveur dans les paramètres d'administration. Une fois activé, ce module chiffrera tous vos fichiers de manière transparente. Le chiffrement est basé sur des clés AES 256 bits.\nLe module ne touchera pas les fichiers existants, seuls les nouveaux fichiers seront chiffrés. Une fois le chiffrement côté serveur activé, il n'est pas possible de désactiver le chiffrement et de revenir à un système non chiffré.\n\t\tVeuillez lire la documentation pour connaître toutes les implications avant de vous décider à activer le chiffrement côté serveur.",
- "Hey there,\n\nThe administration 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" : "Bonjour,\n\nL'administration a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe \"%s\".\n\nVeuillez vous connecter à l'interface web, vous rendre à la section \"Module de chiffrement de base\" de vos paramètres personnels et mettre à jour votre mot de passe de chiffrement en insérant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" ainsi que votre mot de passe actuel.\n\n",
- "The share will expire on %s." : "Le partage expirera le %s.",
- "Cheers!" : "À bientôt !",
- "Hey there,<br><br>The administration 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>" : "Hé là, <br><br>L'administration a activé le chiffrement côté serveur. Vos fichiers ont été cryptés avec le mot de passe <strong>%s</strong>.<br><br>Veuillez-vous connecter à l'interface Web, vous rendre à la section \"Module de chiffrement de base\" de vos paramètres personnels et mettre à jour votre mot de passe en entrant celui fournit ci-dessus dans le champ \"Ancien mot de passe de connexion\", ainsi que votre mot de passe actuel.<br><br>",
+ "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." : "Pour utiliser ce module de chiffrement, vous devez activer le chiffrement côté serveur dans les paramètres d'administration. Une fois activé, ce module chiffrera tous vos fichiers de manière transparente. Le chiffrement est basé sur des clés AES 256 bits.\nLe module ne touchera pas les fichiers existants, seuls les nouveaux fichiers seront chiffrés après activation du chiffrement côté serveur. Une fois le chiffrement côté serveur activé, il est impossible de désactiver le chiffrement et de revenir à un système non chiffré.\nVeuillez lire la documentation pour connaître toutes les implications avant de décider d'activer le chiffrement côté serveur.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
"Encrypt the home storage" : "Chiffrer l'espace de stockage principal",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "L'activation de cette option chiffre tous les fichiers du stockage principal, sinon seuls les espaces de stockage externes seront chiffrés",
"Enable recovery key" : "Activer la clé de récupération",
"Disable recovery key" : "Désactiver la clé de récupération",
- "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.",
- "Recovery key password" : "Mot de passe de la clef de récupération",
+ "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 clé de récupération est une clé de chiffrement supplémentaire utilisée pour chiffrer les fichiers. Elle est utilisée pour récupérer les fichiers d'un compte si le mot de passe a été oublié.",
+ "Recovery key password" : "Mot de passe de la clé de récupération",
"Repeat recovery key password" : "Répétez le mot de passe de la clé de récupération",
- "Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :",
+ "Change recovery key password:" : "Modifier le mot de passe de la clé de récupération :",
"Old recovery key password" : "Ancien mot de passe de la clé de récupération",
"New recovery key password" : "Nouveau mot de passe de la clé de récupération",
"Repeat new recovery key password" : "Répétez le nouveau mot de passe de la clé de récupération",
"Change Password" : "Changer de mot de passe",
"Basic encryption module" : "Module de chiffrement basique",
- "Your private key password no longer matches your log-in password." : "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion.",
+ "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 clef privée",
+ "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é",
diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json
index afa52e0c91f..99936241dd5 100644
--- a/apps/encryption/l10n/fr.json
+++ b/apps/encryption/l10n/fr.json
@@ -1,11 +1,11 @@
{ "translations": {
- "Missing recovery key password" : "Mot de passe de la clef de récupération manquant",
- "Please repeat the recovery key password" : "Répétez le mot de passe de la clef de récupération",
- "Repeated recovery key password does not match the provided recovery key password" : "Le mot de passe de la clef de récupération et sa répétition ne sont pas identiques.",
- "Recovery key successfully enabled" : "Clef de récupération activée avec succès",
- "Could not enable recovery key. Please check your recovery key password!" : "Impossible d'activer la clef de récupération. Veuillez vérifier le mot de passe de votre clé de récupération !",
- "Recovery key successfully disabled" : "Clef de récupération désactivée avec succès",
- "Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clef de récupération. Veuillez vérifier le mot de passe de votre clef de récupération !",
+ "Missing recovery key password" : "Mot de passe de la clé de récupération manquant",
+ "Please repeat the recovery key password" : "Répétez le mot de passe de la clé de récupération",
+ "Repeated recovery key password does not match the provided recovery key password" : "Le mot de passe de la clé de récupération et sa répétition ne sont pas identiques.",
+ "Recovery key successfully enabled" : "Clé de récupération activée avec succès",
+ "Could not enable recovery key. Please check your recovery key password!" : "Impossible d'activer la clé de récupération. Veuillez vérifier le mot de passe de votre clé de récupération !",
+ "Recovery key successfully disabled" : "Clé de récupération désactivée avec succès",
+ "Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clé de récupération. Veuillez vérifier le mot de passe de votre clé de récupération !",
"Missing parameters" : "Paramètres manquants",
"Please provide the old recovery password" : "Veuillez entrer l'ancien mot de passe de récupération",
"Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération",
@@ -13,12 +13,12 @@
"Password successfully changed." : "Mot de passe modifié avec succès.",
"Could not change the password. Maybe the old password was not correct." : "Erreur lors du changement de mot de passe. L'ancien mot de passe est peut-être incorrect.",
"Recovery Key disabled" : "Clé de récupération désactivée",
- "Recovery Key enabled" : "Clef de récupération activée",
- "Could not enable the recovery key, please try again or contact your administrator" : "Impossible d'activer la clef de récupération. Veuillez essayer à nouveau ou contacter votre administrateur",
- "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clef privée.",
+ "Recovery Key enabled" : "Clé de récupération activée",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Impossible d'activer la clé de récupération. Veuillez essayer à nouveau ou contacter votre administrateur",
+ "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clé privée.",
"The old password was not correct, please try again." : "L'ancien mot de passe est incorrect. Veuillez réessayer.",
"The current log-in password was not correct, please try again." : "Le mot de passe de connexion actuel n'est pas correct, veuillez réessayer.",
- "Private key password successfully updated." : "Mot de passe de la clef privée mis à jour avec succès.",
+ "Private key password successfully updated." : "Mot de passe de la clé privée mis à jour avec succès.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clé privée invalide pour l'application de chiffrement. Veuillez mettre à jour le mot de passe de la clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
"Please enable server side encryption in the admin settings in order to use the encryption module." : "Veuillez activer le chiffrement côté serveur dans les paramètres d'administration pour utiliser le module de chiffrement.",
@@ -26,35 +26,35 @@
"Bad Signature" : "Mauvaise signature",
"Missing Signature" : "Signature manquante",
"one-time password for server-side-encryption" : "Mot de passe à usage unique pour le chiffrement côté serveur",
- "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de décrypter ce fichier, ceci est probablement un fichier partagé. Merci de demander à son propriétaire de repartager le fichier avec vous.",
+ "Encryption password" : "Mot de passe de chiffrement",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "L'administration a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés en utilisant le mot de passe <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "L'administration a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés en utilisant le mot de passe \"%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." : "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.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier, ceci est probablement un fichier partagé. Merci de demander à son propriétaire de repartager le fichier avec vous.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, ceci est probablement un fichier partagé. Merci de demander à son propriétaire de repartager le fichier avec vous.",
"Default encryption module" : "Module de chiffrement par défaut",
"Default encryption module for server-side encryption" : "Module de chiffrement par défaut pour le chiffrement côté serveur",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Pour utiliser ce module de chiffrement, vous devez activer le chiffrement côté serveur dans les paramètres d'administration. Une fois activé, ce module chiffrera tous vos fichiers de manière transparente. Le chiffrement est basé sur des clés AES 256 bits.\nLe module ne touchera pas les fichiers existants, seuls les nouveaux fichiers seront chiffrés. Une fois le chiffrement côté serveur activé, il n'est pas possible de désactiver le chiffrement et de revenir à un système non chiffré.\n\t\tVeuillez lire la documentation pour connaître toutes les implications avant de vous décider à activer le chiffrement côté serveur.",
- "Hey there,\n\nThe administration 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" : "Bonjour,\n\nL'administration a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe \"%s\".\n\nVeuillez vous connecter à l'interface web, vous rendre à la section \"Module de chiffrement de base\" de vos paramètres personnels et mettre à jour votre mot de passe de chiffrement en insérant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" ainsi que votre mot de passe actuel.\n\n",
- "The share will expire on %s." : "Le partage expirera le %s.",
- "Cheers!" : "À bientôt !",
- "Hey there,<br><br>The administration 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>" : "Hé là, <br><br>L'administration a activé le chiffrement côté serveur. Vos fichiers ont été cryptés avec le mot de passe <strong>%s</strong>.<br><br>Veuillez-vous connecter à l'interface Web, vous rendre à la section \"Module de chiffrement de base\" de vos paramètres personnels et mettre à jour votre mot de passe en entrant celui fournit ci-dessus dans le champ \"Ancien mot de passe de connexion\", ainsi que votre mot de passe actuel.<br><br>",
+ "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." : "Pour utiliser ce module de chiffrement, vous devez activer le chiffrement côté serveur dans les paramètres d'administration. Une fois activé, ce module chiffrera tous vos fichiers de manière transparente. Le chiffrement est basé sur des clés AES 256 bits.\nLe module ne touchera pas les fichiers existants, seuls les nouveaux fichiers seront chiffrés après activation du chiffrement côté serveur. Une fois le chiffrement côté serveur activé, il est impossible de désactiver le chiffrement et de revenir à un système non chiffré.\nVeuillez lire la documentation pour connaître toutes les implications avant de décider d'activer le chiffrement côté serveur.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
"Encrypt the home storage" : "Chiffrer l'espace de stockage principal",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "L'activation de cette option chiffre tous les fichiers du stockage principal, sinon seuls les espaces de stockage externes seront chiffrés",
"Enable recovery key" : "Activer la clé de récupération",
"Disable recovery key" : "Désactiver la clé de récupération",
- "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.",
- "Recovery key password" : "Mot de passe de la clef de récupération",
+ "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 clé de récupération est une clé de chiffrement supplémentaire utilisée pour chiffrer les fichiers. Elle est utilisée pour récupérer les fichiers d'un compte si le mot de passe a été oublié.",
+ "Recovery key password" : "Mot de passe de la clé de récupération",
"Repeat recovery key password" : "Répétez le mot de passe de la clé de récupération",
- "Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :",
+ "Change recovery key password:" : "Modifier le mot de passe de la clé de récupération :",
"Old recovery key password" : "Ancien mot de passe de la clé de récupération",
"New recovery key password" : "Nouveau mot de passe de la clé de récupération",
"Repeat new recovery key password" : "Répétez le nouveau mot de passe de la clé de récupération",
"Change Password" : "Changer de mot de passe",
"Basic encryption module" : "Module de chiffrement basique",
- "Your private key password no longer matches your log-in password." : "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion.",
+ "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 clef privée",
+ "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é",
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 f16b5154123..52b453360c0 100644
--- a/apps/encryption/l10n/gl.js
+++ b/apps/encryption/l10n/gl.js
@@ -1,58 +1,62 @@
OC.L10N.register(
"encryption",
{
- "Missing recovery key password" : "Falta o contrasinal da clave de recuperación",
- "Please repeat the recovery key password" : "Repita o contrasinal da clave de recuperación",
- "Repeated recovery key password does not match the provided recovery key password" : "A repetición do contrasinal da clave de recuperación non coincide co contrasinal da clave de recuperación fornecido",
- "Recovery key successfully enabled" : "A clave de recuperación foi activada satisfactoriamente ",
- "Could not enable recovery key. Please check your recovery key password!" : "Non foi posíbel activar a clave de recuperación. Comprobe o contrasinal da clave de recuperación!",
- "Recovery key successfully disabled" : "A clave de recuperación foi desactivada satisfactoriamente ",
- "Could not disable recovery key. Please check your recovery key password!" : "Non foi posíbel desactivar a clave de recuperación. Comprobe o contrasinal da clave de recuperación!",
+ "Missing recovery key password" : "Falta o contrasinal da chave de recuperación",
+ "Please repeat the recovery key password" : "Repita o contrasinal da chave de recuperación",
+ "Repeated recovery key password does not match the provided recovery key password" : "A repetición do contrasinal da chave de recuperación non coincide co contrasinal da chave de recuperación fornecido",
+ "Recovery key successfully enabled" : "A chave de recuperación foi activada satisfactoriamente ",
+ "Could not enable recovery key. Please check your recovery key password!" : "Non foi posíbel activar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
+ "Recovery key successfully disabled" : "A chave de recuperación foi desactivada satisfactoriamente ",
+ "Could not disable recovery key. Please check your recovery key password!" : "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
"Missing parameters" : "Faltan os parámetros",
"Please provide the old recovery password" : "Introduza o antigo contrasinal de recuperación",
"Please provide a new recovery password" : "Introduza o novo contrasinal de recuperación",
"Please repeat the new recovery password" : "Repita o novo contrasinal de recuperación",
"Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente",
"Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o correcto.",
- "Recovery Key disabled" : "Desactivada a clave de recuperación",
- "Recovery Key enabled" : "A clave de recuperación foi activada ",
- "Could not enable the recovery key, please try again or contact your administrator" : "Non foi posíbel activar a clave de recuperación, ténteo de novo ou póñase en contacto co administrador.",
- "Could not update the private key password." : "Non foi posíbel actualizar o contrasinal da clave privada.",
+ "Recovery Key disabled" : "Desactivada a chave de recuperación",
+ "Recovery Key enabled" : "A chave de recuperación foi activada ",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Non foi posíbel activar a chave de recuperación, ténteo de novo ou póñase en contacto coa administración desta instancia.",
+ "Could not update the private key password." : "Non foi posíbel actualizar o contrasinal da chave privada.",
"The old password was not correct, please try again." : "O contrasinal antigo non é correcto, ténteo de novo.",
"The current log-in password was not correct, please try again." : "O actual contrasinal de acceso non é correcto, ténteo de novo.",
- "Private key password successfully updated." : "A clave privada foi actualizada correctamente.",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "A clave privada para a aplicación de cifrado non é correcta. Actualice o contrasinal da súa clave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "A aplicación de cifrado está activada, mais non foron preparadas as lhaves. Saia da sesión e volva a acceder de novo",
+ "Private key password successfully updated." : "O contrasinal da chave privada foi actualizada correctamente.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "A chave privada para a aplicación de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "A aplicación de cifrado está activada, mais non foron preparadas as lhaves. Saia da sesión e volva acceder de novo",
"Please enable server side encryption in the admin settings in order to use the encryption module." : "Active o cifrado no lado do servidor nos axustes de administración para poder usar o módulo de cifrado.",
"Encryption app is enabled and ready" : " A aplicación de cifrado está activada e preparada",
"Bad Signature" : "Sinatura errónea",
"Missing Signature" : "Non se atopa a sinatura",
"one-time password for server-side-encryption" : "Contrasinal de só un uso para o cifrado no lado do servidor",
+ "Encryption password" : "Contrasinal de cifrado",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "A administración activou o cifrado no lado do servidor. Os seus ficheiros foron cifrados co contrasinal <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "A administración activou o cifrado no lado do servidor. Os seus ficheiros foron cifrados co contrasinal «%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." : "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.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel descifrar o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que volva compartir o ficheiro con Vde.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel ler o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que volva compartir o ficheiro con Vde.",
"Default encryption module" : "Módulo de cifrado predeterminado",
"Default encryption module for server-side encryption" : "Módulo de cifrado predeterminado para o cifrado no lado do servidor",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Para usar este módulo de cifrado é preciso activar o cifrado no lado\n\t\tdo servidor nos axustes de administración. Una vez activado este módulo cifrará\n\t\ttodos os seus ficheiros de xeito transparente. O cifrado basease en claves AES 256.\n\t\tO módulo non tocará os ficheiros existentes, só se cifran os ficheiros novos\n\t\tapós que se active o cifrado no lado do servidor. Tampouco é posíbel\n\t\tdesactivar o cifrado e volver a un sistema sen cifrar.\n\t\tLea a documentación para coñecer todas as implicacións antes de decidir\n\t\tactivar o cifrado no lado do servidor.",
- "The share will expire on %s." : "Este recurso compartido caduca o %s.",
- "Cheers!" : "Saúdos!",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as claves non foron preparadas, saia da sesión e volva a acceder de novo",
+ "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 cifrado é preciso activar o cifrado no lado do servidor nos axustes de administración. Una vez activado este módulo cifrará todos os seus ficheiros de xeito transparente. O cifrado basease en chave AES 256.\nO módulo non tocará os ficheiros existentes, só se cifran os ficheiros novos após que se active o cifrado no lado do servidor. Tampouco é posíbel desactivar o cifrado e volver a un sistema sen cifrar.\nLea a documentación para coñecer todas as implicacións antes de decidir activar o cifrado no lado do servidor.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as súas chaves non foron preparadas, saia da sesión e volva acceder de novo",
"Encrypt the home storage" : "Cifrar o almacenamento persoal",
"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 clave de recuperación",
- "Disable recovery key" : "Desactivar a clave de recuperación",
- "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 clave de recuperación é unha clave de cifrado adicional que se utiliza para cifrar ficheiros. Permite a recuperación de ficheiros dun usuario se o usuario esquece o seu contrasinal.",
- "Recovery key password" : "Contrasinal da clave de recuperación",
- "Repeat recovery key password" : "Repita o contrasinal da clave de recuperación",
- "Change recovery key password:" : "Cambiar o contrasinal da clave de la recuperación:",
- "Old recovery key password" : "Contrasinal antigo da clave de recuperación",
- "New recovery key password" : "Novo contrasinal da clave de recuperación",
- "Repeat new recovery key password" : "Repita o novo contrasinal da clave de recuperación",
+ "Enable recovery key" : "Activar a chave de recuperación",
+ "Disable recovery key" : "Desactivar a chave de recuperación",
+ "The recovery key is an 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:",
+ "Old recovery key password" : "Contrasinal antigo da chave de recuperación",
+ "New recovery key password" : "Novo contrasinal da chave de recuperación",
+ "Repeat new recovery key password" : "Repita o novo contrasinal da chave de recuperación",
"Change Password" : "Cambiar o contrasinal",
"Basic encryption module" : "Módulo de cifrado básico",
- "Your private key password no longer matches your log-in password." : "O seu contrasinal da clave 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 clave de recuperación ao seu contrasinal de acceso actual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu antigo contrasinal pode pedirllo ao seu administrador para recuperar os seus ficheiros.",
+ "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 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 clave privada",
+ "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",
diff --git a/apps/encryption/l10n/gl.json b/apps/encryption/l10n/gl.json
index 3e264b297f1..916b92af67a 100644
--- a/apps/encryption/l10n/gl.json
+++ b/apps/encryption/l10n/gl.json
@@ -1,56 +1,60 @@
{ "translations": {
- "Missing recovery key password" : "Falta o contrasinal da clave de recuperación",
- "Please repeat the recovery key password" : "Repita o contrasinal da clave de recuperación",
- "Repeated recovery key password does not match the provided recovery key password" : "A repetición do contrasinal da clave de recuperación non coincide co contrasinal da clave de recuperación fornecido",
- "Recovery key successfully enabled" : "A clave de recuperación foi activada satisfactoriamente ",
- "Could not enable recovery key. Please check your recovery key password!" : "Non foi posíbel activar a clave de recuperación. Comprobe o contrasinal da clave de recuperación!",
- "Recovery key successfully disabled" : "A clave de recuperación foi desactivada satisfactoriamente ",
- "Could not disable recovery key. Please check your recovery key password!" : "Non foi posíbel desactivar a clave de recuperación. Comprobe o contrasinal da clave de recuperación!",
+ "Missing recovery key password" : "Falta o contrasinal da chave de recuperación",
+ "Please repeat the recovery key password" : "Repita o contrasinal da chave de recuperación",
+ "Repeated recovery key password does not match the provided recovery key password" : "A repetición do contrasinal da chave de recuperación non coincide co contrasinal da chave de recuperación fornecido",
+ "Recovery key successfully enabled" : "A chave de recuperación foi activada satisfactoriamente ",
+ "Could not enable recovery key. Please check your recovery key password!" : "Non foi posíbel activar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
+ "Recovery key successfully disabled" : "A chave de recuperación foi desactivada satisfactoriamente ",
+ "Could not disable recovery key. Please check your recovery key password!" : "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
"Missing parameters" : "Faltan os parámetros",
"Please provide the old recovery password" : "Introduza o antigo contrasinal de recuperación",
"Please provide a new recovery password" : "Introduza o novo contrasinal de recuperación",
"Please repeat the new recovery password" : "Repita o novo contrasinal de recuperación",
"Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente",
"Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o correcto.",
- "Recovery Key disabled" : "Desactivada a clave de recuperación",
- "Recovery Key enabled" : "A clave de recuperación foi activada ",
- "Could not enable the recovery key, please try again or contact your administrator" : "Non foi posíbel activar a clave de recuperación, ténteo de novo ou póñase en contacto co administrador.",
- "Could not update the private key password." : "Non foi posíbel actualizar o contrasinal da clave privada.",
+ "Recovery Key disabled" : "Desactivada a chave de recuperación",
+ "Recovery Key enabled" : "A chave de recuperación foi activada ",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Non foi posíbel activar a chave de recuperación, ténteo de novo ou póñase en contacto coa administración desta instancia.",
+ "Could not update the private key password." : "Non foi posíbel actualizar o contrasinal da chave privada.",
"The old password was not correct, please try again." : "O contrasinal antigo non é correcto, ténteo de novo.",
"The current log-in password was not correct, please try again." : "O actual contrasinal de acceso non é correcto, ténteo de novo.",
- "Private key password successfully updated." : "A clave privada foi actualizada correctamente.",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "A clave privada para a aplicación de cifrado non é correcta. Actualice o contrasinal da súa clave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "A aplicación de cifrado está activada, mais non foron preparadas as lhaves. Saia da sesión e volva a acceder de novo",
+ "Private key password successfully updated." : "O contrasinal da chave privada foi actualizada correctamente.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "A chave privada para a aplicación de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "A aplicación de cifrado está activada, mais non foron preparadas as lhaves. Saia da sesión e volva acceder de novo",
"Please enable server side encryption in the admin settings in order to use the encryption module." : "Active o cifrado no lado do servidor nos axustes de administración para poder usar o módulo de cifrado.",
"Encryption app is enabled and ready" : " A aplicación de cifrado está activada e preparada",
"Bad Signature" : "Sinatura errónea",
"Missing Signature" : "Non se atopa a sinatura",
"one-time password for server-side-encryption" : "Contrasinal de só un uso para o cifrado no lado do servidor",
+ "Encryption password" : "Contrasinal de cifrado",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "A administración activou o cifrado no lado do servidor. Os seus ficheiros foron cifrados co contrasinal <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "A administración activou o cifrado no lado do servidor. Os seus ficheiros foron cifrados co contrasinal «%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." : "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.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel descifrar o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que volva compartir o ficheiro con Vde.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel ler o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que volva compartir o ficheiro con Vde.",
"Default encryption module" : "Módulo de cifrado predeterminado",
"Default encryption module for server-side encryption" : "Módulo de cifrado predeterminado para o cifrado no lado do servidor",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Para usar este módulo de cifrado é preciso activar o cifrado no lado\n\t\tdo servidor nos axustes de administración. Una vez activado este módulo cifrará\n\t\ttodos os seus ficheiros de xeito transparente. O cifrado basease en claves AES 256.\n\t\tO módulo non tocará os ficheiros existentes, só se cifran os ficheiros novos\n\t\tapós que se active o cifrado no lado do servidor. Tampouco é posíbel\n\t\tdesactivar o cifrado e volver a un sistema sen cifrar.\n\t\tLea a documentación para coñecer todas as implicacións antes de decidir\n\t\tactivar o cifrado no lado do servidor.",
- "The share will expire on %s." : "Este recurso compartido caduca o %s.",
- "Cheers!" : "Saúdos!",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as claves non foron preparadas, saia da sesión e volva a acceder de novo",
+ "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 cifrado é preciso activar o cifrado no lado do servidor nos axustes de administración. Una vez activado este módulo cifrará todos os seus ficheiros de xeito transparente. O cifrado basease en chave AES 256.\nO módulo non tocará os ficheiros existentes, só se cifran os ficheiros novos após que se active o cifrado no lado do servidor. Tampouco é posíbel desactivar o cifrado e volver a un sistema sen cifrar.\nLea a documentación para coñecer todas as implicacións antes de decidir activar o cifrado no lado do servidor.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as súas chaves non foron preparadas, saia da sesión e volva acceder de novo",
"Encrypt the home storage" : "Cifrar o almacenamento persoal",
"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 clave de recuperación",
- "Disable recovery key" : "Desactivar a clave de recuperación",
- "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 clave de recuperación é unha clave de cifrado adicional que se utiliza para cifrar ficheiros. Permite a recuperación de ficheiros dun usuario se o usuario esquece o seu contrasinal.",
- "Recovery key password" : "Contrasinal da clave de recuperación",
- "Repeat recovery key password" : "Repita o contrasinal da clave de recuperación",
- "Change recovery key password:" : "Cambiar o contrasinal da clave de la recuperación:",
- "Old recovery key password" : "Contrasinal antigo da clave de recuperación",
- "New recovery key password" : "Novo contrasinal da clave de recuperación",
- "Repeat new recovery key password" : "Repita o novo contrasinal da clave de recuperación",
+ "Enable recovery key" : "Activar a chave de recuperación",
+ "Disable recovery key" : "Desactivar a chave de recuperación",
+ "The recovery key is an 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:",
+ "Old recovery key password" : "Contrasinal antigo da chave de recuperación",
+ "New recovery key password" : "Novo contrasinal da chave de recuperación",
+ "Repeat new recovery key password" : "Repita o novo contrasinal da chave de recuperación",
"Change Password" : "Cambiar o contrasinal",
"Basic encryption module" : "Módulo de cifrado básico",
- "Your private key password no longer matches your log-in password." : "O seu contrasinal da clave 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 clave de recuperación ao seu contrasinal de acceso actual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu antigo contrasinal pode pedirllo ao seu administrador para recuperar os seus ficheiros.",
+ "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 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 clave privada",
+ "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",
diff --git a/apps/encryption/l10n/he.js b/apps/encryption/l10n/he.js
index 29ef7fce390..90acc921c73 100644
--- a/apps/encryption/l10n/he.js
+++ b/apps/encryption/l10n/he.js
@@ -30,15 +30,11 @@ OC.L10N.register(
"one-time password for server-side-encryption" : "סיסמא חד פעמית עבור הצפנת צד השרת",
"Default encryption module" : "מודול ההצפנה כבררת מחדל",
"Default encryption module for server-side encryption" : "מודול הצפנה כבררת מחדל להצפנה מצד השרת",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "כדי להשתמש במודול הצפנה זה עליך להפעיל הצפנה מצד השרת בהגדרות\n\t\tהניהול. לאחר ההפעלה יצפין מודול זה את כל הקבצים שלך באופן\n\t\tשקוף לחלוטין. ההצפנה מבוססת על מפתחות AES 256.\n\t\tהמודול לא ישפיע על קבצים קיימים, רק קבצים חדשים יוצפנו לאחר\n\t\tהפעלת ההצפנה מצד השרת. כמו כן, לא ניתן להשבית את ההצפנה\n\t\tבחזרה ולשוב למערכת בלתי מוצפנת.\n\t\tנא לקרוא את התיעוד כדי להבין את כל ההשלכות בטרם קבלת ההחלטה\n\t\tלהפעיל הצפנה מצד השרת.",
- "The share will expire on %s." : "השיתוף יפוג תוקף ב- %s.",
- "Cheers!" : "לחיים!",
"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 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." : "מפתח השחזור הנו מפתח הצפנה נוסף לשימוש לצורך הצפנת הקבצים. הוא מאפשר את שחזור קבצי המשתמש אם המשתמש שוכח את הסיסמא שלו.",
"Recovery key password" : "סיסמת מפתח השחזור",
"Repeat recovery key password" : "יש לחזור על סיסמת מפתח השחזור",
"Change recovery key password:" : "החלפת סיסמת מפתח השחזור:",
@@ -49,7 +45,6 @@ OC.L10N.register(
"Basic encryption module" : "מודול הצפנה בסיסי",
"Your private key password no longer matches your log-in password." : "סיסמת המפתח האישי שלך כבר אינה מתאימה לסיסמת ההתחברות שלך.",
"Set your old private key password to your current log-in password:" : "יש להחליף את סיסמת המפתח האישי הישנה בסיסמת ההתחברות הנוכחית:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "אם הסיסמא הישנה נשכחה ניתן לפנות למנהל על מנת שישחזר את הקבצים שלך.",
"Old log-in password" : "סיסמת התחברות ישנה",
"Current log-in password" : "סיסמת התחברות נוכחית",
"Update Private Key Password" : "עדכון סיסמת המפתח האישי",
@@ -58,4 +53,4 @@ OC.L10N.register(
"Enabled" : "מופעל",
"Disabled" : "מנוטרל"
},
-"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;");
+"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 325d6fc86ee..551cd192cdf 100644
--- a/apps/encryption/l10n/he.json
+++ b/apps/encryption/l10n/he.json
@@ -28,15 +28,11 @@
"one-time password for server-side-encryption" : "סיסמא חד פעמית עבור הצפנת צד השרת",
"Default encryption module" : "מודול ההצפנה כבררת מחדל",
"Default encryption module for server-side encryption" : "מודול הצפנה כבררת מחדל להצפנה מצד השרת",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "כדי להשתמש במודול הצפנה זה עליך להפעיל הצפנה מצד השרת בהגדרות\n\t\tהניהול. לאחר ההפעלה יצפין מודול זה את כל הקבצים שלך באופן\n\t\tשקוף לחלוטין. ההצפנה מבוססת על מפתחות AES 256.\n\t\tהמודול לא ישפיע על קבצים קיימים, רק קבצים חדשים יוצפנו לאחר\n\t\tהפעלת ההצפנה מצד השרת. כמו כן, לא ניתן להשבית את ההצפנה\n\t\tבחזרה ולשוב למערכת בלתי מוצפנת.\n\t\tנא לקרוא את התיעוד כדי להבין את כל ההשלכות בטרם קבלת ההחלטה\n\t\tלהפעיל הצפנה מצד השרת.",
- "The share will expire on %s." : "השיתוף יפוג תוקף ב- %s.",
- "Cheers!" : "לחיים!",
"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 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." : "מפתח השחזור הנו מפתח הצפנה נוסף לשימוש לצורך הצפנת הקבצים. הוא מאפשר את שחזור קבצי המשתמש אם המשתמש שוכח את הסיסמא שלו.",
"Recovery key password" : "סיסמת מפתח השחזור",
"Repeat recovery key password" : "יש לחזור על סיסמת מפתח השחזור",
"Change recovery key password:" : "החלפת סיסמת מפתח השחזור:",
@@ -47,7 +43,6 @@
"Basic encryption module" : "מודול הצפנה בסיסי",
"Your private key password no longer matches your log-in password." : "סיסמת המפתח האישי שלך כבר אינה מתאימה לסיסמת ההתחברות שלך.",
"Set your old private key password to your current log-in password:" : "יש להחליף את סיסמת המפתח האישי הישנה בסיסמת ההתחברות הנוכחית:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "אם הסיסמא הישנה נשכחה ניתן לפנות למנהל על מנת שישחזר את הקבצים שלך.",
"Old log-in password" : "סיסמת התחברות ישנה",
"Current log-in password" : "סיסמת התחברות נוכחית",
"Update Private Key Password" : "עדכון סיסמת המפתח האישי",
@@ -55,5 +50,5 @@
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "הפעלת אפשרות זו תאפשר לך לקבל מחדש גישה לקבצים המוצפנים שלך במקרה שסיסמא נשכחת",
"Enabled" : "מופעל",
"Disabled" : "מנוטרל"
-},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"
+},"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 013403bae3d..8a209bfb650 100644
--- a/apps/encryption/l10n/hr.js
+++ b/apps/encryption/l10n/hr.js
@@ -32,15 +32,11 @@ OC.L10N.register(
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ovu datoteku nije moguće čitati, vjerojatno je riječ o dijeljenoj datoteci. Zatražite od vlasnika datoteke da je ponovo podijeli s vama.",
"Default encryption module" : "Zadani modul za šifriranje",
"Default encryption module for server-side encryption" : "Zadani modul za šifriranje na poslužitelju",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Kako biste se koristili ovim modulom za šifriranje, morate omogućiti šifriranje\n\t\tna poslužitelju u postavkama administratora. Kada je omogućen, ovaj će modul transparentno šifrirati\n\t\tsve vaše datoteke. Šifriranje se temelji na AES 256 ključevima.\n\t\tModul neće dirati postojeće datoteke i šifrirati će samo\n\t\tnove nakon omogućavanja šifriranja na poslužitelju. Također nije moguće ponovno\n\t\tonemogućiti šifriranje i prebaciti se na nešifrirani sustav.\n\t\tPročitajte dokumentaciju kako biste znali sve implikacije ovakvog\n\t\tšifriranja prije nego što odlučite omogućiti šifriranje na poslužitelju.",
- "The share will expire on %s." : "Dijeljenje će isteći %s.",
- "Cheers!" : "Bok!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifriranje je omogućena, ali se ključevi nisu inicijalizirali, odjavite se i ponovno se prijavite",
"Encrypt the home storage" : "Šifrirajte kućnu pohranu",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Omogućavanjem ove opcije šifriraju se sve datoteke smještene u glavnoj pohrani, a u protivnom se šifriraju samo datoteke u vanjskoj pohrani",
"Enable recovery key" : "Omogući ključ za oporavak",
"Disable recovery key" : "Onemogući ključ za oporavak",
- "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.",
"Recovery key password" : "Zaporka ključa za oporavak",
"Repeat recovery key password" : "Ponovite zaporku ključa za oporavak",
"Change recovery key password:" : "Promijenite zaporku ključa za oporavak:",
@@ -51,7 +47,6 @@ OC.L10N.register(
"Basic encryption module" : "Osnovni modul za šifriranje",
"Your private key password no longer matches your log-in password." : "Zaporka vašeg privatnog ključa više se ne podudara s vašom zaporkom za prijavu.",
"Set your old private key password to your current log-in password:" : "Promijenite svoju staru zaporku privatnog ključa u postojeću zaporku za prijavu:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ako se ne sjećate svoje stare zaporke, zatražite od administratora da oporavi vaše datoteke.",
"Old log-in password" : "Stara zaporka za prijavu",
"Current log-in password" : "Aktualna zaporka za prijavu",
"Update Private Key Password" : "Ažuriraj zaporku privatnog ključa",
diff --git a/apps/encryption/l10n/hr.json b/apps/encryption/l10n/hr.json
index 00f48414521..ee122cb881b 100644
--- a/apps/encryption/l10n/hr.json
+++ b/apps/encryption/l10n/hr.json
@@ -30,15 +30,11 @@
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ovu datoteku nije moguće čitati, vjerojatno je riječ o dijeljenoj datoteci. Zatražite od vlasnika datoteke da je ponovo podijeli s vama.",
"Default encryption module" : "Zadani modul za šifriranje",
"Default encryption module for server-side encryption" : "Zadani modul za šifriranje na poslužitelju",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Kako biste se koristili ovim modulom za šifriranje, morate omogućiti šifriranje\n\t\tna poslužitelju u postavkama administratora. Kada je omogućen, ovaj će modul transparentno šifrirati\n\t\tsve vaše datoteke. Šifriranje se temelji na AES 256 ključevima.\n\t\tModul neće dirati postojeće datoteke i šifrirati će samo\n\t\tnove nakon omogućavanja šifriranja na poslužitelju. Također nije moguće ponovno\n\t\tonemogućiti šifriranje i prebaciti se na nešifrirani sustav.\n\t\tPročitajte dokumentaciju kako biste znali sve implikacije ovakvog\n\t\tšifriranja prije nego što odlučite omogućiti šifriranje na poslužitelju.",
- "The share will expire on %s." : "Dijeljenje će isteći %s.",
- "Cheers!" : "Bok!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifriranje je omogućena, ali se ključevi nisu inicijalizirali, odjavite se i ponovno se prijavite",
"Encrypt the home storage" : "Šifrirajte kućnu pohranu",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Omogućavanjem ove opcije šifriraju se sve datoteke smještene u glavnoj pohrani, a u protivnom se šifriraju samo datoteke u vanjskoj pohrani",
"Enable recovery key" : "Omogući ključ za oporavak",
"Disable recovery key" : "Onemogući ključ za oporavak",
- "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.",
"Recovery key password" : "Zaporka ključa za oporavak",
"Repeat recovery key password" : "Ponovite zaporku ključa za oporavak",
"Change recovery key password:" : "Promijenite zaporku ključa za oporavak:",
@@ -49,7 +45,6 @@
"Basic encryption module" : "Osnovni modul za šifriranje",
"Your private key password no longer matches your log-in password." : "Zaporka vašeg privatnog ključa više se ne podudara s vašom zaporkom za prijavu.",
"Set your old private key password to your current log-in password:" : "Promijenite svoju staru zaporku privatnog ključa u postojeću zaporku za prijavu:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ako se ne sjećate svoje stare zaporke, zatražite od administratora da oporavi vaše datoteke.",
"Old log-in password" : "Stara zaporka za prijavu",
"Current log-in password" : "Aktualna zaporka za prijavu",
"Update Private Key Password" : "Ažuriraj zaporku privatnog ključa",
diff --git a/apps/encryption/l10n/hu.js b/apps/encryption/l10n/hu.js
index 4c7754f9d13..cb8f07952a4 100644
--- a/apps/encryption/l10n/hu.js
+++ b/apps/encryption/l10n/hu.js
@@ -28,21 +28,21 @@ OC.L10N.register(
"Bad Signature" : "Hibás aláírás",
"Missing Signature" : "Hiányzó aláírás",
"one-time password for server-side-encryption" : "kiszolgálóoldali titkosítás egyszer használatos jelszava",
+ "Encryption password" : "Titkosítási jelszó",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "A rendszergazda bekapcsolta a kiszolgálóoldali titkosítást. A fájljai a következő jelszóval lettek titkosítva: <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "A rendszergazda bekapcsolta a kiszolgálóoldali titkosítást. A fájljai a következő jelszóval lettek titkosítva: „%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." : "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.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "A fájl nem fejthető vissza, valószínűleg ez egy megosztott fájl. Kérje meg a fájl tulajdonosát, hogy ossza meg újra Önnel ezt a fájlt.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ez a fájl nem olvasható, valószínűleg ez egy megosztott fájl. Kérje meg a fájl tulajdonosát, hogy ossza meg újra Önnel ezt a fájlt.",
"Default encryption module" : "Alapértelmezett titkosítási modul",
"Default encryption module for server-side encryption" : "Alapértelmezett titkosítási modul a kiszolgálóoldali titkosításhoz",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Ahhoz, hogy ezt a titkosítási modult használhassa, be kell kapcsolnia a\n\t\tkiszolgálóoldali titkosítást az adminisztrációs felületen.\n\t\tEngedélyezést követően a modul minden fájlt transzparensen titkosít.\n\t\tA titkosítás AES 256 kulcsokon alapul. A modul nem módosítja a meglévő\n\t\tfájlokat, csak az újakat titkosítja, miután bekapcsolta a\n\t\tkiszolgálóoldali titkosítást. Nem lehet kikapcsolni a titkosítást, hogy\n\t\ttitkosítatlan rendszerre váltson vissza. Olvassa el a dokumentációt,\n\t\thogy minden következménnyel tisztában legyen, mielőtt úgy dönt, hogy\n\t\tengedélyezi a kiszolgálóoldali titkosítást.",
- "Hey there,\n\nThe administration 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" : "Üdvözöljük!\n\nA rendszergazda engedélyezte a kiszolgálóoldali titkosítást. A fájljai a következő jelszóval lettek titkosítva: „%s”.\n\nJelentkezzen be a webes felületen, ugorjon az „Alapvető titkosítási modulhoz” a személyes beállításokban, és frissítse a titkosítási jelszavát úgy, hogy ezt a jelszót adja meg a „Régi titkosítási jelszó” mezőben, majd írja be a jelenlegi bejelentkezési jelszavát is.\n\n",
- "The share will expire on %s." : "A megosztás lejár ekkor: %s.",
- "Cheers!" : "Üdv!",
- "Hey there,<br><br>The administration 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>" : "Üdvözöljük!<br><br>A rendszergazda bekapcsolta a kiszolgálóoldali titkosítást. A fájljai a következő jelszóval lettek titkosítva: <strong>%s</strong>.<br><br>Jelentkezzen be a webes felületen, ugorjon az „Alapvető titkosítási modulhoz” a személyes beállításokban, és frissítse a titkosítási jelszavát úgy, hogy ezt a jelszót adja meg a „Régi titkosítási jelszó” mezőben, majd írja be a jelenlegi bejelentkezési jelszavát is..<br><br>",
+ "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." : "Ahhoz, hogy ezt a titkosítási modult használhassa, be kell kapcsolnia a kiszolgálóoldali titkosítást az adminisztrációs felületen. Engedélyezést követően a modul minden fájlt transzparensen titkosít. A titkosítás AES 256 kulcsokon alapul.\nA modul nem módosítja a meglévő fájlokat, csak az újakat titkosítja, miután bekapcsolta a kiszolgálóoldali titkosítást. Nem lehet kikapcsolni a titkosítást, hogy titkosítatlan rendszerre váltson vissza.\nOlvassa el a dokumentációt, hogy minden következménnyel tisztában legyen, mielőtt úgy dönt, hogy engedélyezi a kiszolgálóoldali titkosítást.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "A titkosító alkalmazás engedélyezett, de a kulcsai még nincsenek előkészítve. Lépjen ki, majd lépjen be újra.",
"Encrypt the home storage" : "Helyi tároló titkosítása",
"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 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.",
+ "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:",
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Alapvető titkosítási modul",
"Your private key password no longer matches your log-in password." : "A titkos kulcsa jelszava már nem egyezik meg a bejelentkezési jelszavával. ",
"Set your old private key password to your current log-in password:" : "A régi privát kulcsának jelszavának beállítása a jelenlegi bejelentkezési jelszavára:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára, akkor megkérheti a rendszergazdát, hogy állítsa helyre a fájljait.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára, akkor megkérheti a rendszergazdát, hogy állítsa helyre a fájljait.",
"Old log-in password" : "Régi bejelentkezési jelszó",
"Current log-in password" : "Jelenlegi bejelentkezési jelszó",
"Update Private Key Password" : "Titkos kulcs jelszavának frissítése",
diff --git a/apps/encryption/l10n/hu.json b/apps/encryption/l10n/hu.json
index 7dab1e1c468..cd394f8fad1 100644
--- a/apps/encryption/l10n/hu.json
+++ b/apps/encryption/l10n/hu.json
@@ -26,21 +26,21 @@
"Bad Signature" : "Hibás aláírás",
"Missing Signature" : "Hiányzó aláírás",
"one-time password for server-side-encryption" : "kiszolgálóoldali titkosítás egyszer használatos jelszava",
+ "Encryption password" : "Titkosítási jelszó",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "A rendszergazda bekapcsolta a kiszolgálóoldali titkosítást. A fájljai a következő jelszóval lettek titkosítva: <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "A rendszergazda bekapcsolta a kiszolgálóoldali titkosítást. A fájljai a következő jelszóval lettek titkosítva: „%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." : "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.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "A fájl nem fejthető vissza, valószínűleg ez egy megosztott fájl. Kérje meg a fájl tulajdonosát, hogy ossza meg újra Önnel ezt a fájlt.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ez a fájl nem olvasható, valószínűleg ez egy megosztott fájl. Kérje meg a fájl tulajdonosát, hogy ossza meg újra Önnel ezt a fájlt.",
"Default encryption module" : "Alapértelmezett titkosítási modul",
"Default encryption module for server-side encryption" : "Alapértelmezett titkosítási modul a kiszolgálóoldali titkosításhoz",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Ahhoz, hogy ezt a titkosítási modult használhassa, be kell kapcsolnia a\n\t\tkiszolgálóoldali titkosítást az adminisztrációs felületen.\n\t\tEngedélyezést követően a modul minden fájlt transzparensen titkosít.\n\t\tA titkosítás AES 256 kulcsokon alapul. A modul nem módosítja a meglévő\n\t\tfájlokat, csak az újakat titkosítja, miután bekapcsolta a\n\t\tkiszolgálóoldali titkosítást. Nem lehet kikapcsolni a titkosítást, hogy\n\t\ttitkosítatlan rendszerre váltson vissza. Olvassa el a dokumentációt,\n\t\thogy minden következménnyel tisztában legyen, mielőtt úgy dönt, hogy\n\t\tengedélyezi a kiszolgálóoldali titkosítást.",
- "Hey there,\n\nThe administration 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" : "Üdvözöljük!\n\nA rendszergazda engedélyezte a kiszolgálóoldali titkosítást. A fájljai a következő jelszóval lettek titkosítva: „%s”.\n\nJelentkezzen be a webes felületen, ugorjon az „Alapvető titkosítási modulhoz” a személyes beállításokban, és frissítse a titkosítási jelszavát úgy, hogy ezt a jelszót adja meg a „Régi titkosítási jelszó” mezőben, majd írja be a jelenlegi bejelentkezési jelszavát is.\n\n",
- "The share will expire on %s." : "A megosztás lejár ekkor: %s.",
- "Cheers!" : "Üdv!",
- "Hey there,<br><br>The administration 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>" : "Üdvözöljük!<br><br>A rendszergazda bekapcsolta a kiszolgálóoldali titkosítást. A fájljai a következő jelszóval lettek titkosítva: <strong>%s</strong>.<br><br>Jelentkezzen be a webes felületen, ugorjon az „Alapvető titkosítási modulhoz” a személyes beállításokban, és frissítse a titkosítási jelszavát úgy, hogy ezt a jelszót adja meg a „Régi titkosítási jelszó” mezőben, majd írja be a jelenlegi bejelentkezési jelszavát is..<br><br>",
+ "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." : "Ahhoz, hogy ezt a titkosítási modult használhassa, be kell kapcsolnia a kiszolgálóoldali titkosítást az adminisztrációs felületen. Engedélyezést követően a modul minden fájlt transzparensen titkosít. A titkosítás AES 256 kulcsokon alapul.\nA modul nem módosítja a meglévő fájlokat, csak az újakat titkosítja, miután bekapcsolta a kiszolgálóoldali titkosítást. Nem lehet kikapcsolni a titkosítást, hogy titkosítatlan rendszerre váltson vissza.\nOlvassa el a dokumentációt, hogy minden következménnyel tisztában legyen, mielőtt úgy dönt, hogy engedélyezi a kiszolgálóoldali titkosítást.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "A titkosító alkalmazás engedélyezett, de a kulcsai még nincsenek előkészítve. Lépjen ki, majd lépjen be újra.",
"Encrypt the home storage" : "Helyi tároló titkosítása",
"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 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.",
+ "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:",
@@ -51,7 +51,7 @@
"Basic encryption module" : "Alapvető titkosítási modul",
"Your private key password no longer matches your log-in password." : "A titkos kulcsa jelszava már nem egyezik meg a bejelentkezési jelszavával. ",
"Set your old private key password to your current log-in password:" : "A régi privát kulcsának jelszavának beállítása a jelenlegi bejelentkezési jelszavára:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára, akkor megkérheti a rendszergazdát, hogy állítsa helyre a fájljait.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára, akkor megkérheti a rendszergazdát, hogy állítsa helyre a fájljait.",
"Old log-in password" : "Régi bejelentkezési jelszó",
"Current log-in password" : "Jelenlegi bejelentkezési jelszó",
"Update Private Key Password" : "Titkos kulcs jelszavának frissítése",
diff --git a/apps/encryption/l10n/ia.js b/apps/encryption/l10n/ia.js
deleted file mode 100644
index 27932deb15e..00000000000
--- a/apps/encryption/l10n/ia.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "The share will expire on %s." : "Le compartir expirara le %s.",
- "Cheers!" : "Acclamationes!"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/ia.json b/apps/encryption/l10n/ia.json
deleted file mode 100644
index a935ab07c57..00000000000
--- a/apps/encryption/l10n/ia.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
- "The share will expire on %s." : "Le compartir expirara le %s.",
- "Cheers!" : "Acclamationes!"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/id.js b/apps/encryption/l10n/id.js
index 4a71180bad3..fbd5fb3818d 100644
--- a/apps/encryption/l10n/id.js
+++ b/apps/encryption/l10n/id.js
@@ -2,7 +2,7 @@ OC.L10N.register(
"encryption",
{
"Missing recovery key password" : "Kata sandi kunci pemulihan tidak ada",
- "Please repeat the recovery key password" : "Silahkan ulangi kata sandi kunci pemulihan",
+ "Please repeat the recovery key password" : "Silakan ulangi kata sandi kunci pemulihan",
"Repeated recovery key password does not match the provided recovery key password" : "Kata sandi kunci pemulihan yang diulangi tidak cocok dengan kata sandi kunci pemulihan yang diberikan",
"Recovery key successfully enabled" : "Kunci pemulihan berhasil diaktifkan",
"Could not enable recovery key. Please check your recovery key password!" : "Tidak dapat mengaktifkan kunci pemulihan. Silakan periksa kata sandi kunci pemulihan Anda!",
@@ -21,26 +21,23 @@ OC.L10N.register(
"The old password was not correct, please try again." : "Kata sandi lama salah, mohon coba lagi.",
"The current log-in password was not correct, please try again." : "Kata sandi masuk saat ini salah, mohon coba lagi.",
"Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk aplikasi enkripsi. Silakan perbarui kata sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienkripsi.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Apl Enkripsi telah aktif, tapi kunci anda tidak diinisialisasikan. Harap keluar-log dan masuk-log kembali.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk aplikasi enkripsi. Silakan perbarui kata sandi kunci privat Anda pada pengaturan pribadi untuk memulihkan akses ke berkas Anda yang dienkripsi.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Apl Enkripsi telah aktif, tapi kunci Anda tidak diinisialisasikan. Harap keluar-log dan masuk-log kembali.",
"Please enable server side encryption in the admin settings in order to use the encryption module." : "Silakan aktifkan enkripsi sisi-peladen pada setelan admin untuk menggunakan modul enkripsi.",
"Encryption app is enabled and ready" : "Apl enkripsi aktif dan siap",
"Bad Signature" : "Tanda salah",
"Missing Signature" : "Tanda hilang",
"one-time password for server-side-encryption" : "Kata sandi sekali pakai untuk server-side-encryption",
+ "Encryption password" : "Sandi enkripsi",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat mendekripsi file ini, mungkin ini adalah file bersama. Harap minta pemilik file untuk membagikan ulang file dengan Anda.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat membaca file ini, mungkin ini adalah file bersama. Harap minta pemilik file untuk membagikan ulang file dengan Anda.",
"Default encryption module" : "Modul bawaan enkripsi",
"Default encryption module for server-side encryption" : "Modul enkripsi bawaan pada enkripsi sisi-peladen",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Dalam penggunaan modul enkripsi data, Anda perlu mengaktifkan enkripsi sisi-peladen melalui setelan admin.\nSaat diaktifkan, modul akan mengenkripsi semua berkas Anda secara transparan.\nEnkripsi data yang digunakan berbasis pada kunci AES 256.\nModul ini tidak akan menyentuh berkas eksis, hanya berkas baru saja yang akan dienkripsi.\nTidak dimungkinkan untuk kembali menonaktifkan enkripsi data dan kembali tanpa menggunakan enkripsi data.\nSilakan baca dokumentasi untuk mengetahui semua implikasi sebelum Anda memutuskan untuk mengaktifkan enkripsi sisi-peladen.",
- "The share will expire on %s." : "Pembagian akan berakhir pada %s.",
- "Cheers!" : "Horee!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi enkripsi telah diaktifkan tetapi kunci tidak terinisialisasi, silakan log-out dan log-in lagi",
"Encrypt the home storage" : "Enkripsi penyimpanan rumah",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Mengaktifkan opsi ini akan mengenkripsi semua berkas yang disimpan pada penyimpanan utama, jika tidak diaktifkan maka hanya berkas pada penyimpanan eksternal saja yang akan dienkripsi.",
"Enable recovery key" : "Aktifkan kunci pemulihan",
"Disable recovery key" : "Nonaktifkan kunci pemulihan",
- "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-berkas pengguna ketika pengguna tersebut melupakan kata sandi mereka.",
"Recovery key password" : "Kata sandi kunci pemulihan",
"Repeat recovery key password" : "Ulangi kata sandi kunci pemulihan",
"Change recovery key password:" : "Ubah kata sandi kunci pemulihan:",
@@ -51,7 +48,6 @@ OC.L10N.register(
"Basic encryption module" : "Modul enkripsi dasar",
"Your private key password no longer matches your log-in password." : "Kata sandi kunci private Anda tidak lagi cocok dengan kata sandi masuk Anda.",
"Set your old private key password to your current log-in password:" : "Setel kata sandi kunci private Anda untuk kata sandi masuk Anda saat ini:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat kata sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
"Old log-in password" : "Kata sandi masuk yang lama",
"Current log-in password" : "Kata sandi masuk saat ini",
"Update Private Key Password" : "Perbarui Kata Sandi Kunci Private",
diff --git a/apps/encryption/l10n/id.json b/apps/encryption/l10n/id.json
index 45e2bf40900..5135c20a39c 100644
--- a/apps/encryption/l10n/id.json
+++ b/apps/encryption/l10n/id.json
@@ -1,6 +1,6 @@
{ "translations": {
"Missing recovery key password" : "Kata sandi kunci pemulihan tidak ada",
- "Please repeat the recovery key password" : "Silahkan ulangi kata sandi kunci pemulihan",
+ "Please repeat the recovery key password" : "Silakan ulangi kata sandi kunci pemulihan",
"Repeated recovery key password does not match the provided recovery key password" : "Kata sandi kunci pemulihan yang diulangi tidak cocok dengan kata sandi kunci pemulihan yang diberikan",
"Recovery key successfully enabled" : "Kunci pemulihan berhasil diaktifkan",
"Could not enable recovery key. Please check your recovery key password!" : "Tidak dapat mengaktifkan kunci pemulihan. Silakan periksa kata sandi kunci pemulihan Anda!",
@@ -19,26 +19,23 @@
"The old password was not correct, please try again." : "Kata sandi lama salah, mohon coba lagi.",
"The current log-in password was not correct, please try again." : "Kata sandi masuk saat ini salah, mohon coba lagi.",
"Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk aplikasi enkripsi. Silakan perbarui kata sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienkripsi.",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Apl Enkripsi telah aktif, tapi kunci anda tidak diinisialisasikan. Harap keluar-log dan masuk-log kembali.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk aplikasi enkripsi. Silakan perbarui kata sandi kunci privat Anda pada pengaturan pribadi untuk memulihkan akses ke berkas Anda yang dienkripsi.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Apl Enkripsi telah aktif, tapi kunci Anda tidak diinisialisasikan. Harap keluar-log dan masuk-log kembali.",
"Please enable server side encryption in the admin settings in order to use the encryption module." : "Silakan aktifkan enkripsi sisi-peladen pada setelan admin untuk menggunakan modul enkripsi.",
"Encryption app is enabled and ready" : "Apl enkripsi aktif dan siap",
"Bad Signature" : "Tanda salah",
"Missing Signature" : "Tanda hilang",
"one-time password for server-side-encryption" : "Kata sandi sekali pakai untuk server-side-encryption",
+ "Encryption password" : "Sandi enkripsi",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat mendekripsi file ini, mungkin ini adalah file bersama. Harap minta pemilik file untuk membagikan ulang file dengan Anda.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat membaca file ini, mungkin ini adalah file bersama. Harap minta pemilik file untuk membagikan ulang file dengan Anda.",
"Default encryption module" : "Modul bawaan enkripsi",
"Default encryption module for server-side encryption" : "Modul enkripsi bawaan pada enkripsi sisi-peladen",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Dalam penggunaan modul enkripsi data, Anda perlu mengaktifkan enkripsi sisi-peladen melalui setelan admin.\nSaat diaktifkan, modul akan mengenkripsi semua berkas Anda secara transparan.\nEnkripsi data yang digunakan berbasis pada kunci AES 256.\nModul ini tidak akan menyentuh berkas eksis, hanya berkas baru saja yang akan dienkripsi.\nTidak dimungkinkan untuk kembali menonaktifkan enkripsi data dan kembali tanpa menggunakan enkripsi data.\nSilakan baca dokumentasi untuk mengetahui semua implikasi sebelum Anda memutuskan untuk mengaktifkan enkripsi sisi-peladen.",
- "The share will expire on %s." : "Pembagian akan berakhir pada %s.",
- "Cheers!" : "Horee!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi enkripsi telah diaktifkan tetapi kunci tidak terinisialisasi, silakan log-out dan log-in lagi",
"Encrypt the home storage" : "Enkripsi penyimpanan rumah",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Mengaktifkan opsi ini akan mengenkripsi semua berkas yang disimpan pada penyimpanan utama, jika tidak diaktifkan maka hanya berkas pada penyimpanan eksternal saja yang akan dienkripsi.",
"Enable recovery key" : "Aktifkan kunci pemulihan",
"Disable recovery key" : "Nonaktifkan kunci pemulihan",
- "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-berkas pengguna ketika pengguna tersebut melupakan kata sandi mereka.",
"Recovery key password" : "Kata sandi kunci pemulihan",
"Repeat recovery key password" : "Ulangi kata sandi kunci pemulihan",
"Change recovery key password:" : "Ubah kata sandi kunci pemulihan:",
@@ -49,7 +46,6 @@
"Basic encryption module" : "Modul enkripsi dasar",
"Your private key password no longer matches your log-in password." : "Kata sandi kunci private Anda tidak lagi cocok dengan kata sandi masuk Anda.",
"Set your old private key password to your current log-in password:" : "Setel kata sandi kunci private Anda untuk kata sandi masuk Anda saat ini:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat kata sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
"Old log-in password" : "Kata sandi masuk yang lama",
"Current log-in password" : "Kata sandi masuk saat ini",
"Update Private Key Password" : "Perbarui Kata Sandi Kunci Private",
diff --git a/apps/encryption/l10n/is.js b/apps/encryption/l10n/is.js
index cba302a311b..202d478d6e8 100644
--- a/apps/encryption/l10n/is.js
+++ b/apps/encryption/l10n/is.js
@@ -30,15 +30,11 @@ OC.L10N.register(
"one-time password for server-side-encryption" : "eins-skiptis lykilorð fyrir dulritun á þjóni",
"Default encryption module" : "Sjálfgefin dulritunareining",
"Default encryption module for server-side encryption" : "Sjálfgefin dulritunareining fyrir dulritun á vefþjóni",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Til að geta notað þessa dulritunareiningu þarftu að virkja dulritun á þjóni\n\t\tí kerfisstjórnunarstillingunum. Þegar hún er orðin virk mun einingin dulrita\n\t\tallar skrárnar þínar á gagnsæan máta. Dulritunin byggir á AES 256-lyklum.\n\t\tEiningin mun ekki eiga við fyrirliggjandi skrár, einungis nýjar skrár verða\n\t\tdulritaðar eftir að dulritun er orðin virk á þjóni. Ekki er heldur hægt að\n\t\tgera dulritun aftur óvirka og skipta aftur til baka í ódulritað kerfi.\n\t\tÞú skalt endilega lesa hjálparskjölin til að sjá allar afleiðingar þessa\n\t\táður en þú virkjar dulritun á þjóninum.",
- "The share will expire on %s." : "Gildistími deilingar rennur út %s.",
- "Cheers!" : "Til hamingju!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Dulritunarforritið er virkt en dulritunarlyklarnir þínir eru ekki tilbúnir til notkunar, skráðu þig út og svo aftur inn",
"Encrypt the home storage" : "Dulrita heimamöppuna",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ef þessi kostur er virkur verða allar skrár í aðalgeymslu dulritaðar, annars verða einungis skrár í ytri gagnageymslum dulritaðar",
"Enable recovery key" : "Virkja endurheimtingarlykil",
"Disable recovery key" : "Gera endurheimtingarlykil óvirkan",
- "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.",
"Recovery key password" : "Endurheimtulykilorð",
"Repeat recovery key password" : "Endurtaktu endurheimtulykilorðið",
"Change recovery key password:" : "Breyta endurheimtulykilorði:",
@@ -49,7 +45,6 @@ OC.L10N.register(
"Basic encryption module" : "Grunn-dulritunareining",
"Your private key password no longer matches your log-in password." : "Lykilorð einkalykilsins þíns samsvarar ekki lengur innskráningarlykilorðinu þínu.",
"Set your old private key password to your current log-in password:" : "Settu eldra lykilorð einkalykilsins þíns á að vera það sama og núgildandi innskráningarlykilorðið þitt:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " Ef þú manst ekki gamla lykilorðið þitt geturðu beðið kerfisstjórann þinn um að endurheimta skrárnar þínar.",
"Old log-in password" : "Gamla innskráningarlykilorðið",
"Current log-in password" : "Núgildandi innskráningarlykilorð",
"Update Private Key Password" : "Uppfæra lykilorð einkalykils:",
diff --git a/apps/encryption/l10n/is.json b/apps/encryption/l10n/is.json
index 5bc746aa8b4..05e0faff580 100644
--- a/apps/encryption/l10n/is.json
+++ b/apps/encryption/l10n/is.json
@@ -28,15 +28,11 @@
"one-time password for server-side-encryption" : "eins-skiptis lykilorð fyrir dulritun á þjóni",
"Default encryption module" : "Sjálfgefin dulritunareining",
"Default encryption module for server-side encryption" : "Sjálfgefin dulritunareining fyrir dulritun á vefþjóni",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Til að geta notað þessa dulritunareiningu þarftu að virkja dulritun á þjóni\n\t\tí kerfisstjórnunarstillingunum. Þegar hún er orðin virk mun einingin dulrita\n\t\tallar skrárnar þínar á gagnsæan máta. Dulritunin byggir á AES 256-lyklum.\n\t\tEiningin mun ekki eiga við fyrirliggjandi skrár, einungis nýjar skrár verða\n\t\tdulritaðar eftir að dulritun er orðin virk á þjóni. Ekki er heldur hægt að\n\t\tgera dulritun aftur óvirka og skipta aftur til baka í ódulritað kerfi.\n\t\tÞú skalt endilega lesa hjálparskjölin til að sjá allar afleiðingar þessa\n\t\táður en þú virkjar dulritun á þjóninum.",
- "The share will expire on %s." : "Gildistími deilingar rennur út %s.",
- "Cheers!" : "Til hamingju!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Dulritunarforritið er virkt en dulritunarlyklarnir þínir eru ekki tilbúnir til notkunar, skráðu þig út og svo aftur inn",
"Encrypt the home storage" : "Dulrita heimamöppuna",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ef þessi kostur er virkur verða allar skrár í aðalgeymslu dulritaðar, annars verða einungis skrár í ytri gagnageymslum dulritaðar",
"Enable recovery key" : "Virkja endurheimtingarlykil",
"Disable recovery key" : "Gera endurheimtingarlykil óvirkan",
- "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.",
"Recovery key password" : "Endurheimtulykilorð",
"Repeat recovery key password" : "Endurtaktu endurheimtulykilorðið",
"Change recovery key password:" : "Breyta endurheimtulykilorði:",
@@ -47,7 +43,6 @@
"Basic encryption module" : "Grunn-dulritunareining",
"Your private key password no longer matches your log-in password." : "Lykilorð einkalykilsins þíns samsvarar ekki lengur innskráningarlykilorðinu þínu.",
"Set your old private key password to your current log-in password:" : "Settu eldra lykilorð einkalykilsins þíns á að vera það sama og núgildandi innskráningarlykilorðið þitt:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " Ef þú manst ekki gamla lykilorðið þitt geturðu beðið kerfisstjórann þinn um að endurheimta skrárnar þínar.",
"Old log-in password" : "Gamla innskráningarlykilorðið",
"Current log-in password" : "Núgildandi innskráningarlykilorð",
"Update Private Key Password" : "Uppfæra lykilorð einkalykils:",
diff --git a/apps/encryption/l10n/it.js b/apps/encryption/l10n/it.js
index f214b026cff..fbf0c59569d 100644
--- a/apps/encryption/l10n/it.js
+++ b/apps/encryption/l10n/it.js
@@ -28,21 +28,16 @@ OC.L10N.register(
"Bad Signature" : "Firma non valida",
"Missing Signature" : "Firma mancante",
"one-time password for server-side-encryption" : "password monouso per la cifratura lato server",
+ "Encryption password" : "Password di cifratura",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile leggere questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
"Default encryption module" : "Modulo di cifratura predefinito",
"Default encryption module for server-side encryption" : "Modulo di cifratura predefinito per la cifratura lato server",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Per utilizzare questo modulo di cifratura, è necessario abilitare la cifratura\n\t\tlato server nelle impostazioni di amministrazione. Una volta abilitato, questo modulo\n\t\tcifrerà tutti i file in maniera trasparente. La cifratura è basata su chiavi AES 256.\n\t\tIl modulo non interesserà i file esistenti, solo i nuovi file saranno cifrati dopo\n\t\tl'abilitazione della cifratura lato server. Non è possibile disabilitare\n\t\tnuovamente la cifratura e tornare a un sistema non cifrato. Leggi la\n\t\tdocumentazione per conoscere tutte le implicazioni prima di decidere di abilitare\n\t\tla cifratura lato server.",
- "Hey there,\n\nThe administration 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" : "Ciao,\n\nl'amministratore ha attivato la crittografia lato server. I tuoi file sono stati cifrati utilizzando la password \"%s\".\n\nAccedi all'interfaccia web, vai alla sezione \"Modulo di cifratura base\" delle tue impostazioni personali e aggiorna la tua password di cifratura digitando questa password nel campo \"vecchia password di accesso\" e la tua nuova password.\n\n",
- "The share will expire on %s." : "La condivisione scadrà il %s.",
- "Cheers!" : "Saluti!",
- "Hey there,<br><br>The administration 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>" : "Ciao,<br><br>l'amministratore ha attivato la crittografia lato server. I tuoi file sono stati cifrati utilizzando la password <strong>%s</strong>.<br><br>Accedi all'interfaccia web, vai alla sezione \"Modulo di cifratura base\" delle tue impostazioni personali e aggiorna la tua password di cifratura digitando questa password nel campo \"vecchia password di accesso\" e la tua nuova password.<br><br>",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
"Encrypt the home storage" : "Cifra l'archiviazione principale",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "L'abilitazione di questa opzione cifra tutti i file memorizzati sull'archiviazione principale, altrimenti saranno cifrati solo i file sull'archiviazione esterna.",
"Enable recovery key" : "Abilita chiave di ripristino",
"Disable recovery key" : "Disabilita chiave di ripristino",
- "The recovery key is an extra encryption key that is used 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.",
"Recovery key password" : "Password della chiave di ripristino",
"Repeat recovery key password" : "Ripeti la password della chiave di ripristino",
"Change recovery key password:" : "Cambia la password della chiave di ripristino:",
@@ -53,7 +48,6 @@ OC.L10N.register(
"Basic encryption module" : "Modulo di cifratura base",
"Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
"Set your old private key password to your current log-in password:" : "Imposta la vecchia password della chiave privata sull'attuale password di accesso:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
"Old log-in password" : "Vecchia password di accesso",
"Current log-in password" : "Password di accesso attuale",
"Update Private Key Password" : "Aggiorna la password della chiave privata",
diff --git a/apps/encryption/l10n/it.json b/apps/encryption/l10n/it.json
index 64d9b43a450..c94c84cac0f 100644
--- a/apps/encryption/l10n/it.json
+++ b/apps/encryption/l10n/it.json
@@ -26,21 +26,16 @@
"Bad Signature" : "Firma non valida",
"Missing Signature" : "Firma mancante",
"one-time password for server-side-encryption" : "password monouso per la cifratura lato server",
+ "Encryption password" : "Password di cifratura",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile leggere questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
"Default encryption module" : "Modulo di cifratura predefinito",
"Default encryption module for server-side encryption" : "Modulo di cifratura predefinito per la cifratura lato server",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Per utilizzare questo modulo di cifratura, è necessario abilitare la cifratura\n\t\tlato server nelle impostazioni di amministrazione. Una volta abilitato, questo modulo\n\t\tcifrerà tutti i file in maniera trasparente. La cifratura è basata su chiavi AES 256.\n\t\tIl modulo non interesserà i file esistenti, solo i nuovi file saranno cifrati dopo\n\t\tl'abilitazione della cifratura lato server. Non è possibile disabilitare\n\t\tnuovamente la cifratura e tornare a un sistema non cifrato. Leggi la\n\t\tdocumentazione per conoscere tutte le implicazioni prima di decidere di abilitare\n\t\tla cifratura lato server.",
- "Hey there,\n\nThe administration 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" : "Ciao,\n\nl'amministratore ha attivato la crittografia lato server. I tuoi file sono stati cifrati utilizzando la password \"%s\".\n\nAccedi all'interfaccia web, vai alla sezione \"Modulo di cifratura base\" delle tue impostazioni personali e aggiorna la tua password di cifratura digitando questa password nel campo \"vecchia password di accesso\" e la tua nuova password.\n\n",
- "The share will expire on %s." : "La condivisione scadrà il %s.",
- "Cheers!" : "Saluti!",
- "Hey there,<br><br>The administration 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>" : "Ciao,<br><br>l'amministratore ha attivato la crittografia lato server. I tuoi file sono stati cifrati utilizzando la password <strong>%s</strong>.<br><br>Accedi all'interfaccia web, vai alla sezione \"Modulo di cifratura base\" delle tue impostazioni personali e aggiorna la tua password di cifratura digitando questa password nel campo \"vecchia password di accesso\" e la tua nuova password.<br><br>",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
"Encrypt the home storage" : "Cifra l'archiviazione principale",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "L'abilitazione di questa opzione cifra tutti i file memorizzati sull'archiviazione principale, altrimenti saranno cifrati solo i file sull'archiviazione esterna.",
"Enable recovery key" : "Abilita chiave di ripristino",
"Disable recovery key" : "Disabilita chiave di ripristino",
- "The recovery key is an extra encryption key that is used 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.",
"Recovery key password" : "Password della chiave di ripristino",
"Repeat recovery key password" : "Ripeti la password della chiave di ripristino",
"Change recovery key password:" : "Cambia la password della chiave di ripristino:",
@@ -51,7 +46,6 @@
"Basic encryption module" : "Modulo di cifratura base",
"Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
"Set your old private key password to your current log-in password:" : "Imposta la vecchia password della chiave privata sull'attuale password di accesso:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
"Old log-in password" : "Vecchia password di accesso",
"Current log-in password" : "Password di accesso attuale",
"Update Private Key Password" : "Aggiorna la password della chiave privata",
diff --git a/apps/encryption/l10n/ja.js b/apps/encryption/l10n/ja.js
index 818c718672b..c5ab178a44c 100644
--- a/apps/encryption/l10n/ja.js
+++ b/apps/encryption/l10n/ja.js
@@ -28,21 +28,21 @@ OC.L10N.register(
"Bad Signature" : "不正な署名",
"Missing Signature" : "署名が存在しません",
"one-time password for server-side-encryption" : "サーバーサイド暗号化のワンタイムパスワード",
+ "Encryption password" : "暗号化パスワード",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "管理者がサーバーサイド暗号化を有効化しました。あなたのファイルはパスワードで暗号化されています<strong>%s</strong>。",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "管理者がサーバーサイド暗号化を有効化しました。あなたのファイルはパスワードで暗号化されています%s。",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "この暗号化モジュールを使うには管理者画面でサーバーサイド暗号化を有効にする\n\t\t必要があります。このモジュールを一旦有効にすると全てのファイルが\n\t\t意識することなく暗号化されます。AES 256bit の鍵で暗号化されます。\n\t\tこのモジュールは既存ファイルはそのままで、サーバーサイド暗号化を\n\t\t有効にした後の新しいファイルのみ暗号化します。 一旦暗号化したシステムを\n\t\t無効化して元の暗号化されていない状態に戻すことはできません。\n\t\tサーバーサイド暗号化するかどうか決める前にドキュメントをよく読んで\n\t\t全ての要件を確認してください。",
- "Hey there,\n\nThe administration 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" : "こんにちは\n\n管理者がサーバーサイド暗号化を有効にしました。\"%s\"というパスワードであなたのファイルが暗号化されました。\n\nWeb画面からログインして、個人設定画面の\"基本暗号化モジュール\"セクションにいき、暗号化パスワードの更新をお願いします。\"旧ログインパスワード\"部分に上記パスワードを入力し、現在のログインパスワードで更新します。\n",
- "The share will expire on %s." : "共有は %s で有効期限が切れます。",
- "Cheers!" : "それでは!",
- "Hey there,<br><br>The administration 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>" : "こんにちは、<br><br>管理者がサーバーサイド暗号化を有効にしました。<strong>%s</strong>というパスワードであなたのファイルが暗号化されました。<br><br>Web画面からログインして、個人設定画面の\"基本暗号化モジュール\"のセクションにいき、暗号化パスワードの更新をお願いします。\"旧ログインパスワード\"部分に上記パスワードを入力し、現在のログインパスワードで更新します。<br><br>",
+ "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 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 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:" : "復旧キーのパスワードを変更:",
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "基本暗号化モジュール",
"Your private key password no longer matches your log-in password." : "もはや秘密鍵はログインパスワードと一致しません。",
"Set your old private key password to your current log-in password:" : "古い秘密鍵のパスワードを現在のログインパスワードに設定:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合は、管理者にファイルの復元を依頼することができます。",
"Old log-in password" : "古いログインパスワード",
"Current log-in password" : "現在のログインパスワード",
"Update Private Key Password" : "秘密鍵のパスワードを更新",
diff --git a/apps/encryption/l10n/ja.json b/apps/encryption/l10n/ja.json
index c200c304867..9ec6e00da5a 100644
--- a/apps/encryption/l10n/ja.json
+++ b/apps/encryption/l10n/ja.json
@@ -26,21 +26,21 @@
"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." : "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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "この暗号化モジュールを使うには管理者画面でサーバーサイド暗号化を有効にする\n\t\t必要があります。このモジュールを一旦有効にすると全てのファイルが\n\t\t意識することなく暗号化されます。AES 256bit の鍵で暗号化されます。\n\t\tこのモジュールは既存ファイルはそのままで、サーバーサイド暗号化を\n\t\t有効にした後の新しいファイルのみ暗号化します。 一旦暗号化したシステムを\n\t\t無効化して元の暗号化されていない状態に戻すことはできません。\n\t\tサーバーサイド暗号化するかどうか決める前にドキュメントをよく読んで\n\t\t全ての要件を確認してください。",
- "Hey there,\n\nThe administration 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" : "こんにちは\n\n管理者がサーバーサイド暗号化を有効にしました。\"%s\"というパスワードであなたのファイルが暗号化されました。\n\nWeb画面からログインして、個人設定画面の\"基本暗号化モジュール\"セクションにいき、暗号化パスワードの更新をお願いします。\"旧ログインパスワード\"部分に上記パスワードを入力し、現在のログインパスワードで更新します。\n",
- "The share will expire on %s." : "共有は %s で有効期限が切れます。",
- "Cheers!" : "それでは!",
- "Hey there,<br><br>The administration 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>" : "こんにちは、<br><br>管理者がサーバーサイド暗号化を有効にしました。<strong>%s</strong>というパスワードであなたのファイルが暗号化されました。<br><br>Web画面からログインして、個人設定画面の\"基本暗号化モジュール\"のセクションにいき、暗号化パスワードの更新をお願いします。\"旧ログインパスワード\"部分に上記パスワードを入力し、現在のログインパスワードで更新します。<br><br>",
+ "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 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 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:" : "復旧キーのパスワードを変更:",
@@ -51,7 +51,7 @@
"Basic encryption module" : "基本暗号化モジュール",
"Your private key password no longer matches your log-in password." : "もはや秘密鍵はログインパスワードと一致しません。",
"Set your old private key password to your current log-in password:" : "古い秘密鍵のパスワードを現在のログインパスワードに設定:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合は、管理者にファイルの復元を依頼することができます。",
"Old log-in password" : "古いログインパスワード",
"Current log-in password" : "現在のログインパスワード",
"Update Private Key Password" : "秘密鍵のパスワードを更新",
diff --git a/apps/encryption/l10n/ka.js b/apps/encryption/l10n/ka.js
new file mode 100644
index 00000000000..e3d3c92883b
--- /dev/null
+++ b/apps/encryption/l10n/ka.js
@@ -0,0 +1,63 @@
+OC.L10N.register(
+ "encryption",
+ {
+ "Missing recovery key password" : "Missing recovery key password",
+ "Please repeat the recovery key password" : "Please repeat the recovery key password",
+ "Repeated recovery key password does not match the provided recovery key password" : "Repeated recovery key password does not match the provided recovery key password",
+ "Recovery key successfully enabled" : "Recovery key successfully enabled",
+ "Could not enable recovery key. Please check your recovery key password!" : "Could not enable recovery key. Please check your recovery key password!",
+ "Recovery key successfully disabled" : "Recovery key successfully disabled",
+ "Could not disable recovery key. Please check your recovery key password!" : "Could not disable recovery key. Please check your recovery key password!",
+ "Missing parameters" : "Missing parameters",
+ "Please provide the old recovery password" : "Please provide the old recovery password",
+ "Please provide a new recovery password" : "Please provide a new recovery password",
+ "Please repeat the new recovery password" : "Please repeat the new recovery password",
+ "Password successfully changed." : "Password successfully changed.",
+ "Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was not correct.",
+ "Recovery Key disabled" : "Recovery Key disabled",
+ "Recovery Key enabled" : "Recovery Key enabled",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Could not enable the recovery key, please try again or contact your administrator",
+ "Could not update the private key password." : "Could not update the private key password.",
+ "The old password was not correct, please try again." : "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." : "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." : "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" : "Encryption app is enabled and ready",
+ "Bad Signature" : "Bad Signature",
+ "Missing Signature" : "Missing Signature",
+ "one-time password for server-side-encryption" : "one-time password for server-side-encryption",
+ "Encryption password" : "Encryption password",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "The administration enabled server-side-encryption. Your files were encrypted using the password \"%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 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." : "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",
+ "Default encryption module for server-side encryption" : "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." : "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.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption app is enabled but your keys are not initialized, please log-out and log-in again",
+ "Encrypt the home storage" : "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" : "Enable recovery key",
+ "Disable recovery key" : "Disable recovery key",
+ "Recovery key password" : "Recovery key password",
+ "Repeat recovery key password" : "Repeat recovery key password",
+ "Change recovery key password:" : "Change recovery key password:",
+ "Old recovery key password" : "Old recovery key password",
+ "New recovery key password" : "New recovery key password",
+ "Repeat new recovery key password" : "Repeat new recovery key password",
+ "Change Password" : "Change Password",
+ "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:",
+ "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"
+},
+"nplurals=2; plural=(n!=1);");
diff --git a/apps/encryption/l10n/ka.json b/apps/encryption/l10n/ka.json
new file mode 100644
index 00000000000..24ce10a4037
--- /dev/null
+++ b/apps/encryption/l10n/ka.json
@@ -0,0 +1,61 @@
+{ "translations": {
+ "Missing recovery key password" : "Missing recovery key password",
+ "Please repeat the recovery key password" : "Please repeat the recovery key password",
+ "Repeated recovery key password does not match the provided recovery key password" : "Repeated recovery key password does not match the provided recovery key password",
+ "Recovery key successfully enabled" : "Recovery key successfully enabled",
+ "Could not enable recovery key. Please check your recovery key password!" : "Could not enable recovery key. Please check your recovery key password!",
+ "Recovery key successfully disabled" : "Recovery key successfully disabled",
+ "Could not disable recovery key. Please check your recovery key password!" : "Could not disable recovery key. Please check your recovery key password!",
+ "Missing parameters" : "Missing parameters",
+ "Please provide the old recovery password" : "Please provide the old recovery password",
+ "Please provide a new recovery password" : "Please provide a new recovery password",
+ "Please repeat the new recovery password" : "Please repeat the new recovery password",
+ "Password successfully changed." : "Password successfully changed.",
+ "Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was not correct.",
+ "Recovery Key disabled" : "Recovery Key disabled",
+ "Recovery Key enabled" : "Recovery Key enabled",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Could not enable the recovery key, please try again or contact your administrator",
+ "Could not update the private key password." : "Could not update the private key password.",
+ "The old password was not correct, please try again." : "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." : "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." : "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" : "Encryption app is enabled and ready",
+ "Bad Signature" : "Bad Signature",
+ "Missing Signature" : "Missing Signature",
+ "one-time password for server-side-encryption" : "one-time password for server-side-encryption",
+ "Encryption password" : "Encryption password",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "The administration enabled server-side-encryption. Your files were encrypted using the password \"%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 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." : "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",
+ "Default encryption module for server-side encryption" : "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." : "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.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption app is enabled but your keys are not initialized, please log-out and log-in again",
+ "Encrypt the home storage" : "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" : "Enable recovery key",
+ "Disable recovery key" : "Disable recovery key",
+ "Recovery key password" : "Recovery key password",
+ "Repeat recovery key password" : "Repeat recovery key password",
+ "Change recovery key password:" : "Change recovery key password:",
+ "Old recovery key password" : "Old recovery key password",
+ "New recovery key password" : "New recovery key password",
+ "Repeat new recovery key password" : "Repeat new recovery key password",
+ "Change Password" : "Change Password",
+ "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:",
+ "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"
+},"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 d6e7d8ab1a8..19c98a14d27 100644
--- a/apps/encryption/l10n/ka_GE.js
+++ b/apps/encryption/l10n/ka_GE.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "ხელმოწერა აკლია",
"one-time password for server-side-encryption" : "ერთჯერადი პაროლი სერვერული მხარის შიფრაციისთვის",
"Default encryption module" : "საწყისი შიფრაციის მოდული",
- "The share will expire on %s." : "გაზიარება გაუქმდება %s-ზე.",
- "Cheers!" : "წარმატებები!",
"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 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." : "აღდგენის გასაღები დამატებითი შიფრაციის გასაღებია, რომელიც გამოიყენებიან ფაილების დასაშიფრად. ეს იძლევა მომხმარებლის ფაილის აღდგენის უფლებას, იმ შემთხვევაში თუ მას დაავიწყდება პაროლი.",
"Recovery key password" : "აღდგენის გასაღების პაროლი",
"Repeat recovery key password" : "გაიმეორეთ აღდგენის გასაღების პაროლი",
"Change recovery key password:" : "შეცვალეთ აღდგენის გასაღების პაროლი:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "მარტივი შიფრაციის მოდული",
"Your private key password no longer matches your log-in password." : "თქვენი პირადი გასაღების პაროლი აღარ ემთხვევა ლოგინის პაროლს.",
"Set your old private key password to your current log-in password:" : "დააყენეთ თქვენი ძველი პირადი გასაღების პაროლი ამჟამინდელ ლოგინის პაროლზე:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "თუ არ გახსოვთ თქვენი ძველი პაროლი, შეგიძლიათ მისი აღდგენა სთხოვოთ ადმინისტრატორს.",
"Old log-in password" : "ძველი ლოგინის პაროლი",
"Current log-in password" : "ამჟამინდელი ლოგინის პაროლი",
"Update Private Key Password" : "განაახლეთ პირადი გასაღების პაროლი",
diff --git a/apps/encryption/l10n/ka_GE.json b/apps/encryption/l10n/ka_GE.json
index 31aadaa4d6a..4cb120325ce 100644
--- a/apps/encryption/l10n/ka_GE.json
+++ b/apps/encryption/l10n/ka_GE.json
@@ -27,14 +27,11 @@
"Missing Signature" : "ხელმოწერა აკლია",
"one-time password for server-side-encryption" : "ერთჯერადი პაროლი სერვერული მხარის შიფრაციისთვის",
"Default encryption module" : "საწყისი შიფრაციის მოდული",
- "The share will expire on %s." : "გაზიარება გაუქმდება %s-ზე.",
- "Cheers!" : "წარმატებები!",
"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 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." : "აღდგენის გასაღები დამატებითი შიფრაციის გასაღებია, რომელიც გამოიყენებიან ფაილების დასაშიფრად. ეს იძლევა მომხმარებლის ფაილის აღდგენის უფლებას, იმ შემთხვევაში თუ მას დაავიწყდება პაროლი.",
"Recovery key password" : "აღდგენის გასაღების პაროლი",
"Repeat recovery key password" : "გაიმეორეთ აღდგენის გასაღების პაროლი",
"Change recovery key password:" : "შეცვალეთ აღდგენის გასაღების პაროლი:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "მარტივი შიფრაციის მოდული",
"Your private key password no longer matches your log-in password." : "თქვენი პირადი გასაღების პაროლი აღარ ემთხვევა ლოგინის პაროლს.",
"Set your old private key password to your current log-in password:" : "დააყენეთ თქვენი ძველი პირადი გასაღების პაროლი ამჟამინდელ ლოგინის პაროლზე:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "თუ არ გახსოვთ თქვენი ძველი პაროლი, შეგიძლიათ მისი აღდგენა სთხოვოთ ადმინისტრატორს.",
"Old log-in password" : "ძველი ლოგინის პაროლი",
"Current log-in password" : "ამჟამინდელი ლოგინის პაროლი",
"Update Private Key Password" : "განაახლეთ პირადი გასაღების პაროლი",
diff --git a/apps/encryption/l10n/km.js b/apps/encryption/l10n/km.js
deleted file mode 100644
index 2d925c91819..00000000000
--- a/apps/encryption/l10n/km.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Password successfully changed." : "បាន​ប្ដូរ​ពាក្យ​សម្ងាត់​ដោយ​ជោគជ័យ។",
- "Could not change the password. Maybe the old password was not correct." : "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​បាន​ទេ។ ប្រហែល​ពាក្យ​សម្ងាត់​ចាស់​មិន​ត្រឹម​ត្រូវ។",
- "Change Password" : "ប្ដូរ​ពាក្យ​សម្ងាត់",
- "Enabled" : "បាន​បើក",
- "Disabled" : "បាន​បិទ"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/km.json b/apps/encryption/l10n/km.json
deleted file mode 100644
index 0beaa6b8a2f..00000000000
--- a/apps/encryption/l10n/km.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
- "Password successfully changed." : "បាន​ប្ដូរ​ពាក្យ​សម្ងាត់​ដោយ​ជោគជ័យ។",
- "Could not change the password. Maybe the old password was not correct." : "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​បាន​ទេ។ ប្រហែល​ពាក្យ​សម្ងាត់​ចាស់​មិន​ត្រឹម​ត្រូវ។",
- "Change Password" : "ប្ដូរ​ពាក្យ​សម្ងាត់",
- "Enabled" : "បាន​បើក",
- "Disabled" : "បាន​បិទ"
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/kn.js b/apps/encryption/l10n/kn.js
deleted file mode 100644
index 3f0108db173..00000000000
--- a/apps/encryption/l10n/kn.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Cheers!" : "ಆನಂದಿಸಿ !",
- "Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ",
- "Disabled" : "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/kn.json b/apps/encryption/l10n/kn.json
deleted file mode 100644
index 3b78ba1f13e..00000000000
--- a/apps/encryption/l10n/kn.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
- "Cheers!" : "ಆನಂದಿಸಿ !",
- "Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ",
- "Disabled" : "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/ko.js b/apps/encryption/l10n/ko.js
index 7a4e49a1f73..11e9d88466f 100644
--- a/apps/encryption/l10n/ko.js
+++ b/apps/encryption/l10n/ko.js
@@ -6,7 +6,7 @@ OC.L10N.register(
"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" : "복구 키가 성공적으로 비활성화되었습니다",
+ "Recovery key successfully disabled" : "복구 키가 성공적으로 비활성화되었습니다.",
"Could not disable recovery key. Please check your recovery key password!" : "복구 키를 비활성화할 수 없습니다. 복구 키의 암호를 확인해 주십시오!",
"Missing parameters" : "인자 부족함",
"Please provide the old recovery password" : "이전 복구 암호를 입력하십시오",
@@ -23,24 +23,26 @@ 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" : "서버 측 암호화용 일회용 암호",
+ "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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "이 암호화 모듈을 사용하려면 관리자 설정에서 서버 측 암호화를 사용해야 합니다.\n\t\t서버 측 암호화를 활성화하면 이 모듈에서 모든 파일을 투명하게 암호화합니다.\n\t\t암호화는 AES 256 키로 진행됩니다. 이 모듈에서는 기존 파일은 암호화하지 않으며,\n\t\t서버 측 암호화를 활성화한 이후 새로 업로드한 파일만 암호화합니다. 한 번 암호화를\n\t\t활성화하면 암호화를 비활성화하고 암호화를 사용하지 않았던 상태로 돌아갈 수\n\t\t없습니다. 서버 측 암호화를 활성화하기 전에 문서를 참조하여 모든 조건과\n\t\t제약 사항을 확인하십시오.",
- "The share will expire on %s." : "이 공유는 %s에 만료됩니다.",
- "Cheers!" : "감사합니다!",
+ "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 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 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:" : "복구 키 암호 변경:",
@@ -51,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "기본 암호화 모듈",
"Your private key password no longer matches your log-in password." : "개인 키 암호와 로그인 암호가 일치하지 않습니다.",
"Set your old private key password to your current log-in password:" : "기존 개인 키 암호를 로그인 암호와 동일하게 설정하십시오:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " 이전 암호가 기억나지 않으면 시스템 관리자에게 파일 복구를 요청하십시오.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "기존 암호가 기억나지 않는다면 관리자에게 파일을 복구하도록 요청할 수 있습니다.",
"Old log-in password" : "이전 로그인 암호",
"Current log-in password" : "현재 로그인 암호",
"Update Private Key Password" : "개인 키 암호 업데이트",
diff --git a/apps/encryption/l10n/ko.json b/apps/encryption/l10n/ko.json
index 50e390ca22e..108dac6c6f6 100644
--- a/apps/encryption/l10n/ko.json
+++ b/apps/encryption/l10n/ko.json
@@ -4,7 +4,7 @@
"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" : "복구 키가 성공적으로 비활성화되었습니다",
+ "Recovery key successfully disabled" : "복구 키가 성공적으로 비활성화되었습니다.",
"Could not disable recovery key. Please check your recovery key password!" : "복구 키를 비활성화할 수 없습니다. 복구 키의 암호를 확인해 주십시오!",
"Missing parameters" : "인자 부족함",
"Please provide the old recovery password" : "이전 복구 암호를 입력하십시오",
@@ -21,24 +21,26 @@
"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" : "서버 측 암호화용 일회용 암호",
+ "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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "이 암호화 모듈을 사용하려면 관리자 설정에서 서버 측 암호화를 사용해야 합니다.\n\t\t서버 측 암호화를 활성화하면 이 모듈에서 모든 파일을 투명하게 암호화합니다.\n\t\t암호화는 AES 256 키로 진행됩니다. 이 모듈에서는 기존 파일은 암호화하지 않으며,\n\t\t서버 측 암호화를 활성화한 이후 새로 업로드한 파일만 암호화합니다. 한 번 암호화를\n\t\t활성화하면 암호화를 비활성화하고 암호화를 사용하지 않았던 상태로 돌아갈 수\n\t\t없습니다. 서버 측 암호화를 활성화하기 전에 문서를 참조하여 모든 조건과\n\t\t제약 사항을 확인하십시오.",
- "The share will expire on %s." : "이 공유는 %s에 만료됩니다.",
- "Cheers!" : "감사합니다!",
+ "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 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 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:" : "복구 키 암호 변경:",
@@ -49,7 +51,7 @@
"Basic encryption module" : "기본 암호화 모듈",
"Your private key password no longer matches your log-in password." : "개인 키 암호와 로그인 암호가 일치하지 않습니다.",
"Set your old private key password to your current log-in password:" : "기존 개인 키 암호를 로그인 암호와 동일하게 설정하십시오:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " 이전 암호가 기억나지 않으면 시스템 관리자에게 파일 복구를 요청하십시오.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "기존 암호가 기억나지 않는다면 관리자에게 파일을 복구하도록 요청할 수 있습니다.",
"Old log-in password" : "이전 로그인 암호",
"Current log-in password" : "현재 로그인 암호",
"Update Private Key Password" : "개인 키 암호 업데이트",
diff --git a/apps/encryption/l10n/lb.js b/apps/encryption/l10n/lb.js
deleted file mode 100644
index 478426b6a1c..00000000000
--- a/apps/encryption/l10n/lb.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Cheers!" : "Prost!",
- "Change Password" : "Passwuert änneren",
- "Enabled" : "Aktivéiert",
- "Disabled" : "Deaktivéiert"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/lb.json b/apps/encryption/l10n/lb.json
deleted file mode 100644
index 53692b969e1..00000000000
--- a/apps/encryption/l10n/lb.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "Cheers!" : "Prost!",
- "Change Password" : "Passwuert änneren",
- "Enabled" : "Aktivéiert",
- "Disabled" : "Deaktivéiert"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/lt_LT.js b/apps/encryption/l10n/lt_LT.js
index b90d1f5d0ab..cb32f15eb44 100644
--- a/apps/encryption/l10n/lt_LT.js
+++ b/apps/encryption/l10n/lt_LT.js
@@ -32,15 +32,11 @@ OC.L10N.register(
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nepavyksta perskaityti šio failo, tikriausiai, tai yra bendrinamas failas. Paprašykite failo savininko iš naujo pradėti bendrinti su jumis šį failą.",
"Default encryption module" : "Numatytasis šifravimo modulis",
"Default encryption module for server-side encryption" : "Numatytas šifravimo modulis serverio šifravimui.",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Kad galėtumėte naudoti šį šifravimo modulį, turite įjungti serverio \n\t\tšifravimą administratoriaus nustatymuose. Įjungus šį modulį visi Jūsų failai bus užšifruoti\n\t\tŠifravimas pagrįstas AES 256 raktais.\n\t\tModulis užšifruos tik naujus failus, palikdamas senuosius taip kaip buvo iki šifravimo įjungimo.\n\t\tNeįmanoma išjungti šifravimą ir vėl sugrįžti prie nešifruojamos sistemos.\n\t\tPrieš nuspręsdami, atidžiai perskaitykite dokumentaciją, kad gerai suprastumėte visas šifravimo pasekmes.",
- "The share will expire on %s." : "Bendrinimo laikas pasibaigs %s.",
- "Cheers!" : "Sveikinimai!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programėlė yra įjungta, tačiau jūsų raktai nėra inicijuoti. Atsijunkite ir dar kartą prisijunkite",
"Encrypt the home storage" : "Šifruoti saugyklą",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Įjungus šią parinktį, bus užšifruoti visi pagrindinėje saugykloje saugomi failai. Priešingu atveju bus užšifruoti tik išorinėje saugykloje esantys failai",
"Enable recovery key" : "Naudoti atstatymo raktą",
"Disable recovery key" : "Nenaudoti atstatymo rakto",
- "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į.",
"Recovery key password" : "Atkrūimo rakto slaptažodis",
"Repeat recovery key password" : "Pakartokite atkūrimo rakto slaptažodį",
"Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
@@ -51,7 +47,6 @@ OC.L10N.register(
"Basic encryption module" : "Pagrindinis šifravimo modulis",
"Your private key password no longer matches your log-in password." : "Jūsų privačiojo rakto slaptažodis daugiau nebeatitinka jūsų prisijungimo slaptažodžio.",
"Set your old private key password to your current log-in password:" : "Nustatykite savo senąjį privačiojo rakto slaptažodį į savo dabartinį prisijungimo slaptažodį:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti sistemos administratoriaus atkurti jūsų duomenis.",
"Old log-in password" : "Senas prisijungimo slaptažodis",
"Current log-in password" : "Dabartinis prisijungimo slaptažodis",
"Update Private Key Password" : "Atnaujinti privačiojo rakto slaptažodį",
diff --git a/apps/encryption/l10n/lt_LT.json b/apps/encryption/l10n/lt_LT.json
index ccac4094aaa..776583e9428 100644
--- a/apps/encryption/l10n/lt_LT.json
+++ b/apps/encryption/l10n/lt_LT.json
@@ -30,15 +30,11 @@
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nepavyksta perskaityti šio failo, tikriausiai, tai yra bendrinamas failas. Paprašykite failo savininko iš naujo pradėti bendrinti su jumis šį failą.",
"Default encryption module" : "Numatytasis šifravimo modulis",
"Default encryption module for server-side encryption" : "Numatytas šifravimo modulis serverio šifravimui.",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Kad galėtumėte naudoti šį šifravimo modulį, turite įjungti serverio \n\t\tšifravimą administratoriaus nustatymuose. Įjungus šį modulį visi Jūsų failai bus užšifruoti\n\t\tŠifravimas pagrįstas AES 256 raktais.\n\t\tModulis užšifruos tik naujus failus, palikdamas senuosius taip kaip buvo iki šifravimo įjungimo.\n\t\tNeįmanoma išjungti šifravimą ir vėl sugrįžti prie nešifruojamos sistemos.\n\t\tPrieš nuspręsdami, atidžiai perskaitykite dokumentaciją, kad gerai suprastumėte visas šifravimo pasekmes.",
- "The share will expire on %s." : "Bendrinimo laikas pasibaigs %s.",
- "Cheers!" : "Sveikinimai!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programėlė yra įjungta, tačiau jūsų raktai nėra inicijuoti. Atsijunkite ir dar kartą prisijunkite",
"Encrypt the home storage" : "Šifruoti saugyklą",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Įjungus šią parinktį, bus užšifruoti visi pagrindinėje saugykloje saugomi failai. Priešingu atveju bus užšifruoti tik išorinėje saugykloje esantys failai",
"Enable recovery key" : "Naudoti atstatymo raktą",
"Disable recovery key" : "Nenaudoti atstatymo rakto",
- "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į.",
"Recovery key password" : "Atkrūimo rakto slaptažodis",
"Repeat recovery key password" : "Pakartokite atkūrimo rakto slaptažodį",
"Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
@@ -49,7 +45,6 @@
"Basic encryption module" : "Pagrindinis šifravimo modulis",
"Your private key password no longer matches your log-in password." : "Jūsų privačiojo rakto slaptažodis daugiau nebeatitinka jūsų prisijungimo slaptažodžio.",
"Set your old private key password to your current log-in password:" : "Nustatykite savo senąjį privačiojo rakto slaptažodį į savo dabartinį prisijungimo slaptažodį:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti sistemos administratoriaus atkurti jūsų duomenis.",
"Old log-in password" : "Senas prisijungimo slaptažodis",
"Current log-in password" : "Dabartinis prisijungimo slaptažodis",
"Update Private Key Password" : "Atnaujinti privačiojo rakto slaptažodį",
diff --git a/apps/encryption/l10n/lv.js b/apps/encryption/l10n/lv.js
index 8d334602392..b44cc20db29 100644
--- a/apps/encryption/l10n/lv.js
+++ b/apps/encryption/l10n/lv.js
@@ -2,35 +2,34 @@ 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",
"Missing Signature" : "Trūkst paraksta",
- "The share will expire on %s." : "Koplietošana beigsies %s.",
- "Cheers!" : "Priekā!",
- "Change Password" : "Mainīt paroli",
- "Your private key password no longer matches your log-in password." : "Jūsu privātās atslēgas parole vairs nesakrīt ar jūsu pieteikšanās paroli.",
- "Set your old private key password to your current log-in password:" : "Iestatiet savu veco privātās atslēgas paroli uz pašreizējo pieteikšanās paroli:",
+ "Change Password" : "Nomainīt paroli",
+ "Your private key password no longer matches your log-in password." : "Privātās atslēgas parole vairs nesakrīt ar pieteikšanās paroli.",
+ "Set your old private key password to your current log-in password:" : "Jānomaina sava vecā privātās atslēgas parole uz pašreizējo pieteikšanās paroli:",
"Old log-in password" : "Vecā pieteikšanās parole",
"Current log-in password" : "Pašreizējā pieteikšanās parole",
+ "Update Private Key Password" : "Atjaunināt privātās atslēgas paroli",
"Enable password recovery:" : "Iespējot paroles atjaunošanu:",
"Enabled" : "Pievienots",
"Disabled" : "Atspējots"
diff --git a/apps/encryption/l10n/lv.json b/apps/encryption/l10n/lv.json
index 81e041ae34e..42787888d86 100644
--- a/apps/encryption/l10n/lv.json
+++ b/apps/encryption/l10n/lv.json
@@ -1,34 +1,33 @@
{ "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",
"Missing Signature" : "Trūkst paraksta",
- "The share will expire on %s." : "Koplietošana beigsies %s.",
- "Cheers!" : "Priekā!",
- "Change Password" : "Mainīt paroli",
- "Your private key password no longer matches your log-in password." : "Jūsu privātās atslēgas parole vairs nesakrīt ar jūsu pieteikšanās paroli.",
- "Set your old private key password to your current log-in password:" : "Iestatiet savu veco privātās atslēgas paroli uz pašreizējo pieteikšanās paroli:",
+ "Change Password" : "Nomainīt paroli",
+ "Your private key password no longer matches your log-in password." : "Privātās atslēgas parole vairs nesakrīt ar pieteikšanās paroli.",
+ "Set your old private key password to your current log-in password:" : "Jānomaina sava vecā privātās atslēgas parole uz pašreizējo pieteikšanās paroli:",
"Old log-in password" : "Vecā pieteikšanās parole",
"Current log-in password" : "Pašreizējā pieteikšanās parole",
+ "Update Private Key Password" : "Atjaunināt privātās atslēgas paroli",
"Enable password recovery:" : "Iespējot paroles atjaunošanu:",
"Enabled" : "Pievienots",
"Disabled" : "Atspējots"
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 57800e9b473..65206e9e3a6 100644
--- a/apps/encryption/l10n/nb.js
+++ b/apps/encryption/l10n/nb.js
@@ -23,26 +23,26 @@ OC.L10N.register(
"Private key password successfully updated." : "Passord for privat nøkkel ble oppdatert.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-appen. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Krypteringappen er aktivert, men nøklene dine er ikke satt opp. Logg ut og inn igjen.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Skru på kryptering på serverdelen i innstillingene for å bruke krypteringsmodulen.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Skru på server-side-kryptering i innstillingene for å bruke krypteringsmodulen.",
"Encryption app is enabled and ready" : "Krypterings-appen er aktivert og klart",
"Bad Signature" : "Feil signatur",
"Missing Signature" : "Manglende signatur",
- "one-time password for server-side-encryption" : "engangspassord for kryptering på serverdelen",
+ "one-time password for server-side-encryption" : "engangspassord for server-side-kryptering",
+ "Encryption password" : "Krypteringspassord",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Administrasjonen aktiverte kryptering på serversiden. Filene dine ble kryptert med passordet <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Administrasjonen aktiverte kryptering på serversiden. Filene dine ble kryptert med passordet \"%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." : "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.",
"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 filen, kanskje fordi det er en delt fil. Be fileieren om å dele filen pånytt.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke lese denne filen, kanskje fordi det er en delt fil. Be fileieren om å dele filen pånytt.",
"Default encryption module" : "Standard krypteringsmodul",
- "Default encryption module for server-side encryption" : "Standard krypteringsmodul for kryptering på serverdelen",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "For å kunne bruke denne krypteringsmodulen må du kunne aktivere kryptering på serveren i administrasjonsinnstillingene. Når dette er aktivert vil modulen kryptere alle filene dine. Krypteringen er basert på AES 256-nøkler. Modulen vil ikke røre eksisterende filer, kun nye filer vil bli kryptert etter at dette ble aktivert. Det er heller ikke mulig å deaktivere krypteringen igjen for å bytte tilbake til et ukryptert system.\nVennligst les dokumentasjonen for å skjønne alle følgende før du bestemmer deg for å aktivere kryptering på serveren.",
- "Hey there,\n\nThe administration 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" : "Hei,\n\nAdministratoren har aktivert kryptering på serveren. Dine filer ble kryptert med passordet \"%s\".\n\nVennligst logg inn på nettgrensesnittet, gå til seksjonen \"Enkel krypteringsmodul\" i dine personlige innstillinger, og oppdater kryperingspassordet ditt ved å taste dette passordet i feltet \"Gammelt innloggingspassord\" og ditt nåværende passord for innlogging.\n\n",
- "The share will expire on %s." : "Delingen vil opphøre %s.",
- "Cheers!" : "Ha det!",
- "Hey there,<br><br>The administration 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>" : "Hei,<br><br>Administatoren har aktivert kryptering på serveren. Dine filer ble kryptert med passordet <strong>%s</strong>.<br><br>Vennligst logg inn på nettgrensesnittet, gå til seksjonen \"Enkel krypteringsmodul\" i dine personlige innstillinger, og oppdater kryperingspassordet ditt ved å taste dette passordet i feltet \"Gammelt innloggingspassord\" og ditt nåværende passord for innlogging.<br><br>",
+ "Default encryption module for server-side encryption" : "Standard krypteringsmodul for server-side-kryptering",
+ "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 å kunne bruke denne krypteringsmodulen må du aktivere kryptering på serversiden i administrasjonsinnstillingene. Når den er aktivert, vil denne modulen kryptere alle filene dine gjennomsiktig. Krypteringen er basert på AES 256-nøkler.\nModulen vil ikke berøre eksisterende filer, bare nye filer vil bli kryptert etter at kryptering på serversiden ble aktivert. Det er heller ikke mulig å deaktivere krypteringen igjen og bytte tilbake til et ukryptert system.\nLes dokumentasjonen for å vite alle implikasjoner før du bestemmer deg for å aktivere kryptering på serversiden.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Krypterings-appen er aktivert men nøklene dine er ikke satt opp. Logg ut og inn igjen.",
"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" : "Aktivering av dette valget krypterer alle filer som er lagret på hovedlageret. Ellers vil kun filer på eksterne lagre bli kryptert.",
"Enable recovery key" : "Aktiver gjenopprettingsnøkkel",
"Disable recovery key" : "Deaktiver gjenopprettingsnøkkel",
- "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.",
+ "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." : "Gjenopprettingsnøkkelen er en ekstra krypteringsnøkkel som brukes til å kryptere filer. Den brukes til å gjenopprette filer fra en konto hvis passordet er glemt.",
"Recovery key password" : "Passord for gjenopprettingsnøkkel",
"Repeat recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
"Change recovery key password:" : "Endre passord for gjenopprettingsnøkkel:",
@@ -53,7 +53,6 @@ OC.L10N.register(
"Basic encryption module" : "Grunnleggende krypteringsmodul",
"Your private key password no longer matches your log-in password." : "Passordet for din private nøkkel stemmer ikke lenger med påloggingspassordet ditt.",
"Set your old private key password to your current log-in password:" : "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine.",
"Old log-in password" : "Gammelt påloggingspassord",
"Current log-in password" : "Nåværende påloggingspassord",
"Update Private Key Password" : "Oppdater passord for privat nøkkel",
diff --git a/apps/encryption/l10n/nb.json b/apps/encryption/l10n/nb.json
index b7e1af7d22c..9f15088cc14 100644
--- a/apps/encryption/l10n/nb.json
+++ b/apps/encryption/l10n/nb.json
@@ -21,26 +21,26 @@
"Private key password successfully updated." : "Passord for privat nøkkel ble oppdatert.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-appen. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Krypteringappen er aktivert, men nøklene dine er ikke satt opp. Logg ut og inn igjen.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Skru på kryptering på serverdelen i innstillingene for å bruke krypteringsmodulen.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Skru på server-side-kryptering i innstillingene for å bruke krypteringsmodulen.",
"Encryption app is enabled and ready" : "Krypterings-appen er aktivert og klart",
"Bad Signature" : "Feil signatur",
"Missing Signature" : "Manglende signatur",
- "one-time password for server-side-encryption" : "engangspassord for kryptering på serverdelen",
+ "one-time password for server-side-encryption" : "engangspassord for server-side-kryptering",
+ "Encryption password" : "Krypteringspassord",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Administrasjonen aktiverte kryptering på serversiden. Filene dine ble kryptert med passordet <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Administrasjonen aktiverte kryptering på serversiden. Filene dine ble kryptert med passordet \"%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." : "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.",
"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 filen, kanskje fordi det er en delt fil. Be fileieren om å dele filen pånytt.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke lese denne filen, kanskje fordi det er en delt fil. Be fileieren om å dele filen pånytt.",
"Default encryption module" : "Standard krypteringsmodul",
- "Default encryption module for server-side encryption" : "Standard krypteringsmodul for kryptering på serverdelen",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "For å kunne bruke denne krypteringsmodulen må du kunne aktivere kryptering på serveren i administrasjonsinnstillingene. Når dette er aktivert vil modulen kryptere alle filene dine. Krypteringen er basert på AES 256-nøkler. Modulen vil ikke røre eksisterende filer, kun nye filer vil bli kryptert etter at dette ble aktivert. Det er heller ikke mulig å deaktivere krypteringen igjen for å bytte tilbake til et ukryptert system.\nVennligst les dokumentasjonen for å skjønne alle følgende før du bestemmer deg for å aktivere kryptering på serveren.",
- "Hey there,\n\nThe administration 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" : "Hei,\n\nAdministratoren har aktivert kryptering på serveren. Dine filer ble kryptert med passordet \"%s\".\n\nVennligst logg inn på nettgrensesnittet, gå til seksjonen \"Enkel krypteringsmodul\" i dine personlige innstillinger, og oppdater kryperingspassordet ditt ved å taste dette passordet i feltet \"Gammelt innloggingspassord\" og ditt nåværende passord for innlogging.\n\n",
- "The share will expire on %s." : "Delingen vil opphøre %s.",
- "Cheers!" : "Ha det!",
- "Hey there,<br><br>The administration 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>" : "Hei,<br><br>Administatoren har aktivert kryptering på serveren. Dine filer ble kryptert med passordet <strong>%s</strong>.<br><br>Vennligst logg inn på nettgrensesnittet, gå til seksjonen \"Enkel krypteringsmodul\" i dine personlige innstillinger, og oppdater kryperingspassordet ditt ved å taste dette passordet i feltet \"Gammelt innloggingspassord\" og ditt nåværende passord for innlogging.<br><br>",
+ "Default encryption module for server-side encryption" : "Standard krypteringsmodul for server-side-kryptering",
+ "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 å kunne bruke denne krypteringsmodulen må du aktivere kryptering på serversiden i administrasjonsinnstillingene. Når den er aktivert, vil denne modulen kryptere alle filene dine gjennomsiktig. Krypteringen er basert på AES 256-nøkler.\nModulen vil ikke berøre eksisterende filer, bare nye filer vil bli kryptert etter at kryptering på serversiden ble aktivert. Det er heller ikke mulig å deaktivere krypteringen igjen og bytte tilbake til et ukryptert system.\nLes dokumentasjonen for å vite alle implikasjoner før du bestemmer deg for å aktivere kryptering på serversiden.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Krypterings-appen er aktivert men nøklene dine er ikke satt opp. Logg ut og inn igjen.",
"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" : "Aktivering av dette valget krypterer alle filer som er lagret på hovedlageret. Ellers vil kun filer på eksterne lagre bli kryptert.",
"Enable recovery key" : "Aktiver gjenopprettingsnøkkel",
"Disable recovery key" : "Deaktiver gjenopprettingsnøkkel",
- "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.",
+ "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." : "Gjenopprettingsnøkkelen er en ekstra krypteringsnøkkel som brukes til å kryptere filer. Den brukes til å gjenopprette filer fra en konto hvis passordet er glemt.",
"Recovery key password" : "Passord for gjenopprettingsnøkkel",
"Repeat recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
"Change recovery key password:" : "Endre passord for gjenopprettingsnøkkel:",
@@ -51,7 +51,6 @@
"Basic encryption module" : "Grunnleggende krypteringsmodul",
"Your private key password no longer matches your log-in password." : "Passordet for din private nøkkel stemmer ikke lenger med påloggingspassordet ditt.",
"Set your old private key password to your current log-in password:" : "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine.",
"Old log-in password" : "Gammelt påloggingspassord",
"Current log-in password" : "Nåværende påloggingspassord",
"Update Private Key Password" : "Oppdater passord for privat nøkkel",
diff --git a/apps/encryption/l10n/nl.js b/apps/encryption/l10n/nl.js
index 8aeb676405b..967ff31dc12 100644
--- a/apps/encryption/l10n/nl.js
+++ b/apps/encryption/l10n/nl.js
@@ -21,28 +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",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Om deze cryptomodule te gebruiker moeten de volgende server-side aanpassingen worden gedaan\n\t\tversleuteling in de beheerinstellingen. Na inschakeling versleutelt deze module \n\t\tal je bestanden transparent. De versleuteling is gebaseerd op AES 256 sleutels.\n\t\tDe module raakt geen bestaande bestanden, alleen nieuwe bestanden worden versleuteld.\n\t\tNadat server-side crypto is ingeschakeld. Het is ook niet meer mogelijk\n\t\tom de versleuteling uit te zetten en terug te gaan naar een onversleuteld systeem.\n\t\tLees de documentatie om de gevolgen te kennen voordat je besluit\n\t\tserver-side versleuteling in te schakelen.",
- "Hey there,\n\nThe administration 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" : "Hallo daar,\n\nde beheerder heeft server-side versleuteling ingeschakeld. Je bestanden werden versleuteld met het wachtwoord \"%s\".\n\nLogin op de webinterface, ga naar \"Basis cryptomodule\" in je persoonlijke instellingen en pas je cryptowachtwoord aan door dit wachtwoord in het \"Oude inlog wachtwoord\" veld in te vullen alsmede in je huidige inlogwachtwoord.\n",
- "The share will expire on %s." : "De share vervalt op %s.",
- "Cheers!" : "Proficiat!",
- "Hey there,<br><br>The administration 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>" : "Hallo daar, <br><br>de beheerder heeft server-side versleuteling ingeschakeld. Je bestanden werden versleuteld met het wachtwoord <strong>%s</strong>.<br><br>Login op de webinterface, ga naar 'Bbasis cryptomodule' in je persoonlijke instellingen en pas je cryptowachtwoord aan door dit wachtwoord in het \"Oude inlog wachtwoord\" veld in te vullen alsmede in je huidige inlogwachtwoord.<br><br>",
+ "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 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.",
+ "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:",
@@ -50,10 +50,10 @@ OC.L10N.register(
"New recovery key password" : "Nieuwe wachtwoord herstelsleutel",
"Repeat new recovery key password" : "Herhaal nieuwe wachtwoord herstelsleutel",
"Change Password" : "Wijzigen wachtwoord",
- "Basic encryption module" : "Basis versleutelingsmodule",
+ "Basic encryption module" : "Basis-versleutelingsmodule",
"Your private key password no longer matches your log-in password." : "Het wachtwoord van je privésleutel komt niet meer overeen met je inlogwachtwoord.",
"Set your old private key password to your current log-in password:" : "Stel het wachtwoord van je oude privésleutel in op je huidige inlogwachtwoord.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Als je je oude wachtwoord niet meer weet, kun je de beheerder vragen je bestanden terug te halen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Als je je oude wachtwoord niet meer weet, kun je de beheerder vragen je bestanden te herstellen.",
"Old log-in password" : "Oude wachtwoord",
"Current log-in password" : "Huidige wachtwoord",
"Update Private Key Password" : "Bijwerken wachtwoord Privésleutel",
diff --git a/apps/encryption/l10n/nl.json b/apps/encryption/l10n/nl.json
index ab66fd4737b..b1b5e0f9d31 100644
--- a/apps/encryption/l10n/nl.json
+++ b/apps/encryption/l10n/nl.json
@@ -19,28 +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",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Om deze cryptomodule te gebruiker moeten de volgende server-side aanpassingen worden gedaan\n\t\tversleuteling in de beheerinstellingen. Na inschakeling versleutelt deze module \n\t\tal je bestanden transparent. De versleuteling is gebaseerd op AES 256 sleutels.\n\t\tDe module raakt geen bestaande bestanden, alleen nieuwe bestanden worden versleuteld.\n\t\tNadat server-side crypto is ingeschakeld. Het is ook niet meer mogelijk\n\t\tom de versleuteling uit te zetten en terug te gaan naar een onversleuteld systeem.\n\t\tLees de documentatie om de gevolgen te kennen voordat je besluit\n\t\tserver-side versleuteling in te schakelen.",
- "Hey there,\n\nThe administration 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" : "Hallo daar,\n\nde beheerder heeft server-side versleuteling ingeschakeld. Je bestanden werden versleuteld met het wachtwoord \"%s\".\n\nLogin op de webinterface, ga naar \"Basis cryptomodule\" in je persoonlijke instellingen en pas je cryptowachtwoord aan door dit wachtwoord in het \"Oude inlog wachtwoord\" veld in te vullen alsmede in je huidige inlogwachtwoord.\n",
- "The share will expire on %s." : "De share vervalt op %s.",
- "Cheers!" : "Proficiat!",
- "Hey there,<br><br>The administration 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>" : "Hallo daar, <br><br>de beheerder heeft server-side versleuteling ingeschakeld. Je bestanden werden versleuteld met het wachtwoord <strong>%s</strong>.<br><br>Login op de webinterface, ga naar 'Bbasis cryptomodule' in je persoonlijke instellingen en pas je cryptowachtwoord aan door dit wachtwoord in het \"Oude inlog wachtwoord\" veld in te vullen alsmede in je huidige inlogwachtwoord.<br><br>",
+ "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 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.",
+ "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:",
@@ -48,10 +48,10 @@
"New recovery key password" : "Nieuwe wachtwoord herstelsleutel",
"Repeat new recovery key password" : "Herhaal nieuwe wachtwoord herstelsleutel",
"Change Password" : "Wijzigen wachtwoord",
- "Basic encryption module" : "Basis versleutelingsmodule",
+ "Basic encryption module" : "Basis-versleutelingsmodule",
"Your private key password no longer matches your log-in password." : "Het wachtwoord van je privésleutel komt niet meer overeen met je inlogwachtwoord.",
"Set your old private key password to your current log-in password:" : "Stel het wachtwoord van je oude privésleutel in op je huidige inlogwachtwoord.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Als je je oude wachtwoord niet meer weet, kun je de beheerder vragen je bestanden terug te halen.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Als je je oude wachtwoord niet meer weet, kun je de beheerder vragen je bestanden te herstellen.",
"Old log-in password" : "Oude wachtwoord",
"Current log-in password" : "Huidige wachtwoord",
"Update Private Key Password" : "Bijwerken wachtwoord Privésleutel",
diff --git a/apps/encryption/l10n/oc.js b/apps/encryption/l10n/oc.js
deleted file mode 100644
index 30cae245932..00000000000
--- a/apps/encryption/l10n/oc.js
+++ /dev/null
@@ -1,59 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Missing recovery key password" : "Senhal de la clau de recuperacion mancant",
- "Please repeat the recovery key password" : "Repetètz lo senhal de la clau de recuperacion",
- "Repeated recovery key password does not match the provided recovery key password" : "Lo senhal de la clau de recuperacion e sa repeticion son pas identics.",
- "Recovery key successfully enabled" : "Clau de recuperacion activada amb succès",
- "Could not enable recovery key. Please check your recovery key password!" : "Impossible d'activar la clau de recuperacion. Verificatz lo senhal de vòstra clau de recuperacion !",
- "Recovery key successfully disabled" : "Clau de recuperacion desactivada amb succès",
- "Could not disable recovery key. Please check your recovery key password!" : "Impossible de desactivar la clau de recuperacion. Verificatz lo senhal de vòstra clau de recuperacion !",
- "Missing parameters" : "Paramètres mancants",
- "Please provide the old recovery password" : "Entratz l'ancian senhal de recuperacion",
- "Please provide a new recovery password" : "Entratz un novèl senhal de recuperacion",
- "Please repeat the new recovery password" : "Repetissètz lo novèl senhal de recuperacion",
- "Password successfully changed." : "Senhal cambiat amb succès.",
- "Could not change the password. Maybe the old password was not correct." : "Error al moment del cambiament de senhal. Benlèu que l'ancian senhal es incorrècte.",
- "Recovery Key disabled" : "Clau de recuperacion desactivada",
- "Recovery Key enabled" : "Clau de recuperacion activada",
- "Could not enable the recovery key, please try again or contact your administrator" : "Impossible d'activar la clau de recuperacion. Ensajatz tornamai o contactatz vòstre administrator",
- "Could not update the private key password." : "Impossible de metre a jorn lo senhal de la clau privada.",
- "The old password was not correct, please try again." : "L'ancian senhal es incorrècte. Ensajatz tornamai.",
- "The current log-in password was not correct, please try again." : "Lo senhal de connexion actual es pas corrècte, ensajatz tornamai.",
- "Private key password successfully updated." : "Senhal de la clau privada mes a jorn amb succès.",
- "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Vos cal migrar vòstras claus de chiframent de l'anciana version (ownCloud <= 8.0) cap a la novèla. Executatz 'occ encryption:migrate' o contactatz vòstre administrator",
- "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Vòstra clau privada pel chiframent es pas valida ! Metètz a jorn lo senhal de vòstra clau privada dins vòstres paramètres personals per recuperar l'accès a vòstres fichièrs chifrats.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicacion de chiframent es activada mas vòstras claus son pas inicializadas. Desconnectatz-vos e puèi reconnectatz-vos.",
- "Encryption App is enabled and ready" : "L'aplicacion de chiframent es activada e prèsta",
- "one-time password for server-side-encryption" : "Senhal d'usatge unic pel chiframent costat servidor",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de deschifrar aqueste fichièr : s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo partejar tornamai amb vos.",
- "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de legir aqueste fichièr, s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo repartejar amb vos. ",
- "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Bonjorn,\n\nL'administrator a activat lo chiframent sul servidor. Vòstres fichièrs son estats chifrats amb lo senhal seguent :\n\n%s\n\nSeguissètz aquelas instruccions :\n\n1. Connectatz-vos a l'interfàcia web e trobatz la seccion \"Modul de chiframent de basa d'\" dins vòstres paramètres personals ;\n\n2. Entratz lo senhal provesit çaisús dins lo camp \"Ancian senhal de connexion\";\n\n3. Entratz lo senhal qu'utilizatz actualament per vos connectar dins lo camp \"Senhal de connexion actual\" ;\n\n4. Validatz en clicant sul boton \"Metre a jorn lo senhal de vòstra clau privada\".\n",
- "The share will expire on %s." : "Lo partiment expirarà lo %s.",
- "Cheers!" : "A lèu !",
- "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Bonjorn,\n<br><br>\nL'administrator a activat lo chiframent sul servidor. Vòstres fichièrs son estats chifrats amb lo senhal seguent :\n\n<p style=\"font-family: monospace;\"><b>%s</b></p>\n\n<p>\nSeguissètz aquelas instruccions :\n<ol>\n<li>Connectatz-vos a l'interfàcia web e trobatz la seccion <em>\"Modul de chiframent de basa d'\"</em> dins vòstres paramètres personals;</li>\n<li>Entratz lo senhal provesit çaisús dins lo camp <em>\"Ancian senhal de connexion\"</em>;</li>\n<li>Entratz lo senhal qu'utilizatz actualament per vos connectar dins lo camp <em>\"Senhal de connexion actual\"</em>;</li>\n<li>Validatz en clicant sul boton <em>\"Metre a jorn lo senhal de vòstra clau privada\"</em>.</li>\n</ol>\n</p>",
- "Encrypt the home storage" : "Chifrar l'espaci d'emmagazinatge principal",
- "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "L'activacion d'aquesta opcion chifra totes los fichièrs de l'emmagazinatge principal, siquenon sols los espacis d'emmagazinatge extèrnes seràn chifrats",
- "Enable recovery key" : "Activar la clau de recuperacion",
- "Disable recovery key" : "Desactivar la clau de recuperacion",
- "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clau de recuperacion es una clau suplementària utilizada per chifrar los fichièrs. Permet de recuperar los fichièrs dels utilizaires se doblidan lor senhal.",
- "Recovery key password" : "Senhal de la clau de recuperacion",
- "Repeat recovery key password" : "Repetissètz lo senhal de la clau de recuperacion",
- "Change recovery key password:" : "Modificar lo senhal de la clau de recuperacion :",
- "Old recovery key password" : "Ancian senhal de la clau de recuperacion",
- "New recovery key password" : "Novèl senhal de la clau de recuperacion",
- "Repeat new recovery key password" : "Repetissètz lo novèl senhal de la clau de recuperacion",
- "Change Password" : "Cambiar de senhal",
- "basic encryption module" : "Modul de chiframent de basa d'",
- "Your private key password no longer matches your log-in password." : "Lo senhal de vòstra clau privada correspond pas mai a vòstre senhal de connexion.",
- "Set your old private key password to your current log-in password:" : "Fasètz de vòstre senhal de connexion lo senhal de vòstra clau privada :",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se vos remembratz pas mai de vòstre ancian senhal, podètz demandar a vòstre administrator de recuperar vòstres fichièrs.",
- "Old log-in password" : "Ancian senhal de connexion",
- "Current log-in password" : "Actual senhal de connexion",
- "Update Private Key Password" : "Metre a jorn lo senhal de vòstra clau privada",
- "Enable password recovery:" : "Activar la recuperacion del senhal :",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activar aquesta opcion vos permetrà d'obténer tornamai l'accès a vòstres fichièrs chifrats en cas de pèrda de senhal",
- "Enabled" : "Activat",
- "Disabled" : "Desactivat"
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/encryption/l10n/oc.json b/apps/encryption/l10n/oc.json
deleted file mode 100644
index 1773e6b7ef1..00000000000
--- a/apps/encryption/l10n/oc.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{ "translations": {
- "Missing recovery key password" : "Senhal de la clau de recuperacion mancant",
- "Please repeat the recovery key password" : "Repetètz lo senhal de la clau de recuperacion",
- "Repeated recovery key password does not match the provided recovery key password" : "Lo senhal de la clau de recuperacion e sa repeticion son pas identics.",
- "Recovery key successfully enabled" : "Clau de recuperacion activada amb succès",
- "Could not enable recovery key. Please check your recovery key password!" : "Impossible d'activar la clau de recuperacion. Verificatz lo senhal de vòstra clau de recuperacion !",
- "Recovery key successfully disabled" : "Clau de recuperacion desactivada amb succès",
- "Could not disable recovery key. Please check your recovery key password!" : "Impossible de desactivar la clau de recuperacion. Verificatz lo senhal de vòstra clau de recuperacion !",
- "Missing parameters" : "Paramètres mancants",
- "Please provide the old recovery password" : "Entratz l'ancian senhal de recuperacion",
- "Please provide a new recovery password" : "Entratz un novèl senhal de recuperacion",
- "Please repeat the new recovery password" : "Repetissètz lo novèl senhal de recuperacion",
- "Password successfully changed." : "Senhal cambiat amb succès.",
- "Could not change the password. Maybe the old password was not correct." : "Error al moment del cambiament de senhal. Benlèu que l'ancian senhal es incorrècte.",
- "Recovery Key disabled" : "Clau de recuperacion desactivada",
- "Recovery Key enabled" : "Clau de recuperacion activada",
- "Could not enable the recovery key, please try again or contact your administrator" : "Impossible d'activar la clau de recuperacion. Ensajatz tornamai o contactatz vòstre administrator",
- "Could not update the private key password." : "Impossible de metre a jorn lo senhal de la clau privada.",
- "The old password was not correct, please try again." : "L'ancian senhal es incorrècte. Ensajatz tornamai.",
- "The current log-in password was not correct, please try again." : "Lo senhal de connexion actual es pas corrècte, ensajatz tornamai.",
- "Private key password successfully updated." : "Senhal de la clau privada mes a jorn amb succès.",
- "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Vos cal migrar vòstras claus de chiframent de l'anciana version (ownCloud <= 8.0) cap a la novèla. Executatz 'occ encryption:migrate' o contactatz vòstre administrator",
- "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Vòstra clau privada pel chiframent es pas valida ! Metètz a jorn lo senhal de vòstra clau privada dins vòstres paramètres personals per recuperar l'accès a vòstres fichièrs chifrats.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicacion de chiframent es activada mas vòstras claus son pas inicializadas. Desconnectatz-vos e puèi reconnectatz-vos.",
- "Encryption App is enabled and ready" : "L'aplicacion de chiframent es activada e prèsta",
- "one-time password for server-side-encryption" : "Senhal d'usatge unic pel chiframent costat servidor",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de deschifrar aqueste fichièr : s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo partejar tornamai amb vos.",
- "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de legir aqueste fichièr, s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo repartejar amb vos. ",
- "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Bonjorn,\n\nL'administrator a activat lo chiframent sul servidor. Vòstres fichièrs son estats chifrats amb lo senhal seguent :\n\n%s\n\nSeguissètz aquelas instruccions :\n\n1. Connectatz-vos a l'interfàcia web e trobatz la seccion \"Modul de chiframent de basa d'\" dins vòstres paramètres personals ;\n\n2. Entratz lo senhal provesit çaisús dins lo camp \"Ancian senhal de connexion\";\n\n3. Entratz lo senhal qu'utilizatz actualament per vos connectar dins lo camp \"Senhal de connexion actual\" ;\n\n4. Validatz en clicant sul boton \"Metre a jorn lo senhal de vòstra clau privada\".\n",
- "The share will expire on %s." : "Lo partiment expirarà lo %s.",
- "Cheers!" : "A lèu !",
- "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Bonjorn,\n<br><br>\nL'administrator a activat lo chiframent sul servidor. Vòstres fichièrs son estats chifrats amb lo senhal seguent :\n\n<p style=\"font-family: monospace;\"><b>%s</b></p>\n\n<p>\nSeguissètz aquelas instruccions :\n<ol>\n<li>Connectatz-vos a l'interfàcia web e trobatz la seccion <em>\"Modul de chiframent de basa d'\"</em> dins vòstres paramètres personals;</li>\n<li>Entratz lo senhal provesit çaisús dins lo camp <em>\"Ancian senhal de connexion\"</em>;</li>\n<li>Entratz lo senhal qu'utilizatz actualament per vos connectar dins lo camp <em>\"Senhal de connexion actual\"</em>;</li>\n<li>Validatz en clicant sul boton <em>\"Metre a jorn lo senhal de vòstra clau privada\"</em>.</li>\n</ol>\n</p>",
- "Encrypt the home storage" : "Chifrar l'espaci d'emmagazinatge principal",
- "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "L'activacion d'aquesta opcion chifra totes los fichièrs de l'emmagazinatge principal, siquenon sols los espacis d'emmagazinatge extèrnes seràn chifrats",
- "Enable recovery key" : "Activar la clau de recuperacion",
- "Disable recovery key" : "Desactivar la clau de recuperacion",
- "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clau de recuperacion es una clau suplementària utilizada per chifrar los fichièrs. Permet de recuperar los fichièrs dels utilizaires se doblidan lor senhal.",
- "Recovery key password" : "Senhal de la clau de recuperacion",
- "Repeat recovery key password" : "Repetissètz lo senhal de la clau de recuperacion",
- "Change recovery key password:" : "Modificar lo senhal de la clau de recuperacion :",
- "Old recovery key password" : "Ancian senhal de la clau de recuperacion",
- "New recovery key password" : "Novèl senhal de la clau de recuperacion",
- "Repeat new recovery key password" : "Repetissètz lo novèl senhal de la clau de recuperacion",
- "Change Password" : "Cambiar de senhal",
- "basic encryption module" : "Modul de chiframent de basa d'",
- "Your private key password no longer matches your log-in password." : "Lo senhal de vòstra clau privada correspond pas mai a vòstre senhal de connexion.",
- "Set your old private key password to your current log-in password:" : "Fasètz de vòstre senhal de connexion lo senhal de vòstra clau privada :",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se vos remembratz pas mai de vòstre ancian senhal, podètz demandar a vòstre administrator de recuperar vòstres fichièrs.",
- "Old log-in password" : "Ancian senhal de connexion",
- "Current log-in password" : "Actual senhal de connexion",
- "Update Private Key Password" : "Metre a jorn lo senhal de vòstra clau privada",
- "Enable password recovery:" : "Activar la recuperacion del senhal :",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activar aquesta opcion vos permetrà d'obténer tornamai l'accès a vòstres fichièrs chifrats en cas de pèrda de senhal",
- "Enabled" : "Activat",
- "Disabled" : "Desactivat"
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/pl.js b/apps/encryption/l10n/pl.js
index 397a0e1ead0..67e73e93630 100644
--- a/apps/encryption/l10n/pl.js
+++ b/apps/encryption/l10n/pl.js
@@ -28,21 +28,21 @@ OC.L10N.register(
"Bad Signature" : "Zła sygnatura",
"Missing Signature" : "Brakująca sygnatura",
"one-time password for server-side-encryption" : "jednorazowe hasło do serwera szyfrowania strony",
+ "Encryption password" : "Hasło szyfrowania",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Administracja włączyła szyfrowanie po stronie serwera. Twoje pliki zostały zaszyfrowane z użyciem hasła <strong>%s</strong>",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Administracja włączyła szyfrowanie po stronie serwera. Twoje pliki zostały zaszyfrowane z użyciem hasła \"%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." : "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 Twój aktualny login.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nie można odszyfrować tego pliku, prawdopodobnie jest to plik udostępniony. Poproś właściciela pliku o ponowne udostępnienie pliku.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nie można odczytać tego pliku. Prawdopodobnie plik nie jest już udostępniony. Zwróć się do właściciela pliku, aby udostępnił go ponownie.",
"Default encryption module" : "Domyślny moduł szyfrowania",
"Default encryption module for server-side encryption" : "Domyślny moduł szyfrujący po stronie serwera",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Aby korzystać z modułu szyfrowania, musisz włączyć opcję po stronie serwera\n\t\tszyfrowanie w ustawieniach administratora. Po włączeniu opcji moduł będzie szyfrował\n\t\twszystkie Twoje pliki w sposób transparentny. Szyfrowanie oparte jest na kluczach AES 256.\n\t\tModuł nie będzie ingerował w istniejące pliki, tylko nowe pliki będą szyfrowane\n\t\tpo włączeniu szyfrowania po stronie serwera. Nie jest to również możliwe\n\t\tponownie wyłączenie szyfrowania i przełączenie z powrotem do niezaszyfrowanego systemu.\n\t\tPrzeczytaj dokumentację, aby zapoznać się ze wszystkimi konsekwencjami, zanim podejmiesz decyzję\n\t\to włączeniu szyfrowania po stronie serwera.",
- "Hey there,\n\nThe administration 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" : "Hej tam,\n\nAdministracja włączyła szyfrowanie po stronie serwera. Twoje pliki zostały zaszyfrowane przy użyciu hasła \"%s\".\n\nZaloguj się do interfejsu internetowego, przejdź do sekcji \"Podstawowy moduł szyfrowania\" w ustawieniach osobistych i zaktualizuj swoje hasło szyfrowania, wprowadzając je w polu \"Stare hasło logowania\" i bieżące hasło logowania.\n\n",
- "The share will expire on %s." : "Udostępnienie wygaśnie w %s.",
- "Cheers!" : "Dzięki!",
- "Hey there,<br><br>The administration 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>" : "Hej tam,<br><br>Administracja włączyła szyfrowanie po stronie serwera. Twoje pliki zostały zaszyfrowane przy użyciu hasła <strong>%s</strong>.<br><br>Zaloguj się do interfejsu internetowego, przejdź do sekcji \"Podstawowy moduł szyfrowania\" w ustawieniach osobistych i zaktualizuj swoje hasło szyfrowania, wprowadzając je w polu \"Stare hasło logowania\" i bieżące hasło logowania.<br><br>",
+ "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." : "Aby włączyć szyfrowanie musisz włączyć moduł szyfrowania danych po stronie serwera w ustawieniach administracyjnych. Szyfrowanie bazuje na kluczach AES 256.\nModuł szyfrowania nie zmienia istniejących plików. Po włączeniu szyfrowania po stronie serwera tylko nowe pliki zostaną zaszyfrowane . Po włączeniu szyfrowania nie ma możliwości wyłączenia szyfrowania oraz powrotu do nieszyfrowanego systemu.\nPrzeczytaj proszę uważnie dokumentację aby poznać wszystkie konsekwencje włączenie szyfrowania po stronie serwera.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Szyfrowanie w aplikacji jest włączone, ale klucze nie są zainicjowane. Prosimy wylogować się i ponownie zalogować się.",
"Encrypt the home storage" : "Zaszyfruj magazyn główny",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Włączenie tej opcji spowoduje szyfrowanie wszystkich plików zapisanych na pamięci wewnętrznej. W innym wypadku szyfrowane będą tylko pliki na pamięci zewnętrznej.",
"Enable recovery key" : "Włącz klucz odzyskiwania",
"Disable recovery key" : "Wyłącz klucz odzyskiwania",
- "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.",
+ "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." : "Klucz odzyskiwania to dodatkowy klucz szyfrowania używany do szyfrowania plików. Służy do odzyskiwania plików z konta w przypadku zapomnienia hasła.",
"Recovery key password" : "Hasło klucza odzyskiwania",
"Repeat recovery key password" : "Powtórz hasło klucza odzyskiwania",
"Change recovery key password:" : "Zmień hasło klucza odzyskiwania",
@@ -53,7 +53,6 @@ OC.L10N.register(
"Basic encryption module" : "Podstawowy moduł szyfrowania",
"Your private key password no longer matches your log-in password." : "Hasło Twojego klucza prywatnego nie pasuje już do Twojego hasła logowania.",
"Set your old private key password to your current log-in password:" : "Ustaw stare hasło klucza prywatnego na aktualne hasło logowania:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki.",
"Old log-in password" : "Stare hasło logowania",
"Current log-in password" : "Bieżące hasło logowania",
"Update Private Key Password" : "Aktualizacja hasła klucza prywatnego",
diff --git a/apps/encryption/l10n/pl.json b/apps/encryption/l10n/pl.json
index c2ff82acd06..07ade8d5052 100644
--- a/apps/encryption/l10n/pl.json
+++ b/apps/encryption/l10n/pl.json
@@ -26,21 +26,21 @@
"Bad Signature" : "Zła sygnatura",
"Missing Signature" : "Brakująca sygnatura",
"one-time password for server-side-encryption" : "jednorazowe hasło do serwera szyfrowania strony",
+ "Encryption password" : "Hasło szyfrowania",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Administracja włączyła szyfrowanie po stronie serwera. Twoje pliki zostały zaszyfrowane z użyciem hasła <strong>%s</strong>",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Administracja włączyła szyfrowanie po stronie serwera. Twoje pliki zostały zaszyfrowane z użyciem hasła \"%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." : "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 Twój aktualny login.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nie można odszyfrować tego pliku, prawdopodobnie jest to plik udostępniony. Poproś właściciela pliku o ponowne udostępnienie pliku.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nie można odczytać tego pliku. Prawdopodobnie plik nie jest już udostępniony. Zwróć się do właściciela pliku, aby udostępnił go ponownie.",
"Default encryption module" : "Domyślny moduł szyfrowania",
"Default encryption module for server-side encryption" : "Domyślny moduł szyfrujący po stronie serwera",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Aby korzystać z modułu szyfrowania, musisz włączyć opcję po stronie serwera\n\t\tszyfrowanie w ustawieniach administratora. Po włączeniu opcji moduł będzie szyfrował\n\t\twszystkie Twoje pliki w sposób transparentny. Szyfrowanie oparte jest na kluczach AES 256.\n\t\tModuł nie będzie ingerował w istniejące pliki, tylko nowe pliki będą szyfrowane\n\t\tpo włączeniu szyfrowania po stronie serwera. Nie jest to również możliwe\n\t\tponownie wyłączenie szyfrowania i przełączenie z powrotem do niezaszyfrowanego systemu.\n\t\tPrzeczytaj dokumentację, aby zapoznać się ze wszystkimi konsekwencjami, zanim podejmiesz decyzję\n\t\to włączeniu szyfrowania po stronie serwera.",
- "Hey there,\n\nThe administration 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" : "Hej tam,\n\nAdministracja włączyła szyfrowanie po stronie serwera. Twoje pliki zostały zaszyfrowane przy użyciu hasła \"%s\".\n\nZaloguj się do interfejsu internetowego, przejdź do sekcji \"Podstawowy moduł szyfrowania\" w ustawieniach osobistych i zaktualizuj swoje hasło szyfrowania, wprowadzając je w polu \"Stare hasło logowania\" i bieżące hasło logowania.\n\n",
- "The share will expire on %s." : "Udostępnienie wygaśnie w %s.",
- "Cheers!" : "Dzięki!",
- "Hey there,<br><br>The administration 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>" : "Hej tam,<br><br>Administracja włączyła szyfrowanie po stronie serwera. Twoje pliki zostały zaszyfrowane przy użyciu hasła <strong>%s</strong>.<br><br>Zaloguj się do interfejsu internetowego, przejdź do sekcji \"Podstawowy moduł szyfrowania\" w ustawieniach osobistych i zaktualizuj swoje hasło szyfrowania, wprowadzając je w polu \"Stare hasło logowania\" i bieżące hasło logowania.<br><br>",
+ "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." : "Aby włączyć szyfrowanie musisz włączyć moduł szyfrowania danych po stronie serwera w ustawieniach administracyjnych. Szyfrowanie bazuje na kluczach AES 256.\nModuł szyfrowania nie zmienia istniejących plików. Po włączeniu szyfrowania po stronie serwera tylko nowe pliki zostaną zaszyfrowane . Po włączeniu szyfrowania nie ma możliwości wyłączenia szyfrowania oraz powrotu do nieszyfrowanego systemu.\nPrzeczytaj proszę uważnie dokumentację aby poznać wszystkie konsekwencje włączenie szyfrowania po stronie serwera.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Szyfrowanie w aplikacji jest włączone, ale klucze nie są zainicjowane. Prosimy wylogować się i ponownie zalogować się.",
"Encrypt the home storage" : "Zaszyfruj magazyn główny",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Włączenie tej opcji spowoduje szyfrowanie wszystkich plików zapisanych na pamięci wewnętrznej. W innym wypadku szyfrowane będą tylko pliki na pamięci zewnętrznej.",
"Enable recovery key" : "Włącz klucz odzyskiwania",
"Disable recovery key" : "Wyłącz klucz odzyskiwania",
- "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.",
+ "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." : "Klucz odzyskiwania to dodatkowy klucz szyfrowania używany do szyfrowania plików. Służy do odzyskiwania plików z konta w przypadku zapomnienia hasła.",
"Recovery key password" : "Hasło klucza odzyskiwania",
"Repeat recovery key password" : "Powtórz hasło klucza odzyskiwania",
"Change recovery key password:" : "Zmień hasło klucza odzyskiwania",
@@ -51,7 +51,6 @@
"Basic encryption module" : "Podstawowy moduł szyfrowania",
"Your private key password no longer matches your log-in password." : "Hasło Twojego klucza prywatnego nie pasuje już do Twojego hasła logowania.",
"Set your old private key password to your current log-in password:" : "Ustaw stare hasło klucza prywatnego na aktualne hasło logowania:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki.",
"Old log-in password" : "Stare hasło logowania",
"Current log-in password" : "Bieżące hasło logowania",
"Update Private Key Password" : "Aktualizacja hasła klucza prywatnego",
diff --git a/apps/encryption/l10n/pt_BR.js b/apps/encryption/l10n/pt_BR.js
index 7a1596181fe..889683d62a3 100644
--- a/apps/encryption/l10n/pt_BR.js
+++ b/apps/encryption/l10n/pt_BR.js
@@ -28,21 +28,21 @@ OC.L10N.register(
"Bad Signature" : "Assinatura ruim",
"Missing Signature" : "Assinatura faltante",
"one-time password for server-side-encryption" : "senha de uso único para criptografia do lado do servidor",
- "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ê.",
+ "Encryption password" : "Senha de criptografia",
+ "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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Para usar este módulo de criptografia, é necessário ativar a criptografia do\n\t\tlado do servidor nas configurações. Ativada, este módulo irá criptografar\n\t\ttodos os arquivos. A criptografia é baseada em chaves AES 256.\n\t\tO módulo não tocará em arquivos existentes, apenas os novos serão\n\t\tcriptografados após a criptografia do lado do servidor ser ativada. É também\n\t\tpossível desativar a criptografia e voltar a um sistema não criptografado.\n\t\tLeia a documentação para saber todas as implicações antes de decidir\n\t\tativar a criptografia do lado do servidor.",
- "Hey there,\n\nThe administration 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" : "Olá,\n\nA administração habilitou a criptografia do lado do servidor. Seus arquivos foram criptografados com a senha \"%s\".\n\nFaça login na interface da web, vá para a seção \"Módulo de criptografia básico\" de suas configurações pessoais e atualize sua senha de criptografia inserindo essa senha no campo \"Senha de login antiga\" e sua senha de login atual. \n\n",
- "The share will expire on %s." : "O compartilhamento irá expirar em %s.",
- "Cheers!" : "Saudações!",
- "Hey there,<br><br>The administration 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>" : "Olá,<br><br>A administração habilitou a criptografia do lado do servidor. Seus arquivos foram criptografados com a senha<strong>%s</strong>.<br><br>Faça login na interface da web, vá para a seção \"Módulo de criptografia básico\" de suas configurações pessoais e atualize sua senha de criptografia inserindo essa senha no campo \"Senha de login antiga\" e sua senha de login atual. <br><br>",
+ "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 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.",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "A chave de recuperação é uma chave de criptografia adicional usada para criptografar arquivos. É usado para recuperar arquivos de uma conta se a senha for esquecida.",
"Recovery key password" : "Senha da chave de recuperação",
"Repeat recovery key password" : "Repita a senha da chave de recuperação",
"Change recovery key password:" : "Mudar a senha da chave de recuperação:",
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de criptografia básico",
"Your private key password no longer matches your log-in password." : "A sua senha de chave privada não corresponde a sua senha de login.",
"Set your old private key password to your current log-in password:" : "Defina a sua senha antiga da chave privada para sua senha de login atual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se você não se lembra de sua senha antiga você pode pedir ao administrador que recupere seus arquivos.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Se não se lembrar da senha antiga, peça ao administrador para recuperar seus arquivos.",
"Old log-in password" : "Senha antiga de login",
"Current log-in password" : "Senha atual de login",
"Update Private Key Password" : "Atualizar senha da chave privada",
diff --git a/apps/encryption/l10n/pt_BR.json b/apps/encryption/l10n/pt_BR.json
index 5bd87ed609a..202915f2284 100644
--- a/apps/encryption/l10n/pt_BR.json
+++ b/apps/encryption/l10n/pt_BR.json
@@ -26,21 +26,21 @@
"Bad Signature" : "Assinatura ruim",
"Missing Signature" : "Assinatura faltante",
"one-time password for server-side-encryption" : "senha de uso único para criptografia do lado do servidor",
- "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ê.",
+ "Encryption password" : "Senha de criptografia",
+ "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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Para usar este módulo de criptografia, é necessário ativar a criptografia do\n\t\tlado do servidor nas configurações. Ativada, este módulo irá criptografar\n\t\ttodos os arquivos. A criptografia é baseada em chaves AES 256.\n\t\tO módulo não tocará em arquivos existentes, apenas os novos serão\n\t\tcriptografados após a criptografia do lado do servidor ser ativada. É também\n\t\tpossível desativar a criptografia e voltar a um sistema não criptografado.\n\t\tLeia a documentação para saber todas as implicações antes de decidir\n\t\tativar a criptografia do lado do servidor.",
- "Hey there,\n\nThe administration 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" : "Olá,\n\nA administração habilitou a criptografia do lado do servidor. Seus arquivos foram criptografados com a senha \"%s\".\n\nFaça login na interface da web, vá para a seção \"Módulo de criptografia básico\" de suas configurações pessoais e atualize sua senha de criptografia inserindo essa senha no campo \"Senha de login antiga\" e sua senha de login atual. \n\n",
- "The share will expire on %s." : "O compartilhamento irá expirar em %s.",
- "Cheers!" : "Saudações!",
- "Hey there,<br><br>The administration 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>" : "Olá,<br><br>A administração habilitou a criptografia do lado do servidor. Seus arquivos foram criptografados com a senha<strong>%s</strong>.<br><br>Faça login na interface da web, vá para a seção \"Módulo de criptografia básico\" de suas configurações pessoais e atualize sua senha de criptografia inserindo essa senha no campo \"Senha de login antiga\" e sua senha de login atual. <br><br>",
+ "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 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.",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "A chave de recuperação é uma chave de criptografia adicional usada para criptografar arquivos. É usado para recuperar arquivos de uma conta se a senha for esquecida.",
"Recovery key password" : "Senha da chave de recuperação",
"Repeat recovery key password" : "Repita a senha da chave de recuperação",
"Change recovery key password:" : "Mudar a senha da chave de recuperação:",
@@ -51,7 +51,7 @@
"Basic encryption module" : "Módulo de criptografia básico",
"Your private key password no longer matches your log-in password." : "A sua senha de chave privada não corresponde a sua senha de login.",
"Set your old private key password to your current log-in password:" : "Defina a sua senha antiga da chave privada para sua senha de login atual:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se você não se lembra de sua senha antiga você pode pedir ao administrador que recupere seus arquivos.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Se não se lembrar da senha antiga, peça ao administrador para recuperar seus arquivos.",
"Old log-in password" : "Senha antiga de login",
"Current log-in password" : "Senha atual de login",
"Update Private Key Password" : "Atualizar senha da chave privada",
diff --git a/apps/encryption/l10n/pt_PT.js b/apps/encryption/l10n/pt_PT.js
index c3d3d709737..0e5e9c6811a 100644
--- a/apps/encryption/l10n/pt_PT.js
+++ b/apps/encryption/l10n/pt_PT.js
@@ -21,24 +21,20 @@ 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",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Para usar este módulo de encriptação, você precisa ativar a encriptação do lado do servidor\n\t\t nas configurações de administrador. Uma vez ativado, este módulo encriptará\n\t\t todos os seus ficheiros de forma transparente. A encriptação é baseada em chaves AES 256.\n\t\t O módulo não tocará nos ficheiros existentes, apenas os novos serão encriptados\n\t\t depois da encriptação do lado do servidor ser ativada. Também não é possível\n\t\t desativar a encriptação novamente e voltar para um sistema não encriptado.\n\t\tPor favor leia a documentação para conhecer todas as implicações antes de decidir\n\t\tativar a encriptação no servidor.",
- "The share will expire on %s." : "Esta partilha irá expirar em %s.",
- "Cheers!" : "Parabéns!",
- "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",
"Disable recovery key" : "Desativar a chave de recuperação",
- "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.",
"Recovery key password" : "Palavra-passe da chave de recuperação",
"Repeat recovery key password" : "Repetir a palavra-passe da chave de recuperação",
"Change recovery key password:" : "Alterar a palavra-passe da chave de recuperação:",
@@ -49,7 +45,6 @@ OC.L10N.register(
"Basic encryption module" : "Módulo de cifra básica",
"Your private key password no longer matches your log-in password." : "A palavra-passe da sua chave privada já não coincide com a palavra-passe da sua sessão.",
"Set your old private key password to your current log-in password:" : "Defina a sua palavra-passe antiga da chave privada para a sua palavra-passe atual da sessão:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se não se lembra da palavra-passe antiga pode pedir ao seu administrador para recuperar os seus ficheiros. ",
"Old log-in password" : "Palavra-passe antiga da sessão",
"Current log-in password" : "Palavra-passe atual da sessão",
"Update Private Key Password" : "Atualizar Palavra-passe da Chave Privada ",
diff --git a/apps/encryption/l10n/pt_PT.json b/apps/encryption/l10n/pt_PT.json
index 306cd994fec..fac953c91b1 100644
--- a/apps/encryption/l10n/pt_PT.json
+++ b/apps/encryption/l10n/pt_PT.json
@@ -19,24 +19,20 @@
"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",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Para usar este módulo de encriptação, você precisa ativar a encriptação do lado do servidor\n\t\t nas configurações de administrador. Uma vez ativado, este módulo encriptará\n\t\t todos os seus ficheiros de forma transparente. A encriptação é baseada em chaves AES 256.\n\t\t O módulo não tocará nos ficheiros existentes, apenas os novos serão encriptados\n\t\t depois da encriptação do lado do servidor ser ativada. Também não é possível\n\t\t desativar a encriptação novamente e voltar para um sistema não encriptado.\n\t\tPor favor leia a documentação para conhecer todas as implicações antes de decidir\n\t\tativar a encriptação no servidor.",
- "The share will expire on %s." : "Esta partilha irá expirar em %s.",
- "Cheers!" : "Parabéns!",
- "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",
"Disable recovery key" : "Desativar a chave de recuperação",
- "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.",
"Recovery key password" : "Palavra-passe da chave de recuperação",
"Repeat recovery key password" : "Repetir a palavra-passe da chave de recuperação",
"Change recovery key password:" : "Alterar a palavra-passe da chave de recuperação:",
@@ -47,7 +43,6 @@
"Basic encryption module" : "Módulo de cifra básica",
"Your private key password no longer matches your log-in password." : "A palavra-passe da sua chave privada já não coincide com a palavra-passe da sua sessão.",
"Set your old private key password to your current log-in password:" : "Defina a sua palavra-passe antiga da chave privada para a sua palavra-passe atual da sessão:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Se não se lembra da palavra-passe antiga pode pedir ao seu administrador para recuperar os seus ficheiros. ",
"Old log-in password" : "Palavra-passe antiga da sessão",
"Current log-in password" : "Palavra-passe atual da sessão",
"Update Private Key Password" : "Atualizar Palavra-passe da Chave Privada ",
diff --git a/apps/encryption/l10n/ro.js b/apps/encryption/l10n/ro.js
index 030f12525db..e94b973e1e5 100644
--- a/apps/encryption/l10n/ro.js
+++ b/apps/encryption/l10n/ro.js
@@ -29,8 +29,6 @@ OC.L10N.register(
"Missing Signature" : "Semnătură lipsă",
"Default encryption module" : "Modulul implicit de criptare",
"Default encryption module for server-side encryption" : "Modulul implicit de criptare pentru criptarea pe server",
- "The share will expire on %s." : "Partajarea va expira în data de %s.",
- "Cheers!" : "Noroc!",
"Enable recovery key" : "Activează cheia de recuperare",
"Disable recovery key" : "Dezactivează cheia de recuperare",
"Recovery key password" : "Parola cheii de recuperare",
diff --git a/apps/encryption/l10n/ro.json b/apps/encryption/l10n/ro.json
index 58e7822115b..9f0580a709b 100644
--- a/apps/encryption/l10n/ro.json
+++ b/apps/encryption/l10n/ro.json
@@ -27,8 +27,6 @@
"Missing Signature" : "Semnătură lipsă",
"Default encryption module" : "Modulul implicit de criptare",
"Default encryption module for server-side encryption" : "Modulul implicit de criptare pentru criptarea pe server",
- "The share will expire on %s." : "Partajarea va expira în data de %s.",
- "Cheers!" : "Noroc!",
"Enable recovery key" : "Activează cheia de recuperare",
"Disable recovery key" : "Dezactivează cheia de recuperare",
"Recovery key password" : "Parola cheii de recuperare",
diff --git a/apps/encryption/l10n/ru.js b/apps/encryption/l10n/ru.js
index 3f2a525a4f8..0dfc75febf7 100644
--- a/apps/encryption/l10n/ru.js
+++ b/apps/encryption/l10n/ru.js
@@ -28,21 +28,21 @@ OC.L10N.register(
"Bad Signature" : "Неверная подпись",
"Missing Signature" : "Подпись отсутствует",
"one-time password for server-side-encryption" : "одноразовый пароль для шифрования на стороне сервера",
+ "Encryption password" : "Пароль шифрования",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Администратор включил шифрование на стороне сервера. Ваши файлы были зашифрованы с помощью пароля <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Администратор включил шифрование на стороне сервера. Ваши файлы были зашифрованы с помощью пароля \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Пожалуйста, войдите в веб-интерфейс, перейдите в раздел \"Безопасность\" ваших личных настроек и обновите свой пароль шифрования, введя этот пароль в поле \"Старый пароль для входа\" и ваш текущий логин/пароль.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удаётся расшифровать этот файл, вероятно, это файл общего доступа. Пожалуйста, попросите владельца файла предоставить доступ повторно.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не могу прочитать этот файл, вероятно, это общий файл. Пожалуйста, попросите владельца файла повторно поделиться им с вами.",
"Default encryption module" : "Модуль шифрования по умолчанию",
"Default encryption module for server-side encryption" : "Используемый по умолчанию модуль для шифрования данных на сервере",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Перед началом использования использования необходимо включить этот модуль в разделе «Администрирование». Включённый модуль выполняет прозрачное шифрование файлов. Шифрование основано на алгоритме AES 256. Модуль не изменяет существующие файлы, шифруются только файлы, создаваемые после включения шифрования. Также невозможно отключить шифрование и вернуться к незашифрованной системе. Перед включением шифрования обязательно ознакомьтесь с документацией, чтобы узнать все последствия такого действия.",
- "Hey there,\n\nThe administration 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" : "Привет,\n\nАдминистрация включила шифрование на стороне сервера. Ваши файлы были зашифрованы с помощью пароля \"%s\".\n\nПожалуйста, войдите в веб-интерфейс, перейдите в раздел \"Основной модуль шифрования\" ваших персональных настроек и обновите пароль шифрования, введя этот пароль в поле \"Старый пароль для входа\" и ваш текущий пароль для входа.\n\n",
- "The share will expire on %s." : "Доступ будет закрыт %s",
- "Cheers!" : "Всего наилучшего!",
- "Hey there,<br><br>The administration 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>" : "Привет, <br><br>Администрация включила шифрование на стороне сервера. Ваши файлы были зашифрованы с помощью пароля <strong>%s</strong>.<br><br>Пожалуйста, войдите в веб-интерфейс, перейдите в раздел \"Основной модуль шифрования\" ваших личных настроек и обновите пароль шифрования, введя этот пароль в поле \"Старый пароль для входа\" и ваш текущий пароль для входа.<br><br>",
+ "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 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 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:" : "Смена пароля ключа восстановления:",
@@ -53,7 +53,6 @@ OC.L10N.register(
"Basic encryption module" : "Базовый модуль шифрования",
"Your private key password no longer matches your log-in password." : "Пароль закрытого ключа больше не соответствует паролю вашей учетной записи.",
"Set your old private key password to your current log-in password:" : "Замените старый пароль закрытого ключа на текущий пароль учётной записи.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы",
"Old log-in password" : "Старый пароль учётной записи",
"Current log-in password" : "Текущий пароль учётной записи",
"Update Private Key Password" : "Обновить пароль закрытого ключа",
diff --git a/apps/encryption/l10n/ru.json b/apps/encryption/l10n/ru.json
index 67f1976f63f..8fd6a52d1b6 100644
--- a/apps/encryption/l10n/ru.json
+++ b/apps/encryption/l10n/ru.json
@@ -26,21 +26,21 @@
"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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Перед началом использования использования необходимо включить этот модуль в разделе «Администрирование». Включённый модуль выполняет прозрачное шифрование файлов. Шифрование основано на алгоритме AES 256. Модуль не изменяет существующие файлы, шифруются только файлы, создаваемые после включения шифрования. Также невозможно отключить шифрование и вернуться к незашифрованной системе. Перед включением шифрования обязательно ознакомьтесь с документацией, чтобы узнать все последствия такого действия.",
- "Hey there,\n\nThe administration 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" : "Привет,\n\nАдминистрация включила шифрование на стороне сервера. Ваши файлы были зашифрованы с помощью пароля \"%s\".\n\nПожалуйста, войдите в веб-интерфейс, перейдите в раздел \"Основной модуль шифрования\" ваших персональных настроек и обновите пароль шифрования, введя этот пароль в поле \"Старый пароль для входа\" и ваш текущий пароль для входа.\n\n",
- "The share will expire on %s." : "Доступ будет закрыт %s",
- "Cheers!" : "Всего наилучшего!",
- "Hey there,<br><br>The administration 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>" : "Привет, <br><br>Администрация включила шифрование на стороне сервера. Ваши файлы были зашифрованы с помощью пароля <strong>%s</strong>.<br><br>Пожалуйста, войдите в веб-интерфейс, перейдите в раздел \"Основной модуль шифрования\" ваших личных настроек и обновите пароль шифрования, введя этот пароль в поле \"Старый пароль для входа\" и ваш текущий пароль для входа.<br><br>",
+ "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 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 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:" : "Смена пароля ключа восстановления:",
@@ -51,7 +51,6 @@
"Basic encryption module" : "Базовый модуль шифрования",
"Your private key password no longer matches your log-in password." : "Пароль закрытого ключа больше не соответствует паролю вашей учетной записи.",
"Set your old private key password to your current log-in password:" : "Замените старый пароль закрытого ключа на текущий пароль учётной записи.",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы",
"Old log-in password" : "Старый пароль учётной записи",
"Current log-in password" : "Текущий пароль учётной записи",
"Update Private Key Password" : "Обновить пароль закрытого ключа",
diff --git a/apps/encryption/l10n/sc.js b/apps/encryption/l10n/sc.js
index 3af9ae392ad..3e304bf9b75 100644
--- a/apps/encryption/l10n/sc.js
+++ b/apps/encryption/l10n/sc.js
@@ -21,9 +21,9 @@ OC.L10N.register(
"The old password was not correct, please try again." : "Sa crae betza non fiat curreta, proa torra.",
"The current log-in password was not correct, please try again." : "Sa crae de atzessu noa non fiat curreta, proa torra.",
"Private key password successfully updated." : "S'agiornamentu de sa crae est resèssidu.",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Crae privada non bàlida pro s'aplicatzione de tzifradura. Agiorna sa crae privada in is impostatziones personales pro ripristinare s'atzessu a is archìvios tuos tztifrados.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Crae privada non bàlida pro s'aplicatzione de tzifradura. Agiorna sa crae privada in sa cunfiguratzione personale pro ripristinare s'atzessu a is archìvios tuos tztifrados.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "S'aplicatzione de tzifradura est abilitada, ma is craes non sunt istadas inghitzadas. Disconnète·ti e faghè torra s'atzessu.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Abìlita sa tzifradura dae s'ala de su serbidore in is impostatziones de amministratzione pro impreare su mòdulu de tzifradura.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Abilita sa tzifradura dae s'ala de su serbidore in sa cunfiguratzione de amministratzione pro impreare su mòdulu de tzifradura.",
"Encryption app is enabled and ready" : "S'aplicatzione de tzifradura est ativada e pronta ",
"Bad Signature" : "Firma isballiada",
"Missing Signature" : "Fartat sa firma",
@@ -32,15 +32,11 @@ OC.L10N.register(
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non faghet a detzifrare custu archìviu, podet dare chi siat un'archìviu cumpartzidu. Pedi a su mere de s'archìviu de torrare a cumpartzire s'archìviu cun tegus.",
"Default encryption module" : " Mòdulu de tzifradura predefinidu",
"Default encryption module for server-side encryption" : " Mòdulu de tzifradura predefinidu pro sa tzifradura a s'ala de su serbidore",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Pro impreare custu mòdulu de tzifradura, tocat de ativare sa tzifradura lato server\n\t\tin is impostatziones de amministratzione. Una borta chi est ativadu, custu mòdulu\n\t\tat a tzifrare totu is archìvios in manera trasparente. Sa tzifradura est basada subra de craes AES 256..\n\t\tSu mòdulu no at a interessare is archìvios chi bi sunt, isceti is noos s'ant a tzifrare a pustis\n\t\ts'abilitatzione de sa tzifradura a s'ala de su serbidore. Non faghet a torrare a disativare\n\t\tsa tzifradura e a torrare a unu sistema tzifradu. Leghe sa\n\t\tdocumentatzione pro connòschere totu is implicatziones in antis de detzìdere de ativare\n\t\tsa tzifradura a s'ala de su serbidore.",
- "The share will expire on %s." : "Sa cumpartzidura si nch'at a iscàdere su %s.",
- "Cheers!" : "Salude!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicatzione de tzifradura est ativada ma is craes tuas non sunt inghitzadas, essi·nche e torra·nche a intrare",
"Encrypt the home storage" : "Tzifra s'archiviatzione printzipale",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : " S'abilitatzione de custu sèberu tzifrat totu is archìvios memorizados in s'archiviatzione printzipale, sinunca ant a èssere tzifrados isceti is archìvios in s'archiviatzione de foras.",
"Enable recovery key" : "Ativa sa crae de riprìstinu",
"Disable recovery key" : "Disativa sa crae de riprìstinu",
- "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.",
"Recovery key password" : "Crae de sa crae de riprìstinu",
"Repeat recovery key password" : "Torra a insertare sa crae de riprìstinu",
"Change recovery key password:" : "Càmbia sa crae de rirprìstinu",
@@ -50,8 +46,7 @@ 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",
diff --git a/apps/encryption/l10n/sc.json b/apps/encryption/l10n/sc.json
index 5c6190f1ffa..8e92fa18aa2 100644
--- a/apps/encryption/l10n/sc.json
+++ b/apps/encryption/l10n/sc.json
@@ -19,9 +19,9 @@
"The old password was not correct, please try again." : "Sa crae betza non fiat curreta, proa torra.",
"The current log-in password was not correct, please try again." : "Sa crae de atzessu noa non fiat curreta, proa torra.",
"Private key password successfully updated." : "S'agiornamentu de sa crae est resèssidu.",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Crae privada non bàlida pro s'aplicatzione de tzifradura. Agiorna sa crae privada in is impostatziones personales pro ripristinare s'atzessu a is archìvios tuos tztifrados.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Crae privada non bàlida pro s'aplicatzione de tzifradura. Agiorna sa crae privada in sa cunfiguratzione personale pro ripristinare s'atzessu a is archìvios tuos tztifrados.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "S'aplicatzione de tzifradura est abilitada, ma is craes non sunt istadas inghitzadas. Disconnète·ti e faghè torra s'atzessu.",
- "Please enable server side encryption in the admin settings in order to use the encryption module." : "Abìlita sa tzifradura dae s'ala de su serbidore in is impostatziones de amministratzione pro impreare su mòdulu de tzifradura.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Abilita sa tzifradura dae s'ala de su serbidore in sa cunfiguratzione de amministratzione pro impreare su mòdulu de tzifradura.",
"Encryption app is enabled and ready" : "S'aplicatzione de tzifradura est ativada e pronta ",
"Bad Signature" : "Firma isballiada",
"Missing Signature" : "Fartat sa firma",
@@ -30,15 +30,11 @@
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non faghet a detzifrare custu archìviu, podet dare chi siat un'archìviu cumpartzidu. Pedi a su mere de s'archìviu de torrare a cumpartzire s'archìviu cun tegus.",
"Default encryption module" : " Mòdulu de tzifradura predefinidu",
"Default encryption module for server-side encryption" : " Mòdulu de tzifradura predefinidu pro sa tzifradura a s'ala de su serbidore",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Pro impreare custu mòdulu de tzifradura, tocat de ativare sa tzifradura lato server\n\t\tin is impostatziones de amministratzione. Una borta chi est ativadu, custu mòdulu\n\t\tat a tzifrare totu is archìvios in manera trasparente. Sa tzifradura est basada subra de craes AES 256..\n\t\tSu mòdulu no at a interessare is archìvios chi bi sunt, isceti is noos s'ant a tzifrare a pustis\n\t\ts'abilitatzione de sa tzifradura a s'ala de su serbidore. Non faghet a torrare a disativare\n\t\tsa tzifradura e a torrare a unu sistema tzifradu. Leghe sa\n\t\tdocumentatzione pro connòschere totu is implicatziones in antis de detzìdere de ativare\n\t\tsa tzifradura a s'ala de su serbidore.",
- "The share will expire on %s." : "Sa cumpartzidura si nch'at a iscàdere su %s.",
- "Cheers!" : "Salude!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicatzione de tzifradura est ativada ma is craes tuas non sunt inghitzadas, essi·nche e torra·nche a intrare",
"Encrypt the home storage" : "Tzifra s'archiviatzione printzipale",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : " S'abilitatzione de custu sèberu tzifrat totu is archìvios memorizados in s'archiviatzione printzipale, sinunca ant a èssere tzifrados isceti is archìvios in s'archiviatzione de foras.",
"Enable recovery key" : "Ativa sa crae de riprìstinu",
"Disable recovery key" : "Disativa sa crae de riprìstinu",
- "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.",
"Recovery key password" : "Crae de sa crae de riprìstinu",
"Repeat recovery key password" : "Torra a insertare sa crae de riprìstinu",
"Change recovery key password:" : "Càmbia sa crae de rirprìstinu",
@@ -48,8 +44,7 @@
"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",
diff --git a/apps/encryption/l10n/sk.js b/apps/encryption/l10n/sk.js
index 4988a8c653d..768183a8057 100644
--- a/apps/encryption/l10n/sk.js
+++ b/apps/encryption/l10n/sk.js
@@ -28,21 +28,21 @@ OC.L10N.register(
"Bad Signature" : "Zlý podpis",
"Missing Signature" : "Chýbajúci podpis",
"one-time password for server-side-encryption" : "jednorazové heslo na šifrovanie na strane servera",
+ "Encryption password" : "Heslo pre šifrovanie",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Administrácia povolila šifrovanie na strane servera. Vaše súbory boli zašifrované pomocou hesla <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Administrácia povolila šifrovanie na strane servera. Vaše súbory boli zašifrované pomocou hesla \"%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." : "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.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor nie je možné rozšifrovať, môže ísť o súbor zdieľaný iným užívateľom. Požiadajte majiteľa súboru, aby vám ho zozdieľal ešte raz.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor nie je možné prečítať, môže ísť o súbor zdieľaný iným užívateľom. Požiadajte majiteľa súboru, aby vám ho zozdieľal ešte raz.",
"Default encryption module" : "Predvolený šifrovací modul",
"Default encryption module for server-side encryption" : "Predvolený šifrovací modul pre šifrovanie na strane servra",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Pre použitie tohoto šifrovacieho modulu musíte povoliť šifrovanie\n\t\t na strane servra v správcovských nastaveniach. Po povolení tento modul zašifruje\n\t\ttransparentne všetky vaše súbory. Šifrovanie je založené na kľúčoch AES 256.\n\t\tModul nezmení existujúce súbory, zašifrované budú iba nové súbory\n\t\tpo povolení šifrovania na strane servra. Šifrovanie nieje možné opätovne\n\t\t vypnúť a prepnúť naspäť do nešifroveného systému.\n\t\tPred rozhodnutím povoliť ifrovanie na strane servra\n\t\tsi prosím prečítajte dokumentáciu aby ste poznali všetky dôsledky.",
- "Hey there,\n\nThe administration 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" : "Dobrý deň,\n\nAdministrácia povolila šifrovanie na strane servera. Vaše súbory boli zašifrované pomocou hesla „%s“.\n\nPrihláste sa do webového rozhrania, prejdite do sekcie „Základný šifrovací modul“ vo svojich osobných nastaveniach a aktualizujte svoje šifrovacie heslo zadaním tohto hesla do poľa „Staré prihlasovacie heslo“ a svojho aktuálneho prihlasovacieho hesla.\n\n",
- "The share will expire on %s." : "Sprístupnenie vyprší %s.",
- "Cheers!" : "Pekný deň!",
- "Hey there,<br><br>The administration 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>" : "Dobrý deň,<br><br>Administrátor povolil šifrovanie na strane servera. Vaše súbory boli zašifrované pomocou hesla <strong>%s</strong>.<br><br>Prihláste sa prosím cez webový prehliadač, choďte do sekcie základného šifrovacieho modulu v osobných nastaveniach a zadajte horeuvedené heslo do políčka 'staré prihlasovacie heslo' a vaše súčasné prihlasovacie heslo.<br><br>",
+ "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." : "Pre použitie tohoto šifrovacieho modulu musíte povoliť šifrovanie na strane servra v nastaveniach správcu. Po povolení tento modul zašifruje transparentne všetky vaše súbory. Šifrovanie je založené na kľúčoch AES 256.\nModul nezmení existujúce súbory, zašifrované budú iba nové súbory po povolení šifrovania na strane servra. Šifrovanie nie je možné opätovne vypnúť a prepnúť naspäť do nešifroveného systému.\nProsím, prečítajte si dokumentáciu, aby ste poznali všetky dôsledky predtým, než sa rozhodnete povoliť šifrovanie na strane servra.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia pre šifrovanie je povolená, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
"Encrypt the home storage" : "Šifrovať domáce úložisko",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Zapnutím tejto voľby zašifrujete všetky súbory v hlavnom úložisku, v opačnom prípade zašifrujete iba súbory na externom úložisku.",
"Enable recovery key" : "Povoliť obnovovací kľúč",
"Disable recovery key" : "Zakázať obnovovací kľúč",
- "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.",
+ "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." : "Kľúč pre obnovu je dodatočný šifrovací kľúč používaný na šifrovanie súborov. Používa sa na obnovenie súborov z účtu v prípade zabudnutia hesla.",
"Recovery key password" : "Heslo obnovovacieho kľúča",
"Repeat recovery key password" : "Zopakovať heslo k záchrannému kľúču",
"Change recovery key password:" : "Zmeniť heslo obnovovacieho kľúča:",
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Základný šifrovací modul",
"Your private key password no longer matches your log-in password." : "Heslo vášho súkromného kľúča sa nezhoduje v vašim prihlasovacím heslom.",
"Set your old private key password to your current log-in password:" : "Zmeňte si vaše staré heslo súkromného kľúča na rovnaké, aké je vaše aktuálne prihlasovacie heslo:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie svojich súborov.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie vašich súborov.",
"Old log-in password" : "Staré prihlasovacie heslo",
"Current log-in password" : "Súčasné prihlasovacie heslo",
"Update Private Key Password" : "Aktualizovať heslo súkromného kľúča",
diff --git a/apps/encryption/l10n/sk.json b/apps/encryption/l10n/sk.json
index 8783606792f..03b35bd517a 100644
--- a/apps/encryption/l10n/sk.json
+++ b/apps/encryption/l10n/sk.json
@@ -26,21 +26,21 @@
"Bad Signature" : "Zlý podpis",
"Missing Signature" : "Chýbajúci podpis",
"one-time password for server-side-encryption" : "jednorazové heslo na šifrovanie na strane servera",
+ "Encryption password" : "Heslo pre šifrovanie",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Administrácia povolila šifrovanie na strane servera. Vaše súbory boli zašifrované pomocou hesla <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Administrácia povolila šifrovanie na strane servera. Vaše súbory boli zašifrované pomocou hesla \"%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." : "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.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor nie je možné rozšifrovať, môže ísť o súbor zdieľaný iným užívateľom. Požiadajte majiteľa súboru, aby vám ho zozdieľal ešte raz.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor nie je možné prečítať, môže ísť o súbor zdieľaný iným užívateľom. Požiadajte majiteľa súboru, aby vám ho zozdieľal ešte raz.",
"Default encryption module" : "Predvolený šifrovací modul",
"Default encryption module for server-side encryption" : "Predvolený šifrovací modul pre šifrovanie na strane servra",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Pre použitie tohoto šifrovacieho modulu musíte povoliť šifrovanie\n\t\t na strane servra v správcovských nastaveniach. Po povolení tento modul zašifruje\n\t\ttransparentne všetky vaše súbory. Šifrovanie je založené na kľúčoch AES 256.\n\t\tModul nezmení existujúce súbory, zašifrované budú iba nové súbory\n\t\tpo povolení šifrovania na strane servra. Šifrovanie nieje možné opätovne\n\t\t vypnúť a prepnúť naspäť do nešifroveného systému.\n\t\tPred rozhodnutím povoliť ifrovanie na strane servra\n\t\tsi prosím prečítajte dokumentáciu aby ste poznali všetky dôsledky.",
- "Hey there,\n\nThe administration 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" : "Dobrý deň,\n\nAdministrácia povolila šifrovanie na strane servera. Vaše súbory boli zašifrované pomocou hesla „%s“.\n\nPrihláste sa do webového rozhrania, prejdite do sekcie „Základný šifrovací modul“ vo svojich osobných nastaveniach a aktualizujte svoje šifrovacie heslo zadaním tohto hesla do poľa „Staré prihlasovacie heslo“ a svojho aktuálneho prihlasovacieho hesla.\n\n",
- "The share will expire on %s." : "Sprístupnenie vyprší %s.",
- "Cheers!" : "Pekný deň!",
- "Hey there,<br><br>The administration 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>" : "Dobrý deň,<br><br>Administrátor povolil šifrovanie na strane servera. Vaše súbory boli zašifrované pomocou hesla <strong>%s</strong>.<br><br>Prihláste sa prosím cez webový prehliadač, choďte do sekcie základného šifrovacieho modulu v osobných nastaveniach a zadajte horeuvedené heslo do políčka 'staré prihlasovacie heslo' a vaše súčasné prihlasovacie heslo.<br><br>",
+ "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." : "Pre použitie tohoto šifrovacieho modulu musíte povoliť šifrovanie na strane servra v nastaveniach správcu. Po povolení tento modul zašifruje transparentne všetky vaše súbory. Šifrovanie je založené na kľúčoch AES 256.\nModul nezmení existujúce súbory, zašifrované budú iba nové súbory po povolení šifrovania na strane servra. Šifrovanie nie je možné opätovne vypnúť a prepnúť naspäť do nešifroveného systému.\nProsím, prečítajte si dokumentáciu, aby ste poznali všetky dôsledky predtým, než sa rozhodnete povoliť šifrovanie na strane servra.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia pre šifrovanie je povolená, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
"Encrypt the home storage" : "Šifrovať domáce úložisko",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Zapnutím tejto voľby zašifrujete všetky súbory v hlavnom úložisku, v opačnom prípade zašifrujete iba súbory na externom úložisku.",
"Enable recovery key" : "Povoliť obnovovací kľúč",
"Disable recovery key" : "Zakázať obnovovací kľúč",
- "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.",
+ "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." : "Kľúč pre obnovu je dodatočný šifrovací kľúč používaný na šifrovanie súborov. Používa sa na obnovenie súborov z účtu v prípade zabudnutia hesla.",
"Recovery key password" : "Heslo obnovovacieho kľúča",
"Repeat recovery key password" : "Zopakovať heslo k záchrannému kľúču",
"Change recovery key password:" : "Zmeniť heslo obnovovacieho kľúča:",
@@ -51,7 +51,7 @@
"Basic encryption module" : "Základný šifrovací modul",
"Your private key password no longer matches your log-in password." : "Heslo vášho súkromného kľúča sa nezhoduje v vašim prihlasovacím heslom.",
"Set your old private key password to your current log-in password:" : "Zmeňte si vaše staré heslo súkromného kľúča na rovnaké, aké je vaše aktuálne prihlasovacie heslo:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie svojich súborov.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie vašich súborov.",
"Old log-in password" : "Staré prihlasovacie heslo",
"Current log-in password" : "Súčasné prihlasovacie heslo",
"Update Private Key Password" : "Aktualizovať heslo súkromného kľúča",
diff --git a/apps/encryption/l10n/sl.js b/apps/encryption/l10n/sl.js
index e29a6a2e6d3..c80afd08937 100644
--- a/apps/encryption/l10n/sl.js
+++ b/apps/encryption/l10n/sl.js
@@ -32,15 +32,11 @@ OC.L10N.register(
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče brati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da vam souporabo ponovno omogoči.",
"Default encryption module" : "Privzet modul za šifriranje",
"Default encryption module for server-side encryption" : "Privzeti modul za strežniško šifriranje",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Za uporabo tega šifrirnega modula je treba na strežniku omogočiti\n\t\tšifriranje med »skrbniškimi nastavitvami«. Ko je modul omogočen, bo samodejno izvedeno šifriranje\n\t\tvseh datotek. Šifriranje je zasnovano po protokolu AES 256.\n\t\tŠifriranje je onemogočeno za obstoječe datoteke, postopek se izvede le za nove,\n\t\tustvarjene po omogočanju šifriranja. Prav tako ni mogoče\n\t\tonemogočiti šifriranja in povrniti sistem v nešifriran.\n\t\tPred dokončno odločitvijo je priporočljivo natančno pregrati dokumentacijo,\n\t\t in temeljito razmisliti o posledicah.",
- "The share will expire on %s." : "Povezava souporabe bo pretekla %s.",
- "Cheers!" : "Lep pozdrav!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar šifrirni ključi niso na voljo. Odjavite se in nato ponovno prijavite.",
"Encrypt the home storage" : "Šifriraj krajevno shrambo",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Izbrana možnost omogoči šifriranje vseh datotek, shranjenih v glavni shrambi, sicer so šifrirane le datoteke v zunanjih shrambah.",
"Enable recovery key" : "Omogoči obnovitveni ključ",
"Disable recovery key" : "Onemogoči ključ za obnovitev gesla",
- "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.",
"Recovery key password" : "Ključ za obnovitev gesla",
"Repeat recovery key password" : "Ponovi ključ za obnovitev gesla",
"Change recovery key password:" : "Spremeni ključ za obnovitev gesla:",
@@ -51,7 +47,6 @@ OC.L10N.register(
"Basic encryption module" : "Osnovni modul za šifriranje",
"Your private key password no longer matches your log-in password." : "Zasebno geslo ni več skladno s prijavnim geslom.",
"Set your old private key password to your current log-in password:" : "Nastavite star zasebni ključ na trenutno prijavno geslo:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "V kolikor se gesla ne spomnite več, lahko vaše datoteke obnovi le skrbnik sistema.",
"Old log-in password" : "Staro geslo",
"Current log-in password" : "Trenutno geslo",
"Update Private Key Password" : "Posodobi geslo zasebnega ključa",
diff --git a/apps/encryption/l10n/sl.json b/apps/encryption/l10n/sl.json
index 030b84ed7b5..8e45a8d2cab 100644
--- a/apps/encryption/l10n/sl.json
+++ b/apps/encryption/l10n/sl.json
@@ -30,15 +30,11 @@
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče brati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da vam souporabo ponovno omogoči.",
"Default encryption module" : "Privzet modul za šifriranje",
"Default encryption module for server-side encryption" : "Privzeti modul za strežniško šifriranje",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Za uporabo tega šifrirnega modula je treba na strežniku omogočiti\n\t\tšifriranje med »skrbniškimi nastavitvami«. Ko je modul omogočen, bo samodejno izvedeno šifriranje\n\t\tvseh datotek. Šifriranje je zasnovano po protokolu AES 256.\n\t\tŠifriranje je onemogočeno za obstoječe datoteke, postopek se izvede le za nove,\n\t\tustvarjene po omogočanju šifriranja. Prav tako ni mogoče\n\t\tonemogočiti šifriranja in povrniti sistem v nešifriran.\n\t\tPred dokončno odločitvijo je priporočljivo natančno pregrati dokumentacijo,\n\t\t in temeljito razmisliti o posledicah.",
- "The share will expire on %s." : "Povezava souporabe bo pretekla %s.",
- "Cheers!" : "Lep pozdrav!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar šifrirni ključi niso na voljo. Odjavite se in nato ponovno prijavite.",
"Encrypt the home storage" : "Šifriraj krajevno shrambo",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Izbrana možnost omogoči šifriranje vseh datotek, shranjenih v glavni shrambi, sicer so šifrirane le datoteke v zunanjih shrambah.",
"Enable recovery key" : "Omogoči obnovitveni ključ",
"Disable recovery key" : "Onemogoči ključ za obnovitev gesla",
- "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.",
"Recovery key password" : "Ključ za obnovitev gesla",
"Repeat recovery key password" : "Ponovi ključ za obnovitev gesla",
"Change recovery key password:" : "Spremeni ključ za obnovitev gesla:",
@@ -49,7 +45,6 @@
"Basic encryption module" : "Osnovni modul za šifriranje",
"Your private key password no longer matches your log-in password." : "Zasebno geslo ni več skladno s prijavnim geslom.",
"Set your old private key password to your current log-in password:" : "Nastavite star zasebni ključ na trenutno prijavno geslo:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "V kolikor se gesla ne spomnite več, lahko vaše datoteke obnovi le skrbnik sistema.",
"Old log-in password" : "Staro geslo",
"Current log-in password" : "Trenutno geslo",
"Update Private Key Password" : "Posodobi geslo zasebnega ključa",
diff --git a/apps/encryption/l10n/sq.js b/apps/encryption/l10n/sq.js
index 776dea9040f..9cf72f1c61f 100644
--- a/apps/encryption/l10n/sq.js
+++ b/apps/encryption/l10n/sq.js
@@ -29,14 +29,11 @@ OC.L10N.register(
"Missing Signature" : "Mungon Nënshkrimi",
"one-time password for server-side-encryption" : "fjalëkalim vetëm për një herë, për fshehtëzim-më-anë-shërbyesi",
"Default encryption module" : "Modul i parazgjedhur fshehtëzimi",
- "The share will expire on %s." : "Ndarja do të skadojë më %s.",
- "Cheers!" : "Gëzuar!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacioni i fshehtëzimeve është i aktivizuar, por kyçet tuaj s’janë vënë në punë, ju lutemi, dilni dhe ribëni hyrjen",
"Encrypt the home storage" : "Fshehtëzo depozitën bazë",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Aktivizimi i kësaj mundësie fshehtëzon krejt kartelat e depozituara në depon bazë, përndryshe do të fshehtëzohen vetëm kartelat në depozitën e jashtme",
"Enable recovery key" : "Aktivizo kyç rimarrjesh",
"Disable recovery key" : "Çaktivizo kyç rimarrjesh",
- "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.",
"Recovery key password" : "Fjalëkalim kyçi rimarrjesh",
"Repeat recovery key password" : "Rijepni fjalëkalim kyçi rimarrjesh",
"Change recovery key password:" : "Ndryshoni fjalëkalim kyçi rimarrjesh:",
@@ -47,7 +44,6 @@ OC.L10N.register(
"Basic encryption module" : "Modul i thjeshtë fshehtëzimesh",
"Your private key password no longer matches your log-in password." : "Fjalëkalimi juaj për kyçe privatë s’përputhet më me fjalëkalimin për hyrjet.",
"Set your old private key password to your current log-in password:" : "Fjalëkalimit të vjetër të kyçit privat jepini vlerën e fjalëkalimit tuaj të tanishëm për hyrjet:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " Nëse s’e mbani mend fjalëkalimin tuaj të vjetër, mund t’i kërkoni përgjegjësit tuaj të rimarrë kartelat tuaja.",
"Old log-in password" : "Fjalëkalimi i vjetër për hyrjet",
"Current log-in password" : "Fjalëkalimi i tanishëm për hyrjet",
"Update Private Key Password" : "Përditësoni Fjalëkalim Kyçi Privat",
diff --git a/apps/encryption/l10n/sq.json b/apps/encryption/l10n/sq.json
index 5cf30610dbc..5e3473173e6 100644
--- a/apps/encryption/l10n/sq.json
+++ b/apps/encryption/l10n/sq.json
@@ -27,14 +27,11 @@
"Missing Signature" : "Mungon Nënshkrimi",
"one-time password for server-side-encryption" : "fjalëkalim vetëm për një herë, për fshehtëzim-më-anë-shërbyesi",
"Default encryption module" : "Modul i parazgjedhur fshehtëzimi",
- "The share will expire on %s." : "Ndarja do të skadojë më %s.",
- "Cheers!" : "Gëzuar!",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacioni i fshehtëzimeve është i aktivizuar, por kyçet tuaj s’janë vënë në punë, ju lutemi, dilni dhe ribëni hyrjen",
"Encrypt the home storage" : "Fshehtëzo depozitën bazë",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Aktivizimi i kësaj mundësie fshehtëzon krejt kartelat e depozituara në depon bazë, përndryshe do të fshehtëzohen vetëm kartelat në depozitën e jashtme",
"Enable recovery key" : "Aktivizo kyç rimarrjesh",
"Disable recovery key" : "Çaktivizo kyç rimarrjesh",
- "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.",
"Recovery key password" : "Fjalëkalim kyçi rimarrjesh",
"Repeat recovery key password" : "Rijepni fjalëkalim kyçi rimarrjesh",
"Change recovery key password:" : "Ndryshoni fjalëkalim kyçi rimarrjesh:",
@@ -45,7 +42,6 @@
"Basic encryption module" : "Modul i thjeshtë fshehtëzimesh",
"Your private key password no longer matches your log-in password." : "Fjalëkalimi juaj për kyçe privatë s’përputhet më me fjalëkalimin për hyrjet.",
"Set your old private key password to your current log-in password:" : "Fjalëkalimit të vjetër të kyçit privat jepini vlerën e fjalëkalimit tuaj të tanishëm për hyrjet:",
- " If you don't remember your old password you can ask your administrator to recover your files." : " Nëse s’e mbani mend fjalëkalimin tuaj të vjetër, mund t’i kërkoni përgjegjësit tuaj të rimarrë kartelat tuaja.",
"Old log-in password" : "Fjalëkalimi i vjetër për hyrjet",
"Current log-in password" : "Fjalëkalimi i tanishëm për hyrjet",
"Update Private Key Password" : "Përditësoni Fjalëkalim Kyçi Privat",
diff --git a/apps/encryption/l10n/sr.js b/apps/encryption/l10n/sr.js
index cc3f63d9d87..702c5973a34 100644
--- a/apps/encryption/l10n/sr.js
+++ b/apps/encryption/l10n/sr.js
@@ -28,17 +28,21 @@ OC.L10N.register(
"Bad Signature" : "Лош потпис",
"Missing Signature" : "Недостаје потпис",
"one-time password for server-side-encryption" : "једнократна лозинка за шифровање на страни сервера",
+ "Encryption password" : "Лозинка за шифровање",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Администратор је укључио шифровање на страни сервера. Ваши фајлови су шифровани употребом лозинке <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Администратор је укључио шифровање на страни сервера. Ваши фајлови су шифровани употребом лозинке „%s”.",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Молимо вас да се пријавите на веб интерфејс, одете на одељак „Безбедност” ваших личник подешавања и ажурирате своју лозинку за шифровање уносећи ову лозинку у поље „Стара лозинка за пријаву” и своју текућу лозинку за пријаву.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Овај фајл не може да се дешифрује, то је вероватно дељени фајл. Молимо вас да замолите власника да га поново подели са вама.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Овај фајл не може да се прочита, то је вероватно дељени фајл. Молимо вас да замолите власника да га поново подели са вама.",
"Default encryption module" : "Подразумевани модул за шифровање",
"Default encryption module for server-side encryption" : "Подразумевани модул за шифровање на серверској страни",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Да бисте користили овај модул, морате на серверској страни омогућити\n\t\tшифровање у администраторским поставкама. Једном укључен, овај модул ће шифровати\n\t\tсве фајлове транспарентно. Шифровање је базирано на „AES 256“ кључевима.\n\t\tМодул неће дирати постојеће фајлове, само ће нови фајлови бити шифровани\n\t\tнакон укључења шифровања на серверској страни. Није могуће да\n\t\tсе искључи шифровање и да врати се на нешифровани систем.\n\t\tПрочитајте документацију да сазнате све импликације пре него што се одлучите\n\t\tда укључите шифровање на серверу.",
- "The share will expire on %s." : "Дељење истиче %s.",
- "Cheers!" : "Здраво!",
+ "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 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 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:" : "Измена лозинке кључа опоравка:",
@@ -49,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Основни модул за шифровање",
"Your private key password no longer matches your log-in password." : "Лозинка вашег личног кључа више није иста као ваша лозинка за пријаву.",
"Set your old private key password to your current log-in password:" : "Поставите стару лозинку личног кључа као тренутну лозинку за пријаву:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
"Old log-in password" : "Стара лозинка за пријаву",
"Current log-in password" : "Тренутна лозинка за пријаву",
"Update Private Key Password" : "Ажурирај лозинку личног кључа",
diff --git a/apps/encryption/l10n/sr.json b/apps/encryption/l10n/sr.json
index 9dafcc7571c..a3002397263 100644
--- a/apps/encryption/l10n/sr.json
+++ b/apps/encryption/l10n/sr.json
@@ -26,17 +26,21 @@
"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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Да бисте користили овај модул, морате на серверској страни омогућити\n\t\tшифровање у администраторским поставкама. Једном укључен, овај модул ће шифровати\n\t\tсве фајлове транспарентно. Шифровање је базирано на „AES 256“ кључевима.\n\t\tМодул неће дирати постојеће фајлове, само ће нови фајлови бити шифровани\n\t\tнакон укључења шифровања на серверској страни. Није могуће да\n\t\tсе искључи шифровање и да врати се на нешифровани систем.\n\t\tПрочитајте документацију да сазнате све импликације пре него што се одлучите\n\t\tда укључите шифровање на серверу.",
- "The share will expire on %s." : "Дељење истиче %s.",
- "Cheers!" : "Здраво!",
+ "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 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 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,7 +51,7 @@
"Basic encryption module" : "Основни модул за шифровање",
"Your private key password no longer matches your log-in password." : "Лозинка вашег личног кључа више није иста као ваша лозинка за пријаву.",
"Set your old private key password to your current log-in password:" : "Поставите стару лозинку личног кључа као тренутну лозинку за пријаву:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ако се не сећате старе лозинке, можете затражити од администратора да опорави ваше фајлове.",
"Old log-in password" : "Стара лозинка за пријаву",
"Current log-in password" : "Тренутна лозинка за пријаву",
"Update Private Key Password" : "Ажурирај лозинку личног кључа",
diff --git a/apps/encryption/l10n/sr@latin.js b/apps/encryption/l10n/sr@latin.js
deleted file mode 100644
index d784912394c..00000000000
--- a/apps/encryption/l10n/sr@latin.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za Aplikaciju za šifrovanje. Molimo da osvežite vašu lozinku privatnog ključa u ličnim podešavanjima kako bi dobili pristup šifrovanim fajlovima.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.",
- "The share will expire on %s." : "Deljeni sadržaj će isteći: %s",
- "Cheers!" : "U zdravlje!",
- "Disabled" : "Onemogućeno"
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/encryption/l10n/sr@latin.json b/apps/encryption/l10n/sr@latin.json
deleted file mode 100644
index cb3a38ecf72..00000000000
--- a/apps/encryption/l10n/sr@latin.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
- "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za Aplikaciju za šifrovanje. Molimo da osvežite vašu lozinku privatnog ključa u ličnim podešavanjima kako bi dobili pristup šifrovanim fajlovima.",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.",
- "The share will expire on %s." : "Deljeni sadržaj će isteći: %s",
- "Cheers!" : "U zdravlje!",
- "Disabled" : "Onemogućeno"
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/sv.js b/apps/encryption/l10n/sv.js
index c67b4944301..0804e976a48 100644
--- a/apps/encryption/l10n/sv.js
+++ b/apps/encryption/l10n/sv.js
@@ -28,21 +28,21 @@ OC.L10N.register(
"Bad Signature" : "Dålig signatur",
"Missing Signature" : "Saknar signatur",
"one-time password for server-side-encryption" : "engångslösenord för kryptering på serversidan",
+ "Encryption password" : "Krypteringslösenord",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Administratören har aktiverat kryptering på servern. Dina filer är krypterade med lösenordet <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Administratören har aktiverat kryptering på servern. Dina filer är krypterade med lösenordet \"%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." : "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.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan inte avkryptera denna fil, troligen är det en delad fil. Vänligen be ägaren till filen att åter dela 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 inte läsa denna filen, troligen är det en delad fil. Vänligen be ägaren att åter dela filen med dig.",
"Default encryption module" : "Krypteringsfunktion",
"Default encryption module for server-side encryption" : "Standardkrypteringsmodul för kryptering på serversidan",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "För att kunna använda denna krypteringsmodul måste du aktivera serversidan\n\t\tkryptering i admininställningarna. När den här modulen är aktiverad kommer den att kryptera\n\t\talla dina filer transparent. Krypteringen är baserad på AES 256 nycklar.\n\t\tModulen kommer inte att röra befintliga filer, bara nya filer kommer att krypteras\n\t\tefter serversidskryptering aktiverades. Det är inte heller möjligt att\n\t\tinaktivera krypteringen igen och växla tillbaka till ett okrypterat system.\n\t\tVänligen läs dokumentationen för att veta alla konsekvenser innan du bestämmer dig\n\t\tför att aktivera kryptering på serversidan.",
- "Hey there,\n\nThe administration 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" : "Hej,\n\nadministrationen har aktiverat serverkryptering. Dina filer krypterades med lösenordet \"%s\".\n\nVänligen logga in i webbgränssnittet, navigera till \"Grundläggande krypteringsmodul\" i dina personliga inställningar och uppdatera ditt krypteringslösenord genom att skriva in detta lösenordet i fältet \"gammalt inloggningslösenord\" samt ditt nuvarande inloggningslösenord.\n\n",
- "The share will expire on %s." : "Utdelningen kommer att upphöra %s.",
- "Cheers!" : "Ha de fint!",
- "Hey there,<br><br>The administration 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>" : "Hej, <br><br>administrationen har aktiverat serverkryptering. Dina filer krypterades med lösenordet <strong>%s</strong>.<br><br>Vänligen logga in i webbgränssnittet, navigera till \"Grundläggande krypteringsmodul\" i dina personliga inställningar och uppdatera ditt krypteringslösenord genom att skriva in detta lösenordet i fältet \"gammalt inloggningslösenord\" samt ditt nuvarande inloggningslösenord.<br><br>",
+ "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." : "För att kunna använda denna krypteringsmodul måste du aktivera serversideskryptering i admininställningarna. När den är aktiverad kommer denna modul att kryptera alla dina filer transparent. Krypteringen är baserad på AES 256-nycklar.\nModulen kommer inte att röra befintliga filer, bara nya filer kommer att krypteras efter att serversideskryptering har aktiverats. Det går inte heller att inaktivera krypteringen igen och byta tillbaka till ett okrypterat system.\nLäs dokumentationen för att få reda på alla konsekvenser innan du bestämmer dig för att aktivera kryptering på serversidan.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsappen är aktiverad men dina krypteringsnycklar är inte initialiserade, vänligen logga ut och logga in igen.",
"Encrypt the home storage" : "Kryptera alla filer i molnet",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Aktivering av det här alternativet krypterar alla filer som är lagrade på huvudlagringsplatsen, annars kommer bara filer på extern lagringsplats att krypteras",
"Enable recovery key" : "Aktivera återställningsnyckel",
"Disable recovery key" : "Inaktivera återställningsnyckel",
- "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.",
+ "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." : "Återställningsnyckeln är en extra krypteringsnyckel som används för att kryptera filer. Den används för att återställa filer från ett konto om lösenordet glöms bort.",
"Recovery key password" : "Ange lösenord",
"Repeat recovery key password" : "Repetera lösenord",
"Change recovery key password:" : "Ändra lösenord för återställningsnyckel",
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Kryptering",
"Your private key password no longer matches your log-in password." : "Ditt lösenord för din privata nyckel matchar inte längre ditt inloggningslösenord.",
"Set your old private key password to your current log-in password:" : "Sätt ditt gamla privatnyckellösenord till ditt aktuella inloggningslösenord:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
"Old log-in password" : "Gammalt inloggningslösenord",
"Current log-in password" : "Nuvarande inloggningslösenord",
"Update Private Key Password" : "Uppdatera lösenordet för din privata nyckel",
diff --git a/apps/encryption/l10n/sv.json b/apps/encryption/l10n/sv.json
index 9b3fbdb0620..2715863250b 100644
--- a/apps/encryption/l10n/sv.json
+++ b/apps/encryption/l10n/sv.json
@@ -26,21 +26,21 @@
"Bad Signature" : "Dålig signatur",
"Missing Signature" : "Saknar signatur",
"one-time password for server-side-encryption" : "engångslösenord för kryptering på serversidan",
+ "Encryption password" : "Krypteringslösenord",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Administratören har aktiverat kryptering på servern. Dina filer är krypterade med lösenordet <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Administratören har aktiverat kryptering på servern. Dina filer är krypterade med lösenordet \"%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." : "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.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan inte avkryptera denna fil, troligen är det en delad fil. Vänligen be ägaren till filen att åter dela 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 inte läsa denna filen, troligen är det en delad fil. Vänligen be ägaren att åter dela filen med dig.",
"Default encryption module" : "Krypteringsfunktion",
"Default encryption module for server-side encryption" : "Standardkrypteringsmodul för kryptering på serversidan",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "För att kunna använda denna krypteringsmodul måste du aktivera serversidan\n\t\tkryptering i admininställningarna. När den här modulen är aktiverad kommer den att kryptera\n\t\talla dina filer transparent. Krypteringen är baserad på AES 256 nycklar.\n\t\tModulen kommer inte att röra befintliga filer, bara nya filer kommer att krypteras\n\t\tefter serversidskryptering aktiverades. Det är inte heller möjligt att\n\t\tinaktivera krypteringen igen och växla tillbaka till ett okrypterat system.\n\t\tVänligen läs dokumentationen för att veta alla konsekvenser innan du bestämmer dig\n\t\tför att aktivera kryptering på serversidan.",
- "Hey there,\n\nThe administration 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" : "Hej,\n\nadministrationen har aktiverat serverkryptering. Dina filer krypterades med lösenordet \"%s\".\n\nVänligen logga in i webbgränssnittet, navigera till \"Grundläggande krypteringsmodul\" i dina personliga inställningar och uppdatera ditt krypteringslösenord genom att skriva in detta lösenordet i fältet \"gammalt inloggningslösenord\" samt ditt nuvarande inloggningslösenord.\n\n",
- "The share will expire on %s." : "Utdelningen kommer att upphöra %s.",
- "Cheers!" : "Ha de fint!",
- "Hey there,<br><br>The administration 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>" : "Hej, <br><br>administrationen har aktiverat serverkryptering. Dina filer krypterades med lösenordet <strong>%s</strong>.<br><br>Vänligen logga in i webbgränssnittet, navigera till \"Grundläggande krypteringsmodul\" i dina personliga inställningar och uppdatera ditt krypteringslösenord genom att skriva in detta lösenordet i fältet \"gammalt inloggningslösenord\" samt ditt nuvarande inloggningslösenord.<br><br>",
+ "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." : "För att kunna använda denna krypteringsmodul måste du aktivera serversideskryptering i admininställningarna. När den är aktiverad kommer denna modul att kryptera alla dina filer transparent. Krypteringen är baserad på AES 256-nycklar.\nModulen kommer inte att röra befintliga filer, bara nya filer kommer att krypteras efter att serversideskryptering har aktiverats. Det går inte heller att inaktivera krypteringen igen och byta tillbaka till ett okrypterat system.\nLäs dokumentationen för att få reda på alla konsekvenser innan du bestämmer dig för att aktivera kryptering på serversidan.",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsappen är aktiverad men dina krypteringsnycklar är inte initialiserade, vänligen logga ut och logga in igen.",
"Encrypt the home storage" : "Kryptera alla filer i molnet",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Aktivering av det här alternativet krypterar alla filer som är lagrade på huvudlagringsplatsen, annars kommer bara filer på extern lagringsplats att krypteras",
"Enable recovery key" : "Aktivera återställningsnyckel",
"Disable recovery key" : "Inaktivera återställningsnyckel",
- "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.",
+ "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." : "Återställningsnyckeln är en extra krypteringsnyckel som används för att kryptera filer. Den används för att återställa filer från ett konto om lösenordet glöms bort.",
"Recovery key password" : "Ange lösenord",
"Repeat recovery key password" : "Repetera lösenord",
"Change recovery key password:" : "Ändra lösenord för återställningsnyckel",
@@ -51,7 +51,7 @@
"Basic encryption module" : "Kryptering",
"Your private key password no longer matches your log-in password." : "Ditt lösenord för din privata nyckel matchar inte längre ditt inloggningslösenord.",
"Set your old private key password to your current log-in password:" : "Sätt ditt gamla privatnyckellösenord till ditt aktuella inloggningslösenord:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
"Old log-in password" : "Gammalt inloggningslösenord",
"Current log-in password" : "Nuvarande inloggningslösenord",
"Update Private Key Password" : "Uppdatera lösenordet för din privata nyckel",
diff --git a/apps/encryption/l10n/sw.js b/apps/encryption/l10n/sw.js
new file mode 100644
index 00000000000..47dd00c5388
--- /dev/null
+++ b/apps/encryption/l10n/sw.js
@@ -0,0 +1,65 @@
+OC.L10N.register(
+ "encryption",
+ {
+ "Missing recovery key password" : "Nenosiri la ufunguo wa kurejesha halipo",
+ "Please repeat the recovery key password" : "Tafadhali rudia nenosiri la ufunguo wa kurejesha",
+ "Repeated recovery key password does not match the provided recovery key password" : "Nenosiri linalorudiwa la ufunguo wa kurejesha halilingani na nenosiri ulilopewa la ufunguo wa urejeshaji",
+ "Recovery key successfully enabled" : "Ufunguo wa kurejesha umewezeshwa",
+ "Could not enable recovery key. Please check your recovery key password!" : "Haikuweza kuwasha ufunguo wa kurejesha akaunti. Tafadhali angalia nenosiri lako la ufunguo wa kurejesha akaunti!",
+ "Recovery key successfully disabled" : "Ufunguo wa kurejesha umezimwa",
+ "Could not disable recovery key. Please check your recovery key password!" : "Haikuweza kuzima ufunguo wa kurejesha. Tafadhali angalia nenosiri lako la ufunguo wa kurejesha akaunti!",
+ "Missing parameters" : "Vigezo vinavyokosekana",
+ "Please provide the old recovery password" : "Tafadhali toa nenosiri la zamani la urejeshi",
+ "Please provide a new recovery password" : " Tafadhali toa nenosiri jipya la kurejesha akaunti",
+ "Please repeat the new recovery password" : "Tafadhali rudia nenosiri jipya la kurejesha akaunti",
+ "Password successfully changed." : "Nenosiri limebadilishwa kikamilifu",
+ "Could not change the password. Maybe the old password was not correct." : "Haikuweza kubadilisha nenosiri. Labda nenosiri la zamani halikuwa sahihi.",
+ "Recovery Key disabled" : "Ufunguo wa Urejeshaji umezimwa",
+ "Recovery Key enabled" : "Ufunguo wa Urejeshaji umewashwa",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Haikuweza kuwasha ufunguo wa kurejesha ufikiaji wa akaunti, tafadhali jaribu tena au wasiliana na msimamizi wako",
+ "Could not update the private key password." : "Haikuweza kusasisha nenosiri la ufunguo wa faragha.",
+ "The old password was not correct, please try again." : "Nenosiri la zamani halikuwa sahihi, tafadhali jaribu tena.",
+ "The current log-in password was not correct, please try again." : "Nenosiri la sasa la kuingia halikuwa sahihi, tafadhali jaribu tena.",
+ "Private key password successfully updated." : "Nenosiri la ufunguo wa faragha limesasishwa.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ufunguo wa faragha si sahihi kwa programu ya usimbaji fiche. Tafadhali sasisha nenosiri lako la ufunguo wa faragha katika mipangilio yako ya kibinafsi ili kurejesha ufikiaji wa faili zako zilizosimbwa.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Programu ya Usimbaji fiche imewashwa, lakini funguo zako hazijaanzishwa. Tafadhali ondoka na uingie tena.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Tafadhali wezesha usimbaji fiche wa upande wa seva katika mipangilio ya msimamizi ili kutumia sehemu ya usimbaji.",
+ "Encryption app is enabled and ready" : "Programu ya usimbaji fiche imewashwa na iko tayari",
+ "Bad Signature" : "Sahihi mbaya",
+ "Missing Signature" : "Inakosa Sahihi",
+ "one-time password for server-side-encryption" : "nenosiri la wakati mmoja la usimbaji fiche wa upande wa seva",
+ "Encryption password" : "Nenosiri la usimbaji fiche",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Utawala uliwezesha usimbaji fiche wa upande wa seva. Faili zako zilisimbwa kwa njia fiche kwa kutumia nenosiri <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Utawala uliwezesha usimbaji fiche wa upande wa seva. Faili zako zilisimbwa kwa njia fiche kwa kutumia nenosiri \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Tafadhali ingia kwenye kiolesura cha wavuti, nenda kwenye sehemu ya \"Usalama\" ya mipangilio yako ya kibinafsi na usasishe nenosiri lako la usimbaji kwa kuingiza nenosiri hili kwenye sehemu ya \"Nenosiri la zamani la kuingia\" na nenosiri lako la sasa la kuingia.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Haiwezi kusimbua faili hii, pengine hii ni faili iliyoshirikiwa. Tafadhali mwombe mwenye faili kushiriki upya faili nawe.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Haiwezi kusoma faili hii, labda hii ni faili iliyoshirikiwa. Tafadhali mwombe mwenye faili kushiriki upya faili nawe.",
+ "Default encryption module" : " Moduli chaguo-msingi ya usimbaji fiche",
+ "Default encryption module for server-side encryption" : "Sehemu chaguo-msingi ya usimbaji fiche kwa usimbaji wa upande wa seva",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Ili kutumia sehemu hii ya usimbaji fiche unahitaji kuwezesha usimbaji fiche wa upande wa seva katika mipangilio ya msimamizi. Mara baada ya kuwezeshwa sehemu hii itasimba kwa njia fiche faili zako zote kwa uwazi. Usimbaji fiche unategemea funguo za AES 256.\nSehemu hii haitagusa faili zilizopo, ni faili mpya pekee zitakazosimbwa kwa njia fiche baada ya usimbaji fiche wa upande wa seva kuwashwa. Pia haiwezekani kuzima usimbaji fiche tena na kurudi kwenye mfumo ambao haujasimbwa.\nTafadhali soma hati ili kujua athari zote kabla ya kuamua kuwezesha usimbaji fiche wa upande wa seva.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Programu ya usimbaji fiche imewashwa lakini funguo zako hazijaanzishwa, tafadhali toka na uingie tena",
+ "Encrypt the home storage" : "Simba hifadhi ya nyumbani kwa njia fiche",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Kuwasha chaguo hili husimba kwa njia fiche faili zote zilizohifadhiwa kwenye hifadhi kuu, vinginevyo faili zilizo kwenye hifadhi ya nje pekee ndizo zitasimbwa kwa njia fiche",
+ "Enable recovery key" : "Washa ufunguo wa kurejesha",
+ "Disable recovery key" : "Zima ufunguo wa kurejesha",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Ufunguo wa kurejesha ni ufunguo wa ziada wa usimbaji fiche unaotumiwa kusimba faili kwa njia fiche. Inatumika kurejesha faili kutoka kwa akaunti ikiwa nenosiri limesahau.",
+ "Recovery key password" : "Nenosiri la ufunguo wa kurejesha",
+ "Repeat recovery key password" : "Rudia nenosiri la ufunguo wa kurejesha",
+ "Change recovery key password:" : "Badilisha nenosiri la ufunguo wa kurejesha:",
+ "Old recovery key password" : " Nenosiri la zamani la ufunguo wa kurejesha",
+ "New recovery key password" : "Nenosiri mpya la ufunguo wa kurejesha akaunti",
+ "Repeat new recovery key password" : "Rudia ufunguo mpya wa uokoaji",
+ "Change Password" : "Badili nenosiri",
+ "Basic encryption module" : "Moduli ya msingi ya usimbaji fiche",
+ "Your private key password no longer matches your log-in password." : "Nenosiri lako la ufunguo wa faragha halilingani tena na nenosiri lako la kuingia.",
+ "Set your old private key password to your current log-in password:" : "Weka nenosiri lako la zamani la ufunguo wa kibinafsi kwa nenosiri lako la sasa la kuingia:",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ikiwa hukumbuki nenosiri lako la zamani unaweza kumwomba msimamizi wako kurejesha faili zako.",
+ "Old log-in password" : "Nenosiri la zamani la kuingia",
+ "Current log-in password" : "Nenosiri la sasa la kuingia",
+ "Update Private Key Password" : "Sasisha Nenosiri la Ufunguo wa Kibinafsi",
+ "Enable password recovery:" : "Washa urejeshaji wa nenosiri:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Kuwasha chaguo hili kutakuruhusu kupata tena ufikiaji wa faili zako zilizosimbwa ikiwa utapoteza nenosiri",
+ "Enabled" : "Washwa",
+ "Disabled" : "Zimwa"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/sw.json b/apps/encryption/l10n/sw.json
new file mode 100644
index 00000000000..0e19c9cb3f2
--- /dev/null
+++ b/apps/encryption/l10n/sw.json
@@ -0,0 +1,63 @@
+{ "translations": {
+ "Missing recovery key password" : "Nenosiri la ufunguo wa kurejesha halipo",
+ "Please repeat the recovery key password" : "Tafadhali rudia nenosiri la ufunguo wa kurejesha",
+ "Repeated recovery key password does not match the provided recovery key password" : "Nenosiri linalorudiwa la ufunguo wa kurejesha halilingani na nenosiri ulilopewa la ufunguo wa urejeshaji",
+ "Recovery key successfully enabled" : "Ufunguo wa kurejesha umewezeshwa",
+ "Could not enable recovery key. Please check your recovery key password!" : "Haikuweza kuwasha ufunguo wa kurejesha akaunti. Tafadhali angalia nenosiri lako la ufunguo wa kurejesha akaunti!",
+ "Recovery key successfully disabled" : "Ufunguo wa kurejesha umezimwa",
+ "Could not disable recovery key. Please check your recovery key password!" : "Haikuweza kuzima ufunguo wa kurejesha. Tafadhali angalia nenosiri lako la ufunguo wa kurejesha akaunti!",
+ "Missing parameters" : "Vigezo vinavyokosekana",
+ "Please provide the old recovery password" : "Tafadhali toa nenosiri la zamani la urejeshi",
+ "Please provide a new recovery password" : " Tafadhali toa nenosiri jipya la kurejesha akaunti",
+ "Please repeat the new recovery password" : "Tafadhali rudia nenosiri jipya la kurejesha akaunti",
+ "Password successfully changed." : "Nenosiri limebadilishwa kikamilifu",
+ "Could not change the password. Maybe the old password was not correct." : "Haikuweza kubadilisha nenosiri. Labda nenosiri la zamani halikuwa sahihi.",
+ "Recovery Key disabled" : "Ufunguo wa Urejeshaji umezimwa",
+ "Recovery Key enabled" : "Ufunguo wa Urejeshaji umewashwa",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Haikuweza kuwasha ufunguo wa kurejesha ufikiaji wa akaunti, tafadhali jaribu tena au wasiliana na msimamizi wako",
+ "Could not update the private key password." : "Haikuweza kusasisha nenosiri la ufunguo wa faragha.",
+ "The old password was not correct, please try again." : "Nenosiri la zamani halikuwa sahihi, tafadhali jaribu tena.",
+ "The current log-in password was not correct, please try again." : "Nenosiri la sasa la kuingia halikuwa sahihi, tafadhali jaribu tena.",
+ "Private key password successfully updated." : "Nenosiri la ufunguo wa faragha limesasishwa.",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ufunguo wa faragha si sahihi kwa programu ya usimbaji fiche. Tafadhali sasisha nenosiri lako la ufunguo wa faragha katika mipangilio yako ya kibinafsi ili kurejesha ufikiaji wa faili zako zilizosimbwa.",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Programu ya Usimbaji fiche imewashwa, lakini funguo zako hazijaanzishwa. Tafadhali ondoka na uingie tena.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Tafadhali wezesha usimbaji fiche wa upande wa seva katika mipangilio ya msimamizi ili kutumia sehemu ya usimbaji.",
+ "Encryption app is enabled and ready" : "Programu ya usimbaji fiche imewashwa na iko tayari",
+ "Bad Signature" : "Sahihi mbaya",
+ "Missing Signature" : "Inakosa Sahihi",
+ "one-time password for server-side-encryption" : "nenosiri la wakati mmoja la usimbaji fiche wa upande wa seva",
+ "Encryption password" : "Nenosiri la usimbaji fiche",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>." : "Utawala uliwezesha usimbaji fiche wa upande wa seva. Faili zako zilisimbwa kwa njia fiche kwa kutumia nenosiri <strong>%s</strong>.",
+ "The administration enabled server-side-encryption. Your files were encrypted using the password \"%s\"." : "Utawala uliwezesha usimbaji fiche wa upande wa seva. Faili zako zilisimbwa kwa njia fiche kwa kutumia nenosiri \"%s\".",
+ "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Tafadhali ingia kwenye kiolesura cha wavuti, nenda kwenye sehemu ya \"Usalama\" ya mipangilio yako ya kibinafsi na usasishe nenosiri lako la usimbaji kwa kuingiza nenosiri hili kwenye sehemu ya \"Nenosiri la zamani la kuingia\" na nenosiri lako la sasa la kuingia.",
+ "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Haiwezi kusimbua faili hii, pengine hii ni faili iliyoshirikiwa. Tafadhali mwombe mwenye faili kushiriki upya faili nawe.",
+ "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Haiwezi kusoma faili hii, labda hii ni faili iliyoshirikiwa. Tafadhali mwombe mwenye faili kushiriki upya faili nawe.",
+ "Default encryption module" : " Moduli chaguo-msingi ya usimbaji fiche",
+ "Default encryption module for server-side encryption" : "Sehemu chaguo-msingi ya usimbaji fiche kwa usimbaji wa upande wa seva",
+ "In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys.\nThe module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.\nPlease read the documentation to know all implications before you decide to enable server-side encryption." : "Ili kutumia sehemu hii ya usimbaji fiche unahitaji kuwezesha usimbaji fiche wa upande wa seva katika mipangilio ya msimamizi. Mara baada ya kuwezeshwa sehemu hii itasimba kwa njia fiche faili zako zote kwa uwazi. Usimbaji fiche unategemea funguo za AES 256.\nSehemu hii haitagusa faili zilizopo, ni faili mpya pekee zitakazosimbwa kwa njia fiche baada ya usimbaji fiche wa upande wa seva kuwashwa. Pia haiwezekani kuzima usimbaji fiche tena na kurudi kwenye mfumo ambao haujasimbwa.\nTafadhali soma hati ili kujua athari zote kabla ya kuamua kuwezesha usimbaji fiche wa upande wa seva.",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Programu ya usimbaji fiche imewashwa lakini funguo zako hazijaanzishwa, tafadhali toka na uingie tena",
+ "Encrypt the home storage" : "Simba hifadhi ya nyumbani kwa njia fiche",
+ "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Kuwasha chaguo hili husimba kwa njia fiche faili zote zilizohifadhiwa kwenye hifadhi kuu, vinginevyo faili zilizo kwenye hifadhi ya nje pekee ndizo zitasimbwa kwa njia fiche",
+ "Enable recovery key" : "Washa ufunguo wa kurejesha",
+ "Disable recovery key" : "Zima ufunguo wa kurejesha",
+ "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "Ufunguo wa kurejesha ni ufunguo wa ziada wa usimbaji fiche unaotumiwa kusimba faili kwa njia fiche. Inatumika kurejesha faili kutoka kwa akaunti ikiwa nenosiri limesahau.",
+ "Recovery key password" : "Nenosiri la ufunguo wa kurejesha",
+ "Repeat recovery key password" : "Rudia nenosiri la ufunguo wa kurejesha",
+ "Change recovery key password:" : "Badilisha nenosiri la ufunguo wa kurejesha:",
+ "Old recovery key password" : " Nenosiri la zamani la ufunguo wa kurejesha",
+ "New recovery key password" : "Nenosiri mpya la ufunguo wa kurejesha akaunti",
+ "Repeat new recovery key password" : "Rudia ufunguo mpya wa uokoaji",
+ "Change Password" : "Badili nenosiri",
+ "Basic encryption module" : "Moduli ya msingi ya usimbaji fiche",
+ "Your private key password no longer matches your log-in password." : "Nenosiri lako la ufunguo wa faragha halilingani tena na nenosiri lako la kuingia.",
+ "Set your old private key password to your current log-in password:" : "Weka nenosiri lako la zamani la ufunguo wa kibinafsi kwa nenosiri lako la sasa la kuingia:",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Ikiwa hukumbuki nenosiri lako la zamani unaweza kumwomba msimamizi wako kurejesha faili zako.",
+ "Old log-in password" : "Nenosiri la zamani la kuingia",
+ "Current log-in password" : "Nenosiri la sasa la kuingia",
+ "Update Private Key Password" : "Sasisha Nenosiri la Ufunguo wa Kibinafsi",
+ "Enable password recovery:" : "Washa urejeshaji wa nenosiri:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Kuwasha chaguo hili kutakuruhusu kupata tena ufikiaji wa faili zako zilizosimbwa ikiwa utapoteza nenosiri",
+ "Enabled" : "Washwa",
+ "Disabled" : "Zimwa"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+} \ No newline at end of file
diff --git a/apps/encryption/l10n/th.js b/apps/encryption/l10n/th.js
index 397768eb1af..a735f1bff1f 100644
--- a/apps/encryption/l10n/th.js
+++ b/apps/encryption/l10n/th.js
@@ -3,9 +3,9 @@ OC.L10N.register(
{
"Missing recovery key password" : "รหัสผ่านของคีย์การกู้คืนขาดหาย",
"Please repeat the recovery key password" : "กรุณาใส่รหัสผ่านของคีย์การกู้คืนอีกครั้ง",
- "Repeated recovery key password does not match the provided 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!" : "ไม่สามารถเปิดใช้งานรหัสกู้คืน กรุณาตรวจสอบรหัสผ่านสำหรับรหัสกู้คืนของคุณ!",
+ "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" : "ค่าพารามิเตอร์ขาดหาย",
@@ -24,14 +24,11 @@ OC.L10N.register(
"Bad Signature" : "ลายเซ็นไม่ดี",
"Missing Signature" : "ลายเซ็นขาดหายไป",
"one-time password for server-side-encryption" : "รหัสผ่านใช้ครั้งเดียว สำหรับการเข้ารหัสฝั่งเซิร์ฟเวอร์",
- "The share will expire on %s." : "การแชร์จะหมดอายุในวันที่ %s",
- "Cheers!" : "ไชโย!",
"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 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." : "คีย์การกู้คืนเป็นคีย์เข้ารหัสเพิ่มเติมที่ใช้ในการเข้ารหัสไฟล์ ซึ่งจะทำให้สามารถกู้คืนไฟล์ของผู้ใช้ที่ลืมรหัสผ่านได้",
- "Recovery key password" : "รหัสผ่านสำหรับรหัสกู้คืน",
+ "Recovery key password" : "รหัสผ่านสำหรับคีย์การกู้คืน",
"Repeat recovery key password" : "ใส่รหัสผ่านของคีย์การกู้คืนอีกครั้ง",
"Change recovery key password:" : "เปลี่ยนรหัสผ่านของคีย์การกู้คืน:",
"Old recovery key password" : "รหัสผ่านของคีย์การกู้คืนเก่า",
@@ -40,7 +37,6 @@ OC.L10N.register(
"Change Password" : "เปลี่ยนรหัสผ่าน",
"Your private key password no longer matches your log-in password." : "รหัสผ่านคีย์ส่วนตัวของคุณ ไม่ตรงกับรหัสผ่านที่ใช้เข้าสู่ระบบของคุณอีกต่อไป",
"Set your old private key password to your current log-in password:" : "ตั้งรหัสผ่านคีย์ส่วนตัวเก่าของคุณเป็นรหัสผ่านเข้าสู่ระบบปัจจุบันของคุณ:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "ถ้าคุณลืมรหัสผ่านเก่าของคุณ คุณสามารถขอให้ผู้ดูแลระบบกู้คืนไฟล์ของคุณ",
"Old log-in password" : "รหัสผ่านเข้าสู่ระบบเดิม",
"Current log-in password" : "รหัสผ่านเข้าสู่ระบบปัจจุบัน",
"Update Private Key Password" : "อัปเดตรหัสผ่านคีย์ส่วนตัว",
diff --git a/apps/encryption/l10n/th.json b/apps/encryption/l10n/th.json
index 504d465e1f6..017602e4584 100644
--- a/apps/encryption/l10n/th.json
+++ b/apps/encryption/l10n/th.json
@@ -1,9 +1,9 @@
{ "translations": {
"Missing recovery key password" : "รหัสผ่านของคีย์การกู้คืนขาดหาย",
"Please repeat the recovery key password" : "กรุณาใส่รหัสผ่านของคีย์การกู้คืนอีกครั้ง",
- "Repeated recovery key password does not match the provided 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!" : "ไม่สามารถเปิดใช้งานรหัสกู้คืน กรุณาตรวจสอบรหัสผ่านสำหรับรหัสกู้คืนของคุณ!",
+ "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" : "ค่าพารามิเตอร์ขาดหาย",
@@ -22,14 +22,11 @@
"Bad Signature" : "ลายเซ็นไม่ดี",
"Missing Signature" : "ลายเซ็นขาดหายไป",
"one-time password for server-side-encryption" : "รหัสผ่านใช้ครั้งเดียว สำหรับการเข้ารหัสฝั่งเซิร์ฟเวอร์",
- "The share will expire on %s." : "การแชร์จะหมดอายุในวันที่ %s",
- "Cheers!" : "ไชโย!",
"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 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." : "คีย์การกู้คืนเป็นคีย์เข้ารหัสเพิ่มเติมที่ใช้ในการเข้ารหัสไฟล์ ซึ่งจะทำให้สามารถกู้คืนไฟล์ของผู้ใช้ที่ลืมรหัสผ่านได้",
- "Recovery key password" : "รหัสผ่านสำหรับรหัสกู้คืน",
+ "Recovery key password" : "รหัสผ่านสำหรับคีย์การกู้คืน",
"Repeat recovery key password" : "ใส่รหัสผ่านของคีย์การกู้คืนอีกครั้ง",
"Change recovery key password:" : "เปลี่ยนรหัสผ่านของคีย์การกู้คืน:",
"Old recovery key password" : "รหัสผ่านของคีย์การกู้คืนเก่า",
@@ -38,7 +35,6 @@
"Change Password" : "เปลี่ยนรหัสผ่าน",
"Your private key password no longer matches your log-in password." : "รหัสผ่านคีย์ส่วนตัวของคุณ ไม่ตรงกับรหัสผ่านที่ใช้เข้าสู่ระบบของคุณอีกต่อไป",
"Set your old private key password to your current log-in password:" : "ตั้งรหัสผ่านคีย์ส่วนตัวเก่าของคุณเป็นรหัสผ่านเข้าสู่ระบบปัจจุบันของคุณ:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "ถ้าคุณลืมรหัสผ่านเก่าของคุณ คุณสามารถขอให้ผู้ดูแลระบบกู้คืนไฟล์ของคุณ",
"Old log-in password" : "รหัสผ่านเข้าสู่ระบบเดิม",
"Current log-in password" : "รหัสผ่านเข้าสู่ระบบปัจจุบัน",
"Update Private Key Password" : "อัปเดตรหัสผ่านคีย์ส่วนตัว",
diff --git a/apps/encryption/l10n/tr.js b/apps/encryption/l10n/tr.js
index 84ef63ecef8..dad06799b7e 100644
--- a/apps/encryption/l10n/tr.js
+++ b/apps/encryption/l10n/tr.js
@@ -1,48 +1,48 @@
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ö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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Bu şifreleme modülünün kullanılması için sunucu tarafında yönetim bölümünden\n\t\tşifreleme seçeneği etkinleştirilmelidir. Bu modül etkinleştirildikten sonra \n\t\ttüm dosyalarınızı size farkettirmeden şifreler. Şifreleme AES 256 anahtarları\n\t\tile yapılır. Modül var olan dosyaları değiştirmez, yalnızca sunucu tarafında \n\t\tşifreleme etkinleştirildikten sonra eklenen yeni dosyalar şifrelenir. \n\t\tŞifreleme etkinleştirildikten sonra devre dışı bırakılamaz ve şifreleme olmayan\n\t\tsisteme geri dönülemez. Lütfen sunucu tarafı şifrelemeyi etkinleştirmeden önce\n\t\tbelgeleri okuyun ve uygulamadan doğacak tüm sonuçlarını öğrenin.",
- "Hey there,\n\nThe administration 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" : "Selam,\n\nSistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız \"%s\" parolası kullanılarak şifrelendi.\n\nLütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan \"Temel şifreleme modülü\" bölümüne giderek \"Eski oturum açma parolası\" alanına bu parolayı ve geçerli oturum açma parolanızı yazarak şifreleme parolanızı güncelleyin.\n\n",
- "The share will expire on %s." : "Bu paylaşımın geçerlilik süresi %s tarihinde dolacak.",
- "Cheers!" : "Hoşçakalın!",
- "Hey there,<br><br>The administration 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>" : "Selam,<br><br>Sistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız <strong>%s</strong> parolası kullanılarak şifrelendi.<br><br>Lütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan \"Temel şifreleme modülü\" bölümüne giderek \"Eski oturum açma parolası\" alanına bu parolayı ve geçerli oturum açma parolanızı yazarak şifreleme parolanızı güncelleyin.<br><br>",
- "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",
- "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.",
+ "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ı",
"Change recovery key password:" : "Kurtarma anahtarı parolasını değiştir:",
@@ -53,13 +53,13 @@ OC.L10N.register(
"Basic encryption module" : "Temel şifreleme modülü",
"Your private key password no longer matches your log-in password." : "Kişisel anahtar parolanız artık oturum açma parolanız ile eşleşmiyor.",
"Set your old private key password to your current log-in password:" : "Eski kişisel anahtar parolanızı, geçerli oturum açma parolanız olarak ayarlayın:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Eski parolanızı hatırlamıyorsanız, BT yöneticinizden dosyalarınızı kurtarmasını isteyebilirsiniz.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Eski parolanızı hatırlamıyorsanız, BT yöneticinizden dosyalarınızı kurtarmasını isteyebilirsiniz.",
"Old log-in password" : "Eski oturum açma parolası",
"Current log-in password" : "Geçerli oturum açma parolası",
"Update Private Key Password" : "Kişisel anahtar parolasını güncelle",
- "Enable password recovery:" : "Parola 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ışı"
+ "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 efeefe65f90..4f3ff388ad1 100644
--- a/apps/encryption/l10n/tr.json
+++ b/apps/encryption/l10n/tr.json
@@ -1,46 +1,46 @@
{ "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ö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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Bu şifreleme modülünün kullanılması için sunucu tarafında yönetim bölümünden\n\t\tşifreleme seçeneği etkinleştirilmelidir. Bu modül etkinleştirildikten sonra \n\t\ttüm dosyalarınızı size farkettirmeden şifreler. Şifreleme AES 256 anahtarları\n\t\tile yapılır. Modül var olan dosyaları değiştirmez, yalnızca sunucu tarafında \n\t\tşifreleme etkinleştirildikten sonra eklenen yeni dosyalar şifrelenir. \n\t\tŞifreleme etkinleştirildikten sonra devre dışı bırakılamaz ve şifreleme olmayan\n\t\tsisteme geri dönülemez. Lütfen sunucu tarafı şifrelemeyi etkinleştirmeden önce\n\t\tbelgeleri okuyun ve uygulamadan doğacak tüm sonuçlarını öğrenin.",
- "Hey there,\n\nThe administration 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" : "Selam,\n\nSistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız \"%s\" parolası kullanılarak şifrelendi.\n\nLütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan \"Temel şifreleme modülü\" bölümüne giderek \"Eski oturum açma parolası\" alanına bu parolayı ve geçerli oturum açma parolanızı yazarak şifreleme parolanızı güncelleyin.\n\n",
- "The share will expire on %s." : "Bu paylaşımın geçerlilik süresi %s tarihinde dolacak.",
- "Cheers!" : "Hoşçakalın!",
- "Hey there,<br><br>The administration 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>" : "Selam,<br><br>Sistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız <strong>%s</strong> parolası kullanılarak şifrelendi.<br><br>Lütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan \"Temel şifreleme modülü\" bölümüne giderek \"Eski oturum açma parolası\" alanına bu parolayı ve geçerli oturum açma parolanızı yazarak şifreleme parolanızı güncelleyin.<br><br>",
- "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",
- "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.",
+ "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ı",
"Change recovery key password:" : "Kurtarma anahtarı parolasını değiştir:",
@@ -51,13 +51,13 @@
"Basic encryption module" : "Temel şifreleme modülü",
"Your private key password no longer matches your log-in password." : "Kişisel anahtar parolanız artık oturum açma parolanız ile eşleşmiyor.",
"Set your old private key password to your current log-in password:" : "Eski kişisel anahtar parolanızı, geçerli oturum açma parolanız olarak ayarlayın:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Eski parolanızı hatırlamıyorsanız, BT yöneticinizden dosyalarınızı kurtarmasını isteyebilirsiniz.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Eski parolanızı hatırlamıyorsanız, BT yöneticinizden dosyalarınızı kurtarmasını isteyebilirsiniz.",
"Old log-in password" : "Eski oturum açma parolası",
"Current log-in password" : "Geçerli oturum açma parolası",
"Update Private Key Password" : "Kişisel anahtar parolasını güncelle",
- "Enable password recovery:" : "Parola 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ışı"
+ "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 28e6083e6df..d17b0892569 100644
--- a/apps/encryption/l10n/uk.js
+++ b/apps/encryption/l10n/uk.js
@@ -21,25 +21,28 @@ 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" : "Програма для шифрування ввімкнена та готова",
+ "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" : "Типовий модуль шифрування для шифрування на стороні сервера",
- "The share will expire on %s." : "Спільний доступ закінчиться %s.",
- "Cheers!" : "Будьмо!",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Програму для шифрування ввімкнено, але ваші ключі не ініціалізовано. Будь ласка, вийдіть із системи та увійдіть знову",
+ "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 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 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,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "Основний модуль шифрування",
"Your private key password no longer matches your log-in password." : "Пароль вашого закритого ключа більше не відповідає паролю від вашого облікового запису.",
"Set your old private key password to your current log-in password:" : "Замініть старий пароль від закритого ключа на новий пароль входу:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до адміністратора щоб його відновити.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до вашого адміністратора для відновлення ваших файлів.",
"Old log-in password" : "Старий пароль входу",
"Current log-in password" : "Поточний пароль входу",
"Update Private Key Password" : "Оновити пароль для закритого ключа",
diff --git a/apps/encryption/l10n/uk.json b/apps/encryption/l10n/uk.json
index 7446067843a..6f2c589357e 100644
--- a/apps/encryption/l10n/uk.json
+++ b/apps/encryption/l10n/uk.json
@@ -19,25 +19,28 @@
"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" : "Програма для шифрування ввімкнена та готова",
+ "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" : "Типовий модуль шифрування для шифрування на стороні сервера",
- "The share will expire on %s." : "Спільний доступ закінчиться %s.",
- "Cheers!" : "Будьмо!",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Програму для шифрування ввімкнено, але ваші ключі не ініціалізовано. Будь ласка, вийдіть із системи та увійдіть знову",
+ "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 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 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,7 +51,7 @@
"Basic encryption module" : "Основний модуль шифрування",
"Your private key password no longer matches your log-in password." : "Пароль вашого закритого ключа більше не відповідає паролю від вашого облікового запису.",
"Set your old private key password to your current log-in password:" : "Замініть старий пароль від закритого ключа на новий пароль входу:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до адміністратора щоб його відновити.",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до вашого адміністратора для відновлення ваших файлів.",
"Old log-in password" : "Старий пароль входу",
"Current log-in password" : "Поточний пароль входу",
"Update Private Key Password" : "Оновити пароль для закритого ключа",
diff --git a/apps/encryption/l10n/ur_PK.js b/apps/encryption/l10n/ur_PK.js
deleted file mode 100644
index 9fbed2e780f..00000000000
--- a/apps/encryption/l10n/ur_PK.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Cheers!" : "واہ!"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/ur_PK.json b/apps/encryption/l10n/ur_PK.json
deleted file mode 100644
index f798bdf2a7b..00000000000
--- a/apps/encryption/l10n/ur_PK.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Cheers!" : "واہ!"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/vi.js b/apps/encryption/l10n/vi.js
deleted file mode 100644
index d325fc71661..00000000000
--- a/apps/encryption/l10n/vi.js
+++ /dev/null
@@ -1,26 +0,0 @@
-OC.L10N.register(
- "encryption",
- {
- "Missing recovery key password" : "Thiếu khóa khôi phục mật khẩu",
- "Please repeat the recovery key password" : "Nhập lại khóa khôi phục mật khẩu",
- "Recovery key successfully enabled" : "Khóa khôi phục kích hoạt thành công",
- "Could not enable recovery key. Please check your recovery key password!" : "Không thể kích hoạt khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
- "Recovery key successfully disabled" : "Vô hiệu hóa khóa khôi phục thành công",
- "Could not disable recovery key. Please check your recovery key password!" : "Không thể vô hiệu hóa khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
- "Password successfully changed." : "Đã đổi mật khẩu.",
- "Could not change the password. Maybe the old password was not correct." : "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
- "Private key password successfully updated." : "Cập nhật thành công mật khẩu khóa cá nhân",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại",
- "The share will expire on %s." : "Chia sẻ này sẽ hết hiệu lực vào %s.",
- "Cheers!" : "Chúc mừng!",
- "Change Password" : "Đổi Mật khẩu",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Nếu bạn không nhớ mật khẩu cũ, bạn có thể yêu cầu quản trị viên khôi phục tập tin của bạn.",
- "Old log-in password" : "Mật khẩu đăng nhập cũ",
- "Current log-in password" : "Mật khẩu đăng nhập hiện tại",
- "Update Private Key Password" : "Cập nhật mật khẩu khóa cá nhân",
- "Enable password recovery:" : "Kích hoạt khôi phục mật khẩu:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tùy chọn này sẽ cho phép bạn tái truy cập đến các tập tin mã hóa trong trường hợp mất mật khẩu",
- "Enabled" : "Bật",
- "Disabled" : "Tắt"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/vi.json b/apps/encryption/l10n/vi.json
deleted file mode 100644
index 78ed43b7047..00000000000
--- a/apps/encryption/l10n/vi.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{ "translations": {
- "Missing recovery key password" : "Thiếu khóa khôi phục mật khẩu",
- "Please repeat the recovery key password" : "Nhập lại khóa khôi phục mật khẩu",
- "Recovery key successfully enabled" : "Khóa khôi phục kích hoạt thành công",
- "Could not enable recovery key. Please check your recovery key password!" : "Không thể kích hoạt khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
- "Recovery key successfully disabled" : "Vô hiệu hóa khóa khôi phục thành công",
- "Could not disable recovery key. Please check your recovery key password!" : "Không thể vô hiệu hóa khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
- "Password successfully changed." : "Đã đổi mật khẩu.",
- "Could not change the password. Maybe the old password was not correct." : "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
- "Private key password successfully updated." : "Cập nhật thành công mật khẩu khóa cá nhân",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại",
- "The share will expire on %s." : "Chia sẻ này sẽ hết hiệu lực vào %s.",
- "Cheers!" : "Chúc mừng!",
- "Change Password" : "Đổi Mật khẩu",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Nếu bạn không nhớ mật khẩu cũ, bạn có thể yêu cầu quản trị viên khôi phục tập tin của bạn.",
- "Old log-in password" : "Mật khẩu đăng nhập cũ",
- "Current log-in password" : "Mật khẩu đăng nhập hiện tại",
- "Update Private Key Password" : "Cập nhật mật khẩu khóa cá nhân",
- "Enable password recovery:" : "Kích hoạt khôi phục mật khẩu:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tùy chọn này sẽ cho phép bạn tái truy cập đến các tập tin mã hóa trong trường hợp mất mật khẩu",
- "Enabled" : "Bật",
- "Disabled" : "Tắt"
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/encryption/l10n/zh_CN.js b/apps/encryption/l10n/zh_CN.js
index 6b80cc3f294..79496467c11 100644
--- a/apps/encryption/l10n/zh_CN.js
+++ b/apps/encryption/l10n/zh_CN.js
@@ -23,26 +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" : "服务器端加密的默认加密模块",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "您需要在管理员设置中启用服务器端加密功能以使用此加密模块。\n\t\t此模块一旦被启用您的所有文件将被其透明地加密。\n\t\t加密基于AES 256密钥。在服务器端加密功能启用后,此模块\n\t\t将不会触碰已存在的文件,而只会对新文件进行加密。\n\t\t再次禁用加密功能也不可能切换回一个未加密的系统。\n\t\t在您决定启用服务器端加密功能前请阅读文档以了解\n\t\t这一操作的所有后果。",
- "Hey there,\n\nThe administration 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" : "嘿,\n\n管理员启用了服务器端加密。你的文件使用密码 \"%s\" 加密。\n\n请登录 web 界面,进入你个人设置的 “基本加密模块” 部分,在 “旧登录密码” 字段中输入该密码和当前登录密码来更新你的加密密码。\n",
- "The share will expire on %s." : "此共享将在 %s 过期。",
- "Cheers!" : "干杯!",
- "Hey there,<br><br>The administration 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>" : "嘿,<br><br>管理员已启用服务器端加密,您的文件已使用密码 <strong>%s</strong>加密。<br><br>请登陆网页界面,进入个人设置中的 “基础加密模块” 部分,在 “旧登陆密码” 字段输入上述密码及您的当前登陆密码,即可更新加密密码。<br><br>",
+ "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 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 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:" : "更改恢复密钥密码:",
@@ -53,7 +52,6 @@ OC.L10N.register(
"Basic encryption module" : "基础加密模块",
"Your private key password no longer matches your log-in password." : "您的私钥不再与您的登录密码匹配。",
"Set your old private key password to your current log-in password:" : "将的私钥设置为当前登录密码:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "如果您记不住旧的密码,您可以请求管理员恢复您的文件。",
"Old log-in password" : "旧登录密码",
"Current log-in password" : "当前登录密码",
"Update Private Key Password" : "更新私钥密码",
diff --git a/apps/encryption/l10n/zh_CN.json b/apps/encryption/l10n/zh_CN.json
index 910cfae53f3..2d5411013dc 100644
--- a/apps/encryption/l10n/zh_CN.json
+++ b/apps/encryption/l10n/zh_CN.json
@@ -21,26 +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" : "服务器端加密的默认加密模块",
- "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "您需要在管理员设置中启用服务器端加密功能以使用此加密模块。\n\t\t此模块一旦被启用您的所有文件将被其透明地加密。\n\t\t加密基于AES 256密钥。在服务器端加密功能启用后,此模块\n\t\t将不会触碰已存在的文件,而只会对新文件进行加密。\n\t\t再次禁用加密功能也不可能切换回一个未加密的系统。\n\t\t在您决定启用服务器端加密功能前请阅读文档以了解\n\t\t这一操作的所有后果。",
- "Hey there,\n\nThe administration 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" : "嘿,\n\n管理员启用了服务器端加密。你的文件使用密码 \"%s\" 加密。\n\n请登录 web 界面,进入你个人设置的 “基本加密模块” 部分,在 “旧登录密码” 字段中输入该密码和当前登录密码来更新你的加密密码。\n",
- "The share will expire on %s." : "此共享将在 %s 过期。",
- "Cheers!" : "干杯!",
- "Hey there,<br><br>The administration 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>" : "嘿,<br><br>管理员已启用服务器端加密,您的文件已使用密码 <strong>%s</strong>加密。<br><br>请登陆网页界面,进入个人设置中的 “基础加密模块” 部分,在 “旧登陆密码” 字段输入上述密码及您的当前登陆密码,即可更新加密密码。<br><br>",
+ "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 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 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:" : "更改恢复密钥密码:",
@@ -51,7 +50,6 @@
"Basic encryption module" : "基础加密模块",
"Your private key password no longer matches your log-in password." : "您的私钥不再与您的登录密码匹配。",
"Set your old private key password to your current log-in password:" : "将的私钥设置为当前登录密码:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "如果您记不住旧的密码,您可以请求管理员恢复您的文件。",
"Old log-in password" : "旧登录密码",
"Current log-in password" : "当前登录密码",
"Update Private Key Password" : "更新私钥密码",
diff --git a/apps/encryption/l10n/zh_HK.js b/apps/encryption/l10n/zh_HK.js
index 591b2491b42..5084a5871f1 100644
--- a/apps/encryption/l10n/zh_HK.js
+++ b/apps/encryption/l10n/zh_HK.js
@@ -21,28 +21,28 @@ 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" : "加密應用程式已啟用並準備就緒",
"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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "為了使用此加密模組,您需要啟用伺服器端\n管理員設置中的加密設定。啟用後,該模組將加密您的所有之後傳輸的檔案。此加密方式使用AES 256密鑰。\n該模組不會觸及已存在的檔案,只會加密新處理的檔案\n啟用伺服器端加密後。也不可能\n再次停用加密,然後切換回未加密的系統。\n在決定啟用伺服器端加密之前,請閱讀文檔以了解所有含義。",
- "Hey there,\n\nThe administration 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" : "嗨,\n\n系管理員啟用了伺服器端的加密功能,您的檔案已使用密碼 \"%s\" 加密。\n\n請使用網頁介面登入,到您個人設定中的「基本加密模組」,並在「舊登入密碼」欄位輸入此密碼與您目前的登入密碼來更新加密密碼。\n",
- "The share will expire on %s." : "這個分享將會於 %s 過期。",
- "Cheers!" : "太棒了!",
- "Hey there,<br><br>The administration 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>" : "嗨,<br><br>管理員啟用了伺服器端加密的功能,您的檔案已使用密碼<strong>%s</strong>加密。<br><br>請使用網頁界面 登入,到您個人設定中的「基本加密模組」,並在「舊登入密碼」欄位輸入此密碼與您目前的登入密碼來更新加密密碼。<br><br>",
+ "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" : "請啟用這個功能以用來加密主要儲存空間的檔案,否則只有再外部儲存的檔案會加密",
"Enable recovery key" : "啟用還原密鑰",
"Disable recovery key" : "關閉還原密鑰",
- "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 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:" : "更新還原密鑰密碼:",
@@ -53,7 +53,7 @@ OC.L10N.register(
"Basic encryption module" : "基本加密模組",
"Your private key password no longer matches your log-in password." : "您的私人密鑰密碼不符合您的登入密碼",
"Set your old private key password to your current log-in password:" : "設定您的舊私人密鑰密碼到您現在的登入密碼:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
"Old log-in password" : "舊登入密碼",
"Current log-in password" : "目前的登入密碼",
"Update Private Key Password" : "更新私人密鑰密碼",
diff --git a/apps/encryption/l10n/zh_HK.json b/apps/encryption/l10n/zh_HK.json
index 84ca9632261..e8e49796265 100644
--- a/apps/encryption/l10n/zh_HK.json
+++ b/apps/encryption/l10n/zh_HK.json
@@ -19,28 +19,28 @@
"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" : "加密應用程式已啟用並準備就緒",
"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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "為了使用此加密模組,您需要啟用伺服器端\n管理員設置中的加密設定。啟用後,該模組將加密您的所有之後傳輸的檔案。此加密方式使用AES 256密鑰。\n該模組不會觸及已存在的檔案,只會加密新處理的檔案\n啟用伺服器端加密後。也不可能\n再次停用加密,然後切換回未加密的系統。\n在決定啟用伺服器端加密之前,請閱讀文檔以了解所有含義。",
- "Hey there,\n\nThe administration 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" : "嗨,\n\n系管理員啟用了伺服器端的加密功能,您的檔案已使用密碼 \"%s\" 加密。\n\n請使用網頁介面登入,到您個人設定中的「基本加密模組」,並在「舊登入密碼」欄位輸入此密碼與您目前的登入密碼來更新加密密碼。\n",
- "The share will expire on %s." : "這個分享將會於 %s 過期。",
- "Cheers!" : "太棒了!",
- "Hey there,<br><br>The administration 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>" : "嗨,<br><br>管理員啟用了伺服器端加密的功能,您的檔案已使用密碼<strong>%s</strong>加密。<br><br>請使用網頁界面 登入,到您個人設定中的「基本加密模組」,並在「舊登入密碼」欄位輸入此密碼與您目前的登入密碼來更新加密密碼。<br><br>",
+ "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" : "請啟用這個功能以用來加密主要儲存空間的檔案,否則只有再外部儲存的檔案會加密",
"Enable recovery key" : "啟用還原密鑰",
"Disable recovery key" : "關閉還原密鑰",
- "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 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:" : "更新還原密鑰密碼:",
@@ -51,7 +51,7 @@
"Basic encryption module" : "基本加密模組",
"Your private key password no longer matches your log-in password." : "您的私人密鑰密碼不符合您的登入密碼",
"Set your old private key password to your current log-in password:" : "設定您的舊私人密鑰密碼到您現在的登入密碼:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
+ "If you do not remember your old password you can ask your administrator to recover your files." : "如果您忘記舊密碼,可以請求管理員協助取回檔案。",
"Old log-in password" : "舊登入密碼",
"Current log-in password" : "目前的登入密碼",
"Update Private Key Password" : "更新私人密鑰密碼",
diff --git a/apps/encryption/l10n/zh_TW.js b/apps/encryption/l10n/zh_TW.js
index 3585d179026..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,54 +11,54 @@ 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." : "請登入網頁介面,請到個人設定中的「安全」區塊,透過輸入此密碼至「舊登入密碼」欄位與您目前的登入密碼,來更新您的加密密碼。",
"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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "為了使用此加密模組,您必須在管理員設定中\n\t\t啟用伺服器端加密。啟用後,此模組將會\n\t\t加密您之後傳輸的所有檔案。此加密是以 AES 256 金鑰為基礎。\n\t\t此模組將不會處理既有的檔案,僅會加密\n\t\t在伺服器端加密啟用後的新檔案。同時也\n\t\t無法停用加密並切換回未加密的系統。\n\t\t在您決定啟用伺服器端加密前,請閱讀文\n\t\t件得知其實際作用與影響。",
- "Hey there,\n\nThe administration 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" : "嗨,請看這裡,\n\n管理員啟用了伺服器端加密的功能,您的檔案將會使用密碼「%s」加密。\n\n請使用網頁介面登入,到您個人設定中的「基本加密模組」,並在「舊登入密碼」欄位輸入此密碼與您目前的登入密碼來更新加密密碼。\n\n",
- "The share will expire on %s." : "這個分享將會於 %s 過期。",
- "Cheers!" : "太棒了!",
- "Hey there,<br><br>The administration 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>" : "嗨,請看這裡,<br><br>管理員啟用了伺服器端加密的功能,您的檔案將會使用密碼<strong>%s</strong>加密。<br><br>請使用網頁介面登入,到您個人設定中的「基本加密模組」,並在「舊登入密碼」欄位輸入此密碼與您目前的登入密碼來更新加密密碼。<br><br>",
+ "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 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 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" : "已停用"
},
diff --git a/apps/encryption/l10n/zh_TW.json b/apps/encryption/l10n/zh_TW.json
index b62d29d55a5..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,54 +9,54 @@
"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." : "請登入網頁介面,請到個人設定中的「安全」區塊,透過輸入此密碼至「舊登入密碼」欄位與您目前的登入密碼,來更新您的加密密碼。",
"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\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "為了使用此加密模組,您必須在管理員設定中\n\t\t啟用伺服器端加密。啟用後,此模組將會\n\t\t加密您之後傳輸的所有檔案。此加密是以 AES 256 金鑰為基礎。\n\t\t此模組將不會處理既有的檔案,僅會加密\n\t\t在伺服器端加密啟用後的新檔案。同時也\n\t\t無法停用加密並切換回未加密的系統。\n\t\t在您決定啟用伺服器端加密前,請閱讀文\n\t\t件得知其實際作用與影響。",
- "Hey there,\n\nThe administration 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" : "嗨,請看這裡,\n\n管理員啟用了伺服器端加密的功能,您的檔案將會使用密碼「%s」加密。\n\n請使用網頁介面登入,到您個人設定中的「基本加密模組」,並在「舊登入密碼」欄位輸入此密碼與您目前的登入密碼來更新加密密碼。\n\n",
- "The share will expire on %s." : "這個分享將會於 %s 過期。",
- "Cheers!" : "太棒了!",
- "Hey there,<br><br>The administration 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>" : "嗨,請看這裡,<br><br>管理員啟用了伺服器端加密的功能,您的檔案將會使用密碼<strong>%s</strong>加密。<br><br>請使用網頁介面登入,到您個人設定中的「基本加密模組」,並在「舊登入密碼」欄位輸入此密碼與您目前的登入密碼來更新加密密碼。<br><br>",
+ "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 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 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" : "已停用"
},"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/encryption/lib/AppInfo/Application.php b/apps/encryption/lib/AppInfo/Application.php
index 63239a1bf9b..b1bf93b9dea 100644
--- a/apps/encryption/lib/AppInfo/Application.php
+++ b/apps/encryption/lib/AppInfo/Application.php
@@ -1,91 +1,111 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * 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;
+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 App implements IBootstrap {
+ public const APP_ID = 'encryption';
+
+ public function __construct(array $urlParams = []) {
+ parent::__construct(self::APP_ID, $urlParams);
+ }
-class Application extends \OCP\AppFramework\App {
- /**
- * @param array $urlParams
- */
- public function __construct($urlParams = []) {
- parent::__construct('encryption', $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->getLogger(),
- $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(
@@ -93,15 +113,15 @@ 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()->getLogger(),
- $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 6000d6021c8..0b8b8e39e78 100644
--- a/apps/encryption/lib/Command/DisableMasterKey.php
+++ b/apps/encryption/lib/Command/DisableMasterKey.php
@@ -1,26 +1,8 @@
<?php
+
/**
- * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\Encryption\Command;
@@ -33,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.');
@@ -68,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
new file mode 100644
index 00000000000..a9add1ad93b
--- /dev/null
+++ b/apps/encryption/lib/Command/DropLegacyFileKey.php
@@ -0,0 +1,150 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Encryption\Command;
+
+use OC\Encryption\Exceptions\DecryptionFailedException;
+use OC\Files\FileInfo;
+use OC\Files\View;
+use OCA\Encryption\KeyManager;
+use OCP\Encryption\Exceptions\GenericEncryptionException;
+use OCP\IUserManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class DropLegacyFileKey extends Command {
+ private View $rootView;
+
+ public function __construct(
+ private IUserManager $userManager,
+ private KeyManager $keyManager,
+ ) {
+ parent::__construct();
+
+ $this->rootView = new View();
+ }
+
+ protected function configure(): void {
+ $this
+ ->setName('encryption:drop-legacy-filekey')
+ ->setDescription('Scan the files for the legacy filekey format using RC4 and get rid of it (if master key is enabled)');
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output): int {
+ $result = true;
+
+ $output->writeln('<info>Scanning all files for legacy filekey</info>');
+
+ foreach ($this->userManager->getBackends() as $backend) {
+ $limit = 500;
+ $offset = 0;
+ do {
+ $users = $backend->getUsers('', $limit, $offset);
+ foreach ($users as $user) {
+ $output->writeln('Scanning all files for ' . $user);
+ $this->setupUserFS($user);
+ $result = $result && $this->scanFolder($output, '/' . $user);
+ }
+ $offset += $limit;
+ } while (count($users) >= $limit);
+ }
+
+ if ($result) {
+ $output->writeln('All scanned files are properly encrypted.');
+ return self::SUCCESS;
+ }
+
+ return self::FAILURE;
+ }
+
+ private function scanFolder(OutputInterface $output, string $folder): bool {
+ $clean = true;
+
+ foreach ($this->rootView->getDirectoryContent($folder) as $item) {
+ $path = $folder . '/' . $item['name'];
+ if ($this->rootView->is_dir($path)) {
+ if ($this->scanFolder($output, $path) === false) {
+ $clean = false;
+ }
+ } else {
+ if (!$item->isEncrypted()) {
+ // ignore
+ continue;
+ }
+
+ $stats = $this->rootView->stat($path);
+ if (!isset($stats['hasHeader']) || $stats['hasHeader'] === false) {
+ $clean = false;
+ $output->writeln('<error>' . $path . ' does not have a proper header</error>');
+ } else {
+ try {
+ $legacyFileKey = $this->keyManager->getFileKey($path, null, true);
+ if ($legacyFileKey === '') {
+ $output->writeln('Got an empty legacy filekey for ' . $path . ', continuing', OutputInterface::VERBOSITY_VERBOSE);
+ continue;
+ }
+ } catch (GenericEncryptionException $e) {
+ $output->writeln('Got a decryption error for legacy filekey for ' . $path . ', continuing', OutputInterface::VERBOSITY_VERBOSE);
+ continue;
+ }
+ /* If that did not throw and filekey is not empty, a legacy filekey is used */
+ $clean = false;
+ $output->writeln($path . ' is using a legacy filekey, migrating');
+ $this->migrateSinglefile($path, $item, $output);
+ }
+ }
+ }
+
+ return $clean;
+ }
+
+ private function migrateSinglefile(string $path, FileInfo $fileInfo, OutputInterface $output): void {
+ $source = $path;
+ $target = $path . '.reencrypted.' . time();
+
+ try {
+ $this->rootView->copy($source, $target);
+ $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);
+ }
+ if (stream_copy_to_stream($copyResource, $sourceResource) === false) {
+ $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;
+ }
+ $this->rootView->touch($source, $fileInfo->getMTime());
+ $this->rootView->unlink($target);
+ $output->writeln('<info>Migrated ' . $source . '</info>', OutputInterface::VERBOSITY_VERBOSE);
+ } catch (DecryptionFailedException $e) {
+ if ($this->rootView->file_exists($target)) {
+ $this->rootView->unlink($target);
+ }
+ $output->writeln('<error>Failed to migrate ' . $path . '</error>');
+ $output->writeln('<error>' . $e . '</error>', OutputInterface::VERBOSITY_VERBOSE);
+ } finally {
+ if (is_resource($copyResource)) {
+ fclose($copyResource);
+ }
+ if (is_resource($sourceResource)) {
+ fclose($sourceResource);
+ }
+ }
+ }
+
+ /**
+ * setup user file system
+ */
+ protected function setupUserFS(string $uid): void {
+ \OC_Util::tearDownFS();
+ \OC_Util::setupFS($uid);
+ }
+}
diff --git a/apps/encryption/lib/Command/EnableMasterKey.php b/apps/encryption/lib/Command/EnableMasterKey.php
index 031f6e3fa4e..0d8b893e0e2 100644
--- a/apps/encryption/lib/Command/EnableMasterKey.php
+++ b/apps/encryption/lib/Command/EnableMasterKey.php
@@ -1,25 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Command;
@@ -32,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.');
@@ -67,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 a6f2a55bb79..462e3a5cc2a 100644
--- a/apps/encryption/lib/Command/FixEncryptedVersion.php
+++ b/apps/encryption/lib/Command/FixEncryptedVersion.php
@@ -1,23 +1,9 @@
<?php
+
/**
- * @author Sujith Haridasan <sharidasan@owncloud.com>
- * @author Ilja Neumann <ineumann@owncloud.com>
- *
- * @copyright Copyright (c) 2019, ownCloud GmbH
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2019 ownCloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Command;
@@ -26,12 +12,13 @@ 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;
-use OCP\ILogger;
use OCP\IUser;
use OCP\IUserManager;
+use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
@@ -39,43 +26,16 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
class FixEncryptedVersion extends Command {
- /** @var IConfig */
- private $config;
-
- /** @var ILogger */
- private $logger;
-
- /** @var IRootFolder */
- private $rootFolder;
-
- /** @var IUserManager */
- private $userManager;
-
- /** @var Util */
- private $util;
-
- /** @var View */
- private $view;
-
- /** @var bool */
- private $supportLegacy;
+ private bool $supportLegacy = false;
public function __construct(
- IConfig $config,
- ILogger $logger,
- IRootFolder $rootFolder,
- IUserManager $userManager,
- Util $util,
- View $view
+ private IConfig $config,
+ private LoggerInterface $logger,
+ private IRootFolder $rootFolder,
+ private IUserManager $userManager,
+ private Util $util,
+ private View $view,
) {
- $this->config = $config;
- $this->logger = $logger;
- $this->rootFolder = $rootFolder;
- $this->userManager = $userManager;
- $this->util = $util;
- $this->view = $view;
- $this->supportLegacy = false;
-
parent::__construct();
}
@@ -108,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);
@@ -161,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;
@@ -183,7 +145,7 @@ class FixEncryptedVersion extends Command {
}
}
}
- return 0;
+ return self::SUCCESS;
}
/**
@@ -235,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) {
@@ -244,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
@@ -293,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;
@@ -307,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--;
@@ -330,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 5339247ae19..da529a4be2f 100644
--- a/apps/encryption/lib/Command/FixKeyLocation.php
+++ b/apps/encryption/lib/Command/FixKeyLocation.php
@@ -2,33 +2,21 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2022 Robin Appelman <robin@icewind.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\Encryption\Command;
+use OC\Encryption\Manager;
use OC\Encryption\Util;
+use OC\Files\Storage\Wrapper\Encryption;
use OC\Files\View;
+use OCP\Encryption\IManager;
use OCP\Files\Config\ICachedMountInfo;
use OCP\Files\Config\IUserMountCache;
-use OCP\Files\Folder;
use OCP\Files\File;
+use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\IUser;
@@ -40,20 +28,23 @@ 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) {
- $this->userManager = $userManager;
- $this->userMountCache = $userMountCache;
- $this->encryptionUtil = $encryptionUtil;
- $this->rootFolder = $rootFolder;
+ public function __construct(
+ private IUserManager $userManager,
+ private IUserMountCache $userMountCache,
+ private Util $encryptionUtil,
+ private IRootFolder $rootFolder,
+ IManager $encryptionManager,
+ ) {
$this->keyRootDirectory = rtrim($this->encryptionUtil->getKeyStorageRoot(), '/');
$this->rootView = new View();
+ if (!$encryptionManager instanceof Manager) {
+ throw new \Exception('Wrong encryption manager');
+ }
+ $this->encryptionManager = $encryptionManager;
parent::__construct();
}
@@ -66,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 {
@@ -75,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());
@@ -84,103 +75,326 @@ 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;
}
- $files = $this->getAllFiles($mountRootFolder);
+ $files = $this->getAllEncryptedFiles($mountRootFolder);
foreach ($files as $file) {
- if ($this->isKeyStoredForUser($user, $file)) {
- if ($dryRun) {
- $output->writeln("<info>" . $file->getPath() . "</info> needs migration");
+ /** @var File $file */
+ $hasSystemKey = $this->hasSystemKey($file);
+ $hasUserKey = $this->hasUserKey($user, $file);
+ if (!$hasSystemKey) {
+ if ($hasUserKey) {
+ // key was stored incorrectly as user key, migrate
+
+ if ($dryRun) {
+ $output->writeln('<info>' . $file->getPath() . '</info> needs migration');
+ } else {
+ $output->write('Migrating key for <info>' . $file->getPath() . '</info> ');
+ if ($this->copyUserKeyToSystemAndValidate($user, $file)) {
+ $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');
+ }
+ }
} else {
- $output->write("Migrating key for <info>" . $file->getPath() . "</info> ");
- if ($this->copyKeyAndValidate($user, $file)) {
- $output->writeln("<info>✓</info>");
+ // no matching key, probably from a broken cross-storage move
+
+ $shouldBeEncrypted = $file->getStorage()->instanceOfStorage(Encryption::class);
+ $isActuallyEncrypted = $this->isDataEncrypted($file);
+ if ($isActuallyEncrypted) {
+ if ($dryRun) {
+ if ($shouldBeEncrypted) {
+ $output->write('<info>' . $file->getPath() . '</info> needs migration');
+ } else {
+ $output->write('<info>' . $file->getPath() . '</info> needs decryption');
+ }
+ $foundKey = $this->findUserKeyForSystemFile($user, $file);
+ if ($foundKey) {
+ $output->writeln(', valid key found at <info>' . $foundKey . '</info>');
+ } else {
+ $output->writeln(' <error>❌ No key found</error>');
+ }
+ } else {
+ if ($shouldBeEncrypted) {
+ $output->write('<info>Migrating key for ' . $file->getPath() . '</info>');
+ } else {
+ $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>');
+ } else {
+ $this->decryptWithSystemKey($file, $foundKey);
+ $output->writeln(' Decrypted with key from <info>' . $foundKey . '</info>');
+ }
+ } else {
+ $output->writeln(' <error>❌ No key found</error>');
+ }
+ }
} else {
- $output->writeln("<fg=red>❌</>");
- $output->writeln(" Failed to validate key for <error>" . $file->getPath() . "</error>, key will not be migrated");
+ if ($dryRun) {
+ $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>');
+ }
}
}
}
}
}
- return 0;
+ return self::SUCCESS;
+ }
+
+ private function getUserRelativePath(string $path): string {
+ $parts = explode('/', $path, 3);
+ if (count($parts) >= 3) {
+ return '/' . $parts[2];
+ } else {
+ return '';
+ }
}
/**
- * @param IUser $user
* @return ICachedMountInfo[]
*/
private function getSystemMountsForUser(IUser $user): array {
- return array_filter($this->userMountCache->getMountsForUser($user), function(ICachedMountInfo $mount) use ($user) {
+ return array_filter($this->userMountCache->getMountsForUser($user), function (ICachedMountInfo $mount) use (
+ $user
+ ) {
$mountPoint = substr($mount->getMountPoint(), strlen($user->getUID() . '/'));
return $this->encryptionUtil->isSystemWideMountPoint($mountPoint, $user->getUID());
});
}
/**
- * @param Folder $folder
+ * Get all files in a folder which are marked as encrypted
+ *
* @return \Generator<File>
*/
- private function getAllFiles(Folder $folder) {
+ private function getAllEncryptedFiles(Folder $folder) {
foreach ($folder->getDirectoryListing() as $child) {
if ($child instanceof Folder) {
- yield from $this->getAllFiles($child);
+ yield from $this->getAllEncryptedFiles($child);
} else {
- yield $child;
+ if (substr($child->getName(), -4) !== '.bak' && $child->isEncrypted()) {
+ yield $child;
+ }
}
}
}
- /**
- * Check if the key for a file is stored in the user's keystore and not the system one
- *
- * @param IUser $user
- * @param Node $node
- * @return bool
- */
- private function isKeyStoredForUser(IUser $user, Node $node): bool {
- $path = trim(substr($node->getPath(), strlen($user->getUID()) + 1), '/');
- $systemKeyPath = $this->keyRootDirectory . '/files_encryption/keys/' . $path . '/';
- $userKeyPath = $this->keyRootDirectory . '/' . $user->getUID() . '/files_encryption/keys/' . $path . '/';
+ private function getSystemKeyPath(Node $node): string {
+ $path = $this->getUserRelativePath($node->getPath());
+ return $this->keyRootDirectory . '/files_encryption/keys/' . $path . '/';
+ }
+
+ private function getUserBaseKeyPath(IUser $user): string {
+ return $this->keyRootDirectory . '/' . $user->getUID() . '/files_encryption/keys';
+ }
+
+ private function getUserKeyPath(IUser $user, Node $node): string {
+ $path = $this->getUserRelativePath($node->getPath());
+ return $this->getUserBaseKeyPath($user) . '/' . $path . '/';
+ }
+
+ private function hasSystemKey(Node $node): bool {
+ // this uses View instead of the RootFolder because the keys might not be in the cache
+ return $this->rootView->file_exists($this->getSystemKeyPath($node));
+ }
+ private function hasUserKey(IUser $user, Node $node): bool {
// this uses View instead of the RootFolder because the keys might not be in the cache
- $systemKeyExists = $this->rootView->file_exists($systemKeyPath);
- $userKeyExists = $this->rootView->file_exists($userKeyPath);
- return $userKeyExists && !$systemKeyExists;
+ return $this->rootView->file_exists($this->getUserKeyPath($user, $node));
}
/**
* Check that the user key stored for a file can decrypt the file
- *
- * @param IUser $user
- * @param File $node
- * @return bool
*/
- private function copyKeyAndValidate(IUser $user, File $node): bool {
+ private function copyUserKeyToSystemAndValidate(IUser $user, File $node): bool {
$path = trim(substr($node->getPath(), strlen($user->getUID()) + 1), '/');
$systemKeyPath = $this->keyRootDirectory . '/files_encryption/keys/' . $path . '/';
$userKeyPath = $this->keyRootDirectory . '/' . $user->getUID() . '/files_encryption/keys/' . $path . '/';
$this->rootView->copy($userKeyPath, $systemKeyPath);
+ if ($this->tryReadFile($node)) {
+ // cleanup wrong key location
+ $this->rootView->rmdir($userKeyPath);
+ return true;
+ } else {
+ // remove the copied key if we know it's invalid
+ $this->rootView->rmdir($systemKeyPath);
+ return false;
+ }
+ }
+
+ private function tryReadFile(File $node): bool {
try {
- // check that the copied key is valid
$fh = $node->fopen('r');
// read a single chunk
$data = fread($fh, 8192);
if ($data === false) {
- throw new \Exception("Read failed");
+ return false;
+ } else {
+ return true;
}
+ } catch (\Exception $e) {
+ return false;
+ }
+ }
- // cleanup wrong key location
- $this->rootView->rmdir($userKeyPath);
- return true;
+ /**
+ * Get the contents of a file without decrypting it
+ *
+ * @return resource
+ */
+ private function openWithoutDecryption(File $node, string $mode) {
+ $storage = $node->getStorage();
+ $internalPath = $node->getInternalPath();
+ if ($storage->instanceOfStorage(Encryption::class)) {
+ /** @var Encryption $storage */
+ try {
+ $storage->setEnabled(false);
+ $handle = $storage->fopen($internalPath, 'r');
+ $storage->setEnabled(true);
+ } catch (\Exception $e) {
+ $storage->setEnabled(true);
+ throw $e;
+ }
+ } else {
+ $handle = $storage->fopen($internalPath, $mode);
+ }
+ /** @var resource|false $handle */
+ if ($handle === false) {
+ 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
+ */
+ private function isDataEncrypted(File $node): bool {
+ $handle = $this->openWithoutDecryption($node, 'r');
+ $firstBlock = fread($handle, $this->encryptionUtil->getHeaderSize());
+ fclose($handle);
+
+ $header = $this->encryptionUtil->parseRawHeader($firstBlock);
+ return isset($header['oc_encryption_module']);
+ }
+
+ /**
+ * 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
+ */
+ private function findUserKeyForSystemFile(IUser $user, File $node): ?string {
+ $userKeyPath = $this->getUserBaseKeyPath($user);
+ $possibleKeys = $this->findKeysByFileName($userKeyPath, $node->getName());
+ foreach ($possibleKeys as $possibleKey) {
+ if ($this->testSystemKey($user, $possibleKey, $node)) {
+ return $possibleKey;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Attempt to find a key for a file even when it's not stored in the expected location
+ *
+ * @return \Generator<string>
+ */
+ private function findKeysByFileName(string $basePath, string $name) {
+ if ($this->rootView->is_dir($basePath . '/' . $name . '/OC_DEFAULT_MODULE')) {
+ yield $basePath . '/' . $name;
+ } else {
+ /** @var false|resource $dh */
+ $dh = $this->rootView->opendir($basePath);
+ if (!$dh) {
+ throw new \Exception('Invalid base path ' . $basePath);
+ }
+ while ($child = readdir($dh)) {
+ if ($child != '..' && $child != '.') {
+ $childPath = $basePath . '/' . $child;
+
+ // recurse if the child is not a key folder
+ if ($this->rootView->is_dir($childPath) && !is_dir($childPath . '/OC_DEFAULT_MODULE')) {
+ yield from $this->findKeysByFileName($childPath, $name);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Test if the provided key is valid as a system key for the file
+ */
+ private function testSystemKey(IUser $user, string $key, File $node): bool {
+ $systemKeyPath = $this->getSystemKeyPath($node);
+
+ if ($this->rootView->file_exists($systemKeyPath)) {
+ // already has a key, reject new key
+ return false;
+ }
+
+ $this->rootView->copy($key, $systemKeyPath);
+ $isValid = $this->tryReadFile($node);
+ $this->rootView->rmdir($systemKeyPath);
+ return $isValid;
+ }
+
+ /**
+ * Decrypt a file with the specified system key and mark the key as not-encrypted
+ */
+ private function decryptWithSystemKey(File $node, string $key): void {
+ $storage = $node->getStorage();
+ $name = $node->getName();
+
+ $node->move($node->getPath() . '.bak');
+ $systemKeyPath = $this->getSystemKeyPath($node);
+ $this->rootView->copy($key, $systemKeyPath);
+
+ try {
+ if (!$storage->instanceOfStorage(Encryption::class)) {
+ $storage = $this->encryptionManager->forceWrapStorage($node->getMountPoint(), $storage);
+ }
+ /** @var false|resource $source */
+ $source = $storage->fopen($node->getInternalPath(), 'r');
+ if (!$source) {
+ throw new \Exception('Failed to open ' . $node->getPath() . ' with ' . $key);
+ }
+ $decryptedNode = $node->getParent()->newFile($name);
+
+ $target = $this->openWithoutDecryption($decryptedNode, 'w');
+ stream_copy_to_stream($source, $target);
+ fclose($target);
+ fclose($source);
+
+ $decryptedNode->getStorage()->getScanner()->scan($decryptedNode->getInternalPath());
} catch (\Exception $e) {
- // remove the copied key if we know it's invalid
$this->rootView->rmdir($systemKeyPath);
- return false;
+
+ // remove the .bak
+ $node->move(substr($node->getPath(), 0, -4));
+
+ throw $e;
}
+
+ if ($this->isDataEncrypted($decryptedNode)) {
+ throw new \Exception($node->getPath() . ' still encrypted after attempting to decrypt with ' . $key);
+ }
+
+ $this->markAsUnEncrypted($decryptedNode);
+
+ $this->rootView->rmdir($systemKeyPath);
+ }
+
+ private function markAsUnEncrypted(Node $node): void {
+ $node->getStorage()->getCache()->update($node->getId(), ['encrypted' => 0]);
}
}
diff --git a/apps/encryption/lib/Command/RecoverUser.php b/apps/encryption/lib/Command/RecoverUser.php
index d3dd4a3612d..8da962ac8b1 100644
--- a/apps/encryption/lib/Command/RecoverUser.php
+++ b/apps/encryption/lib/Command/RecoverUser.php
@@ -1,26 +1,8 @@
<?php
+
/**
- * @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\Encryption\Command;
@@ -35,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,
- IConfig $config,
- IUserManager $userManager,
- QuestionHelper $questionHelper) {
- $this->util = $util;
- $this->questionHelper = $questionHelper;
- $this->userManager = $userManager;
+ public function __construct(
+ protected Util $util,
+ IConfig $config,
+ 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.');
@@ -78,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: ');
@@ -107,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 dc6d43ee5b8..1e46a3d7545 100644
--- a/apps/encryption/lib/Command/ScanLegacyFormat.php
+++ b/apps/encryption/lib/Command/ScanLegacyFormat.php
@@ -3,26 +3,8 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2020, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author essys <essys@users.noreply.github.com>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\Encryption\Command;
@@ -36,41 +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');
@@ -89,7 +50,7 @@ class ScanLegacyFormat extends Command {
foreach ($users as $user) {
$output->writeln('Scanning all files for ' . $user);
$this->setupUserFS($user);
- $result &= $this->scanFolder($output, '/' . $user);
+ $result = $result && $this->scanFolder($output, '/' . $user);
}
$offset += $limit;
} while (count($users) >= $limit);
@@ -97,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 {
@@ -131,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 c5f8a7e8d72..d75406e6319 100644
--- a/apps/encryption/lib/Controller/RecoveryController.php
+++ b/apps/encryption/lib/Controller/RecoveryController.php
@@ -1,34 +1,16 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
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;
@@ -36,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,
- IRequest $request,
- IConfig $config,
- IL10N $l10n,
- Recovery $recovery) {
+ public function __construct(
+ $AppName,
+ IRequest $request,
+ private IConfig $config,
+ private IL10N $l,
+ private Recovery $recovery,
+ ) {
parent::__construct($AppName, $request);
- $this->config = $config;
- $this->l = $l10n;
- $this->recovery = $recovery;
}
/**
@@ -155,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 eedbaea9d9d..8548ea51c04 100644
--- a/apps/encryption/lib/Controller/SettingsController.php
+++ b/apps/encryption/lib/Controller/SettingsController.php
@@ -1,25 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Controller;
@@ -29,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;
@@ -38,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
@@ -74,37 +36,29 @@ class SettingsController extends Controller {
* @param ISession $ocSession
* @param Util $util
*/
- public function __construct($AppName,
- IRequest $request,
- IL10N $l10n,
- IUserManager $userManager,
- IUserSession $userSession,
- KeyManager $keyManager,
- Crypt $crypt,
- Session $session,
- ISession $ocSession,
- Util $util
-) {
+ public function __construct(
+ $AppName,
+ IRequest $request,
+ 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();
@@ -153,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 d07b4da794a..341ad6bc49f 100644
--- a/apps/encryption/lib/Controller/StatusController.php
+++ b/apps/encryption/lib/Controller/StatusController.php
@@ -1,33 +1,15 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
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;
@@ -35,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,
- IRequest $request,
- IL10N $l10n,
- Session $session,
- IManager $encryptionManager
- ) {
+ public function __construct(
+ $AppName,
+ IRequest $request,
+ 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 efb5a6868b0..463ca4e22bb 100644
--- a/apps/encryption/lib/Crypto/Crypt.php
+++ b/apps/encryption/lib/Crypto/Crypt.php
@@ -1,32 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Stefan Weiberg <sweiberg@suse.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Crypto;
@@ -38,8 +15,9 @@ use OCA\Encryption\Exceptions\MultiKeyEncryptException;
use OCP\Encryption\Exceptions\GenericEncryptionException;
use OCP\IConfig;
use OCP\IL10N;
-use OCP\ILogger;
use OCP\IUserSession;
+use phpseclib\Crypt\RC4;
+use Psr\Log\LoggerInterface;
/**
* Class Crypt provides the encryption implementation of the default Nextcloud
@@ -67,9 +45,9 @@ class Crypt {
// default cipher from old Nextcloud versions
public const LEGACY_CIPHER = 'AES-128-CFB';
- public const SUPPORTED_KEY_FORMATS = ['hash', 'password'];
+ public const SUPPORTED_KEY_FORMATS = ['hash2', 'hash', 'password'];
// one out of SUPPORTED_KEY_FORMATS
- public const DEFAULT_KEY_FORMAT = 'hash';
+ public const DEFAULT_KEY_FORMAT = 'hash2';
// default key format, old Nextcloud version encrypted the private key directly
// with the user password
public const LEGACY_KEY_FORMAT = 'password';
@@ -80,40 +58,24 @@ class Crypt {
// default encoding format, old Nextcloud versions used base64
public const BINARY_ENCODING_FORMAT = 'binary';
- /** @var ILogger */
- private $logger;
-
- /** @var string */
- private $user;
+ private string $user;
- /** @var IConfig */
- private $config;
+ private ?string $currentCipher = null;
- /** @var IL10N */
- private $l;
-
- /** @var string|null */
- private $currentCipher;
-
- /** @var bool */
- private $supportLegacy;
+ private bool $supportLegacy;
/**
* Use the legacy base64 encoding instead of the more space-efficient binary encoding.
*/
private bool $useLegacyBase64Encoding;
- /**
- * @param ILogger $logger
- * @param IUserSession $userSession
- * @param IConfig $config
- * @param IL10N $l
- */
- public function __construct(ILogger $logger, IUserSession $userSession, IConfig $config, IL10N $l) {
- $this->logger = $logger;
- $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : '"no user given"';
- $this->config = $config;
- $this->l = $l;
+ public function __construct(
+ private LoggerInterface $logger,
+ IUserSession $userSession,
+ private IConfig $config,
+ private IL10N $l,
+ ) {
+ $this->user = $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : '"no user given"';
$this->supportLegacy = $this->config->getSystemValueBool('encryption.legacy_format_support', false);
$this->useLegacyBase64Encoding = $this->config->getSystemValueBool('encryption.use_legacy_base64_encoding', false);
}
@@ -121,18 +83,17 @@ class Crypt {
/**
* create new private/public key-pair for user
*
- * @return array|bool
+ * @return array{publicKey: string, privateKey: string}|false
*/
public function createKeyPair() {
- $log = $this->logger;
$res = $this->getOpenSSLPKey();
if (!$res) {
- $log->error("Encryption Library couldn't generate users key-pair for {$this->user}",
+ $this->logger->error("Encryption Library couldn't generate users key-pair for {$this->user}",
['app' => 'encryption']);
if (openssl_error_string()) {
- $log->error('Encryption library openssl_pkey_new() fails: ' . openssl_error_string(),
+ $this->logger->error('Encryption library openssl_pkey_new() fails: ' . openssl_error_string(),
['app' => 'encryption']);
}
} elseif (openssl_pkey_export($res,
@@ -147,10 +108,10 @@ class Crypt {
'privateKey' => $privateKey
];
}
- $log->error('Encryption library couldn\'t export users private key, please check your servers OpenSSL configuration.' . $this->user,
+ $this->logger->error('Encryption library couldn\'t export users private key, please check your servers OpenSSL configuration.' . $this->user,
['app' => 'encryption']);
if (openssl_error_string()) {
- $log->error('Encryption Library:' . openssl_error_string(),
+ $this->logger->error('Encryption Library:' . openssl_error_string(),
['app' => 'encryption']);
}
@@ -167,12 +128,7 @@ class Crypt {
return openssl_pkey_new($config);
}
- /**
- * get openSSL Config
- *
- * @return array
- */
- private function getOpenSSLConfig() {
+ private function getOpenSSLConfig(): array {
$config = ['private_key_bits' => 4096];
$config = array_merge(
$config,
@@ -182,14 +138,9 @@ class Crypt {
}
/**
- * @param string $plainContent
- * @param string $passPhrase
- * @param int $version
- * @param int $position
- * @return false|string
* @throws EncryptionFailedException
*/
- public function symmetricEncryptFileContent($plainContent, $passPhrase, $version, $position) {
+ public function symmetricEncryptFileContent(string $plainContent, string $passPhrase, int $version, string $position): string|false {
if (!$plainContent) {
$this->logger->error('Encryption Library, symmetrical encryption failed no content given',
['app' => 'encryption']);
@@ -204,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);
@@ -238,14 +189,9 @@ class Crypt {
}
/**
- * @param string $plainContent
- * @param string $iv
- * @param string $passPhrase
- * @param string $cipher
- * @return string
* @throws EncryptionFailedException
*/
- private function encrypt($plainContent, $iv, $passPhrase = '', $cipher = self::DEFAULT_CIPHER) {
+ private function encrypt(string $plainContent, string $iv, string $passPhrase = '', string $cipher = self::DEFAULT_CIPHER): string {
$options = $this->useLegacyBase64Encoding ? 0 : OPENSSL_RAW_DATA;
$encryptedContent = openssl_encrypt($plainContent,
$cipher,
@@ -266,10 +212,8 @@ class Crypt {
/**
* return cipher either from config.php or the default cipher defined in
* this class
- *
- * @return string
*/
- private function getCachedCipher() {
+ private function getCachedCipher(): string {
if (isset($this->currentCipher)) {
return $this->currentCipher;
}
@@ -335,21 +279,11 @@ class Crypt {
return self::LEGACY_CIPHER;
}
- /**
- * @param string $encryptedContent
- * @param string $iv
- * @return string
- */
- private function concatIV($encryptedContent, $iv) {
+ private function concatIV(string $encryptedContent, string $iv): string {
return $encryptedContent . '00iv00' . $iv;
}
- /**
- * @param string $encryptedContent
- * @param string $signature
- * @return string
- */
- private function concatSig($encryptedContent, $signature) {
+ private function concatSig(string $encryptedContent, string $signature): string {
return $encryptedContent . '00sig00' . $signature;
}
@@ -357,38 +291,30 @@ class Crypt {
* Note: This is _NOT_ a padding used for encryption purposes. It is solely
* used to achieve the PHP stream size. It has _NOTHING_ to do with the
* encrypted content and is not used in any crypto primitive.
- *
- * @param string $data
- * @return string
*/
- private function addPadding($data) {
+ private function addPadding(string $data): string {
return $data . 'xxx';
}
/**
* generate password hash used to encrypt the users private key
*
- * @param string $password
- * @param string $cipher
* @param string $uid only used for user keys
- * @return string
*/
- protected function generatePasswordHash($password, $cipher, $uid = '') {
+ protected function generatePasswordHash(string $password, string $cipher, string $uid = '', int $iterations = 600000): string {
$instanceId = $this->config->getSystemValue('instanceid');
$instanceSecret = $this->config->getSystemValue('secret');
$salt = hash('sha256', $uid . $instanceId . $instanceSecret, true);
$keySize = $this->getKeySize($cipher);
- $hash = hash_pbkdf2(
+ return hash_pbkdf2(
'sha256',
$password,
$salt,
- 100000,
+ $iterations,
$keySize,
true
);
-
- return $hash;
}
/**
@@ -406,7 +332,7 @@ class Crypt {
$privateKey,
$hash,
0,
- 0
+ '0'
);
return $encryptedKey;
@@ -433,8 +359,10 @@ class Crypt {
$keyFormat = self::LEGACY_KEY_FORMAT;
}
- if ($keyFormat === self::DEFAULT_KEY_FORMAT) {
- $password = $this->generatePasswordHash($password, $cipher, $uid);
+ if ($keyFormat === 'hash') {
+ $password = $this->generatePasswordHash($password, $cipher, $uid, 100000);
+ } elseif ($keyFormat === 'hash2') {
+ $password = $this->generatePasswordHash($password, $cipher, $uid, 600000);
}
$binaryEncoding = isset($header['encoding']) && $header['encoding'] === self::BINARY_ENCODING_FORMAT;
@@ -517,45 +445,36 @@ class Crypt {
/**
* check for valid signature
*
- * @param string $data
- * @param string $passPhrase
- * @param string $expectedSignature
* @throws GenericEncryptionException
*/
- private function checkSignature($data, $passPhrase, $expectedSignature) {
+ private function checkSignature(string $data, string $passPhrase, string $expectedSignature): void {
$enforceSignature = !$this->config->getSystemValueBool('encryption_skip_signature_check', false);
$signature = $this->createSignature($data, $passPhrase);
$isCorrectHash = hash_equals($expectedSignature, $signature);
- if (!$isCorrectHash && $enforceSignature) {
- throw new GenericEncryptionException('Bad Signature', $this->l->t('Bad Signature'));
- } elseif (!$isCorrectHash && !$enforceSignature) {
- $this->logger->info("Signature check skipped", ['app' => 'encryption']);
+ if (!$isCorrectHash) {
+ if ($enforceSignature) {
+ throw new GenericEncryptionException('Bad Signature', $this->l->t('Bad Signature'));
+ } else {
+ $this->logger->info('Signature check skipped', ['app' => 'encryption']);
+ }
}
}
/**
* create signature
- *
- * @param string $data
- * @param string $passPhrase
- * @return string
*/
- private function createSignature($data, $passPhrase) {
+ private function createSignature(string $data, string $passPhrase): string {
$passPhrase = hash('sha512', $passPhrase . 'a', true);
return hash_hmac('sha256', $data, $passPhrase);
}
/**
- * remove padding
- *
- * @param string $padded
* @param bool $hasSignature did the block contain a signature, in this case we use a different padding
- * @return string|false
*/
- private function removePadding($padded, $hasSignature = false) {
+ private function removePadding(string $padded, bool $hasSignature = false): string|false {
if ($hasSignature === false && substr($padded, -2) === 'xx') {
return substr($padded, 0, -2);
} elseif ($hasSignature === true && substr($padded, -3) === 'xxx') {
@@ -568,12 +487,8 @@ class Crypt {
* split meta data from encrypted file
* Note: for now, we assume that the meta data always start with the iv
* followed by the signature, if available
- *
- * @param string $catFile
- * @param string $cipher
- * @return array
*/
- private function splitMetaData($catFile, $cipher) {
+ private function splitMetaData(string $catFile, string $cipher): array {
if ($this->hasSignature($catFile, $cipher)) {
$catFile = $this->removePadding($catFile, true);
$meta = substr($catFile, -93);
@@ -598,12 +513,9 @@ class Crypt {
/**
* check if encrypted block is signed
*
- * @param string $catFile
- * @param string $cipher
- * @return bool
* @throws GenericEncryptionException
*/
- private function hasSignature($catFile, $cipher) {
+ private function hasSignature(string $catFile, string $cipher): bool {
$skipSignatureCheck = $this->config->getSystemValueBool('encryption_skip_signature_check', false);
$meta = substr($catFile, -93);
@@ -624,12 +536,6 @@ class Crypt {
/**
- * @param string $encryptedContent
- * @param string $iv
- * @param string $passPhrase
- * @param string $cipher
- * @param boolean $binaryEncoding
- * @return string
* @throws DecryptionFailedException
*/
private function decrypt(string $encryptedContent, string $iv, string $passPhrase = '', string $cipher = self::DEFAULT_CIPHER, bool $binaryEncoding = false): string {
@@ -676,10 +582,9 @@ class Crypt {
/**
* generate initialization vector
*
- * @return string
* @throws GenericEncryptionException
*/
- private function generateIv() {
+ private function generateIv(): string {
return random_bytes(16);
}
@@ -695,18 +600,31 @@ class Crypt {
}
/**
- * @param $encKeyFile
- * @param $shareKey
- * @param $privateKey
- * @return string
+ * @param \OpenSSLAsymmetricKey|\OpenSSLCertificate|array|string $privateKey
+ * @throws MultiKeyDecryptException
+ */
+ public function multiKeyDecrypt(string $shareKey, $privateKey): string {
+ $plainContent = '';
+
+ // decrypt the intermediate key with RSA
+ if (openssl_private_decrypt($shareKey, $intermediate, $privateKey, OPENSSL_PKCS1_OAEP_PADDING)) {
+ return $intermediate;
+ } else {
+ throw new MultiKeyDecryptException('multikeydecrypt with share key failed:' . openssl_error_string());
+ }
+ }
+
+ /**
+ * @param \OpenSSLAsymmetricKey|\OpenSSLCertificate|array|string $privateKey
* @throws MultiKeyDecryptException
*/
- public function multiKeyDecrypt($encKeyFile, $shareKey, $privateKey) {
+ public function multiKeyDecryptLegacy(string $encKeyFile, string $shareKey, $privateKey): string {
if (!$encKeyFile) {
throw new MultiKeyDecryptException('Cannot multikey decrypt empty plain content');
}
- if (openssl_open($encKeyFile, $plainContent, $shareKey, $privateKey, 'RC4')) {
+ $plainContent = '';
+ if ($this->opensslOpen($encKeyFile, $plainContent, $shareKey, $privateKey, 'RC4')) {
return $plainContent;
} else {
throw new MultiKeyDecryptException('multikeydecrypt with share key failed:' . openssl_error_string());
@@ -714,12 +632,55 @@ class Crypt {
}
/**
+ * @param array<string,\OpenSSLAsymmetricKey|\OpenSSLCertificate|array|string> $keyFiles
+ * @throws MultiKeyEncryptException
+ */
+ public function multiKeyEncrypt(string $plainContent, array $keyFiles): array {
+ if (empty($plainContent)) {
+ throw new MultiKeyEncryptException('Cannot multikeyencrypt empty plain content');
+ }
+
+ // Set empty vars to be set by openssl by reference
+ $shareKeys = [];
+ $mappedShareKeys = [];
+
+ // make sure that there is at least one public key to use
+ if (count($keyFiles) >= 1) {
+ // prepare the encrypted keys
+ $shareKeys = [];
+
+ // iterate over the public keys and encrypt the intermediate
+ // for each of them with RSA
+ foreach ($keyFiles as $tmp_key) {
+ if (openssl_public_encrypt($plainContent, $tmp_output, $tmp_key, OPENSSL_PKCS1_OAEP_PADDING)) {
+ $shareKeys[] = $tmp_output;
+ }
+ }
+
+ // set the result if everything worked fine
+ if (count($keyFiles) === count($shareKeys)) {
+ $i = 0;
+
+ // Ensure each shareKey is labelled with its corresponding key id
+ foreach ($keyFiles as $userId => $publicKey) {
+ $mappedShareKeys[$userId] = $shareKeys[$i];
+ $i++;
+ }
+
+ return $mappedShareKeys;
+ }
+ }
+ throw new MultiKeyEncryptException('multikeyencryption failed ' . openssl_error_string());
+ }
+
+ /**
* @param string $plainContent
* @param array $keyFiles
* @return array
* @throws MultiKeyEncryptException
+ * @deprecated 27.0.0 use multiKeyEncrypt
*/
- public function multiKeyEncrypt($plainContent, array $keyFiles) {
+ public function multiKeyEncryptLegacy($plainContent, array $keyFiles) {
// openssl_seal returns false without errors if plaincontent is empty
// so trigger our own error
if (empty($plainContent)) {
@@ -731,7 +692,7 @@ class Crypt {
$shareKeys = [];
$mappedShareKeys = [];
- if (openssl_seal($plainContent, $sealed, $shareKeys, $keyFiles, 'RC4')) {
+ if ($this->opensslSeal($plainContent, $sealed, $shareKeys, $keyFiles, 'RC4')) {
$i = 0;
// Ensure each shareKey is labelled with its corresponding key id
@@ -749,7 +710,106 @@ class Crypt {
}
}
+ /**
+ * returns the value of $useLegacyBase64Encoding
+ *
+ * @return bool
+ */
public function useLegacyBase64Encoding(): bool {
return $this->useLegacyBase64Encoding;
}
+
+ /**
+ * Uses phpseclib RC4 implementation
+ */
+ private function rc4Decrypt(string $data, string $secret): string {
+ $rc4 = new RC4();
+ /** @psalm-suppress InternalMethod */
+ $rc4->setKey($secret);
+
+ return $rc4->decrypt($data);
+ }
+
+ /**
+ * Uses phpseclib RC4 implementation
+ */
+ private function rc4Encrypt(string $data, string $secret): string {
+ $rc4 = new RC4();
+ /** @psalm-suppress InternalMethod */
+ $rc4->setKey($secret);
+
+ return $rc4->encrypt($data);
+ }
+
+ /**
+ * Custom implementation of openssl_open()
+ *
+ * @param \OpenSSLAsymmetricKey|\OpenSSLCertificate|array|string $private_key
+ * @throws DecryptionFailedException
+ */
+ private function opensslOpen(string $data, string &$output, string $encrypted_key, $private_key, string $cipher_algo): bool {
+ $result = false;
+
+ // check if RC4 is used
+ 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
+ // using our own RC4 implementation
+ $output = $this->rc4Decrypt($data, $intermediate);
+ $result = (strlen($output) === strlen($data));
+ }
+ } else {
+ throw new DecryptionFailedException('Unsupported cipher ' . $cipher_algo);
+ }
+
+ return $result;
+ }
+
+ /**
+ * Custom implementation of openssl_seal()
+ *
+ * @deprecated 27.0.0 use multiKeyEncrypt
+ * @throws EncryptionFailedException
+ */
+ private function opensslSeal(string $data, string &$sealed_data, array &$encrypted_keys, array $public_key, string $cipher_algo): int|false {
+ $result = false;
+
+ // check if RC4 is used
+ 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
+ $intermediate = openssl_random_pseudo_bytes(16, $strong_result);
+
+ // check if we got strong random data
+ if ($strong_result) {
+ // encrypt the file key with the intermediate key
+ // using our own RC4 implementation
+ $sealed_data = $this->rc4Encrypt($data, $intermediate);
+ if (strlen($sealed_data) === strlen($data)) {
+ // prepare the encrypted keys
+ $encrypted_keys = [];
+
+ // iterate over the public keys and encrypt the intermediate
+ // for each of them with RSA
+ foreach ($public_key as $tmp_key) {
+ if (openssl_public_encrypt($intermediate, $tmp_output, $tmp_key, OPENSSL_PKCS1_PADDING)) {
+ $encrypted_keys[] = $tmp_output;
+ }
+ }
+
+ // set the result if everything worked fine
+ if (count($public_key) === count($encrypted_keys)) {
+ $result = strlen($sealed_data);
+ }
+ }
+ }
+ }
+ } else {
+ 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 e982da72086..362f43b8672 100644
--- a/apps/encryption/lib/Crypto/DecryptAll.php
+++ b/apps/encryption/lib/Crypto/DecryptAll.php
@@ -1,27 +1,13 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Crypto;
+use OCA\Encryption\Exceptions\PrivateKeyMissingException;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Session;
use OCA\Encryption\Util;
@@ -33,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
@@ -56,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;
}
/**
@@ -88,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) ',
@@ -133,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 1889c557cdc..4ed75b85a93 100644
--- a/apps/encryption/lib/Crypto/EncryptAll.php
+++ b/apps/encryption/lib/Crypto/EncryptAll.php
@@ -1,29 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Kenneth Newwood <kenneth@newwood.name>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Crypto;
@@ -32,11 +12,16 @@ 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;
use OCP\IUserManager;
+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;
@@ -46,79 +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 QuestionHelper */
- protected $questionHelper;
-
- /** @var OutputInterface */
+ /** @var OutputInterface */
protected $output;
- /** @var InputInterface */
+ /** @var InputInterface */
protected $input;
- /** @var ISecureRandom */
- protected $secureRandom;
-
- /**
- * @param Setup $userSetup
- * @param IUserManager $userManager
- * @param View $rootView
- * @param KeyManager $keyManager
- * @param Util $util
- * @param IConfig $config
- * @param IMailer $mailer
- * @param IL10N $l
- * @param QuestionHelper $questionHelper
- * @param ISecureRandom $secureRandom
- */
public function __construct(
- Setup $userSetup,
- IUserManager $userManager,
- View $rootView,
- KeyManager $keyManager,
- Util $util,
- IConfig $config,
- IMailer $mailer,
- IL10N $l,
- 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->questionHelper = $questionHelper;
- $this->secureRandom = $secureRandom;
// store one time passwords for the users
$this->userPasswords = [];
}
@@ -227,7 +162,7 @@ class EncryptAll {
$userNo++;
}
}
- $progress->setMessage("all files encrypted");
+ $progress->setMessage('all files encrypted');
$progress->finish();
}
@@ -268,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;
}
@@ -302,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)) {
@@ -413,6 +364,10 @@ class EncryptAll {
$progress->advance();
if (!empty($password)) {
$recipient = $this->userManager->get($uid);
+ if (!$recipient instanceof IUser) {
+ continue;
+ }
+
$recipientDisplayName = $recipient->getDisplayName();
$to = $recipient->getEMailAddress();
@@ -421,20 +376,33 @@ class EncryptAll {
continue;
}
- $subject = $this->l->t('one-time password for server-side-encryption');
- [$htmlBody, $textBody] = $this->createMailBody($password);
+ $l = $this->l10nFactory->get('encryption', $this->l10nFactory->getUserLanguage($recipient));
+
+ $template = $this->mailer->createEMailTemplate('encryption.encryptAllPassword', [
+ 'user' => $recipient->getUID(),
+ 'password' => $password,
+ ]);
+
+ $template->setSubject($l->t('one-time password for server-side-encryption'));
+ // 'Hey there,<br><br>The administration 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>'
+ $template->addHeader();
+ $template->addHeading($l->t('Encryption password'));
+ $template->addBodyText(
+ $l->t('The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.', [htmlspecialchars($password)]),
+ $l->t('The administration enabled server-side-encryption. Your files were encrypted using the password "%s".', $password)
+ );
+ $template->addBodyText(
+ $l->t('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.')
+ );
+ $template->addFooter();
// send it out now
try {
$message = $this->mailer->createMessage();
- $message->setSubject($subject);
$message->setTo([$to => $recipientDisplayName]);
- $message->setHtmlBody($htmlBody);
- $message->setPlainBody($textBody);
- $message->setFrom([
- \OCP\Util::getDefaultEmailAddress('admin-noreply')
- ]);
-
+ $message->useTemplate($template);
+ $message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED);
$this->mailer->send($message);
} catch (\Exception $e) {
$noMail[] = $uid;
@@ -458,22 +426,4 @@ class EncryptAll {
$table->render();
}
}
-
- /**
- * create mail body for plain text and html mail
- *
- * @param string $password one-time encryption password
- * @return array an array of the html mail body and the plain text mail body
- */
- protected function createMailBody($password) {
- $html = new \OC_Template("encryption", "mail", "");
- $html->assign('password', $password);
- $htmlMail = $html->fetchPage();
-
- $plainText = new \OC_Template("encryption", "altmail", "");
- $plainText->assign('password', $password);
- $plainTextMail = $plainText->fetchPage();
-
- return [$htmlMail, $plainTextMail];
- }
}
diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php
index b44472fd04a..6d388624e48 100644
--- a/apps/encryption/lib/Crypto/Encryption.php
+++ b/apps/encryption/lib/Crypto/Encryption.php
@@ -1,48 +1,23 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Julius Härtl <jus@bitgrid.net>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Valdnet <47037905+Valdnet@users.noreply.github.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
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;
use OCA\Encryption\Util;
use OCP\Encryption\IEncryptionModule;
use OCP\IL10N;
-use OCP\ILogger;
+use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -50,11 +25,6 @@ class Encryption implements IEncryptionModule {
public const ID = 'OC_DEFAULT_MODULE';
public const DISPLAY_NAME = 'Default encryption module';
- /**
- * @var Crypt
- */
- private $crypt;
-
/** @var string */
private $cipher;
@@ -64,8 +34,7 @@ class Encryption implements IEncryptionModule {
/** @var string */
private $user;
- /** @var array */
- private $owner;
+ private array $owner;
/** @var string */
private $fileKey;
@@ -73,74 +42,34 @@ class Encryption implements IEncryptionModule {
/** @var string */
private $writeCache;
- /** @var KeyManager */
- private $keyManager;
-
/** @var array */
private $accessList;
/** @var boolean */
private $isWriteOperation;
- /** @var Util */
- private $util;
-
- /** @var Session */
- private $session;
-
- /** @var ILogger */
- private $logger;
-
- /** @var IL10N */
- private $l;
-
- /** @var EncryptAll */
- private $encryptAll;
-
- /** @var bool */
- private $useMasterPassword;
-
- /** @var DecryptAll */
- private $decryptAll;
+ private bool $useMasterPassword;
private bool $useLegacyBase64Encoding = false;
/** @var int Current version of the file */
- private $version = 0;
+ private int $version = 0;
/** @var array remember encryption signature version */
private static $rememberVersion = [];
-
- /**
- *
- * @param Crypt $crypt
- * @param KeyManager $keyManager
- * @param Util $util
- * @param Session $session
- * @param EncryptAll $encryptAll
- * @param DecryptAll $decryptAll
- * @param ILogger $logger
- * @param IL10N $il10n
- */
- public function __construct(Crypt $crypt,
- KeyManager $keyManager,
- Util $util,
- Session $session,
- EncryptAll $encryptAll,
- DecryptAll $decryptAll,
- ILogger $logger,
- IL10N $il10n) {
- $this->crypt = $crypt;
- $this->keyManager = $keyManager;
- $this->util = $util;
- $this->session = $session;
- $this->encryptAll = $encryptAll;
- $this->decryptAll = $decryptAll;
- $this->logger = $logger;
- $this->l = $il10n;
+ public function __construct(
+ private Crypt $crypt,
+ private KeyManager $keyManager,
+ private Util $util,
+ private Session $session,
+ private EncryptAll $encryptAll,
+ private DecryptAll $decryptAll,
+ private LoggerInterface $logger,
+ private IL10N $l,
+ ) {
$this->owner = [];
- $this->useMasterPassword = $util->isMasterKeyEnabled();
+ $this->useMasterPassword = $this->util->isMasterKeyEnabled();
}
/**
@@ -171,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);
@@ -182,6 +111,7 @@ class Encryption implements IEncryptionModule {
$this->writeCache = '';
$this->useLegacyBase64Encoding = true;
+
if (isset($header['encoding'])) {
$this->useLegacyBase64Encoding = $header['encoding'] !== Crypt::BINARY_ENCODING_FORMAT;
}
@@ -194,15 +124,10 @@ class Encryption implements IEncryptionModule {
}
}
- if ($this->session->decryptAllModeActivated()) {
- $encryptedFileKey = $this->keyManager->getEncryptedFileKey($this->path);
- $shareKey = $this->keyManager->getShareKey($this->path, $this->session->getDecryptAllUid());
- $this->fileKey = $this->crypt->multiKeyDecrypt($encryptedFileKey,
- $shareKey,
- $this->session->getDecryptAllKey());
- } else {
- $this->fileKey = $this->keyManager->getFileKey($this->path, $this->user);
- }
+ /* If useLegacyFileKey is not specified in header, auto-detect, to be safe */
+ $useLegacyFileKey = (($header['useLegacyFileKey'] ?? '') == 'false' ? false : null);
+
+ $this->fileKey = $this->keyManager->getFileKey($this->path, $this->user, $useLegacyFileKey, $this->session->decryptAllModeActivated());
// always use the version from the original file, also part files
// need to have a correct version number if they get moved over to the
@@ -239,7 +164,11 @@ class Encryption implements IEncryptionModule {
$this->cipher = $this->crypt->getLegacyCipher();
}
- $result = ['cipher' => $this->cipher, 'signed' => 'true'];
+ $result = [
+ 'cipher' => $this->cipher,
+ 'signed' => 'true',
+ 'useLegacyFileKey' => 'false',
+ ];
if ($this->useLegacyBase64Encoding !== true) {
$result['encoding'] = Crypt::BINARY_ENCODING_FORMAT;
@@ -254,14 +183,14 @@ class Encryption implements IEncryptionModule {
* buffer.
*
* @param string $path to the file
- * @param int $position
+ * @param string $position
* @return string remained data which should be written to the file in case
* of a write operation
* @throws PublicKeyMissingException
* @throws \Exception
- * @throws \OCA\Encryption\Exceptions\MultiKeyEncryptException
+ * @throws MultiKeyEncryptException
*/
- public function end($path, $position = 0) {
+ public function end($path, $position = '0') {
$result = '';
if ($this->isWriteOperation) {
// in case of a part file we remember the new signature versions
@@ -296,10 +225,18 @@ class Encryption implements IEncryptionModule {
}
$publicKeys = $this->keyManager->addSystemKeys($this->accessList, $publicKeys, $this->getOwner($path));
- $encryptedKeyfiles = $this->crypt->multiKeyEncrypt($this->fileKey, $publicKeys);
- $this->keyManager->setAllFileKeys($this->path, $encryptedKeyfiles);
+ $shareKeys = $this->crypt->multiKeyEncrypt($this->fileKey, $publicKeys);
+ if (!$this->keyManager->deleteLegacyFileKey($this->path)) {
+ $this->logger->warning(
+ 'Failed to delete legacy filekey for {path}',
+ ['app' => 'encryption', 'path' => $path]
+ );
+ }
+ foreach ($shareKeys as $uid => $keyFile) {
+ $this->keyManager->setShareKey($this->path, $uid, $keyFile);
+ }
}
- return $result;
+ return $result ?: '';
}
@@ -315,7 +252,6 @@ class Encryption implements IEncryptionModule {
// If extra data is left over from the last round, make sure it
// is integrated into the next block
if ($this->writeCache) {
-
// Concat writeCache to start of $data
$data = $this->writeCache . $data;
@@ -327,7 +263,6 @@ class Encryption implements IEncryptionModule {
$encrypted = '';
// While there still remains some data to be processed & written
while (strlen($data) > 0) {
-
// Remaining length for this iteration, not of the
// entire file (may be greater than 8192 bytes)
$remainingLength = strlen($data);
@@ -335,7 +270,6 @@ class Encryption implements IEncryptionModule {
// If data remaining to be written is less than the
// size of 1 unencrypted block
if ($remainingLength < $this->getUnencryptedBlockSize(true)) {
-
// Set writeCache to contents of $data
// The writeCache will be carried over to the
// next write round, and added to the start of
@@ -349,11 +283,10 @@ class Encryption implements IEncryptionModule {
// Clear $data ready for next round
$data = '';
} else {
-
// Read the chunk from the start of $data
$chunk = substr($data, 0, $this->getUnencryptedBlockSize(true));
- $encrypted .= $this->crypt->symmetricEncryptFileContent($chunk, $this->fileKey, $this->version + 1, $position);
+ $encrypted .= $this->crypt->symmetricEncryptFileContent($chunk, $this->fileKey, $this->version + 1, (string)$position);
// Remove the chunk we just processed from
// $data, leaving only unprocessed data in $data
@@ -391,7 +324,7 @@ class Encryption implements IEncryptionModule {
* @param string $path path to the file which should be updated
* @param string $uid of the user who performs the operation
* @param array $accessList who has access to the file contains the key 'users' and 'public'
- * @return boolean
+ * @return bool
*/
public function update($path, $uid, array $accessList) {
if (empty($accessList)) {
@@ -399,10 +332,10 @@ class Encryption implements IEncryptionModule {
$this->keyManager->setVersion($path, self::$rememberVersion[$path], new View());
unset(self::$rememberVersion[$path]);
}
- return;
+ return false;
}
- $fileKey = $this->keyManager->getFileKey($path, $uid);
+ $fileKey = $this->keyManager->getFileKey($path, $uid, null);
if (!empty($fileKey)) {
$publicKeys = [];
@@ -420,11 +353,13 @@ class Encryption implements IEncryptionModule {
$publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $this->getOwner($path));
- $encryptedFileKey = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
+ $shareKeys = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
$this->keyManager->deleteAllFileKeys($path);
- $this->keyManager->setAllFileKeys($path, $encryptedFileKey);
+ foreach ($shareKeys as $uid => $keyFile) {
+ $this->keyManager->setShareKey($path, $uid, $keyFile);
+ }
} else {
$this->logger->debug('no file key found, we assume that the file "{file}" is not encrypted',
['file' => $path, 'app' => 'encryption']);
@@ -498,12 +433,12 @@ 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
*/
public function isReadable($path, $uid) {
- $fileKey = $this->keyManager->getFileKey($path, $uid);
+ $fileKey = $this->keyManager->getFileKey($path, $uid, null);
if (empty($fileKey)) {
$owner = $this->util->getOwner($path);
if ($owner !== $uid) {
@@ -511,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/MultiKeyDecryptException.php b/apps/encryption/lib/Exceptions/MultiKeyDecryptException.php
index 562f6955ae4..1246d51190b 100644
--- a/apps/encryption/lib/Exceptions/MultiKeyDecryptException.php
+++ b/apps/encryption/lib/Exceptions/MultiKeyDecryptException.php
@@ -1,23 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Exceptions;
diff --git a/apps/encryption/lib/Exceptions/MultiKeyEncryptException.php b/apps/encryption/lib/Exceptions/MultiKeyEncryptException.php
index 3771e7e36ba..60394af45c2 100644
--- a/apps/encryption/lib/Exceptions/MultiKeyEncryptException.php
+++ b/apps/encryption/lib/Exceptions/MultiKeyEncryptException.php
@@ -1,23 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Exceptions;
diff --git a/apps/encryption/lib/Exceptions/PrivateKeyMissingException.php b/apps/encryption/lib/Exceptions/PrivateKeyMissingException.php
index b8fd4fb9234..15fe8f4e72f 100644
--- a/apps/encryption/lib/Exceptions/PrivateKeyMissingException.php
+++ b/apps/encryption/lib/Exceptions/PrivateKeyMissingException.php
@@ -1,26 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Exceptions;
@@ -33,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 73edc5c710d..78eeeccf47d 100644
--- a/apps/encryption/lib/Exceptions/PublicKeyMissingException.php
+++ b/apps/encryption/lib/Exceptions/PublicKeyMissingException.php
@@ -1,24 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Exceptions;
@@ -31,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 0e7ec5cfd56..00000000000
--- a/apps/encryption/lib/HookManager.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Daniel Kesselberg <mail@danielkesselberg.de>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-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 54128d10327..00000000000
--- a/apps/encryption/lib/Hooks/Contracts/IHook.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Clark Tomlinson <fallen013@gmail.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-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 a719d7bc12e..00000000000
--- a/apps/encryption/lib/Hooks/UserHooks.php
+++ /dev/null
@@ -1,346 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-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\ILogger;
-use OCP\IUserManager;
-use OCP\IUserSession;
-use OCP\Util as OCUtil;
-
-class UserHooks implements IHook {
-
- /**
- * list of user for which we perform a password reset
- * @var array
- */
- protected static $passwordResetUsers = [];
-
- /**
- * @var KeyManager
- */
- private $keyManager;
- /**
- * @var IUserManager
- */
- private $userManager;
- /**
- * @var ILogger
- */
- private $logger;
- /**
- * @var Setup
- */
- private $userSetup;
- /**
- * @var IUserSession
- */
- private $userSession;
- /**
- * @var Util
- */
- private $util;
- /**
- * @var Session
- */
- private $session;
- /**
- * @var Recovery
- */
- private $recovery;
- /**
- * @var Crypt
- */
- private $crypt;
-
- /**
- * UserHooks constructor.
- *
- * @param KeyManager $keyManager
- * @param IUserManager $userManager
- * @param ILogger $logger
- * @param Setup $userSetup
- * @param IUserSession $userSession
- * @param Util $util
- * @param Session $session
- * @param Crypt $crypt
- * @param Recovery $recovery
- */
- public function __construct(KeyManager $keyManager,
- IUserManager $userManager,
- ILogger $logger,
- Setup $userSetup,
- IUserSession $userSession,
- Util $util,
- Session $session,
- Crypt $crypt,
- Recovery $recovery) {
- $this->keyManager = $keyManager;
- $this->userManager = $userManager;
- $this->logger = $logger;
- $this->userSetup = $userSetup;
- $this->userSession = $userSession;
- $this->util = $util;
- $this->session = $session;
- $this->recovery = $recovery;
- $this->crypt = $crypt;
- }
-
- /**
- * 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 = isset($params['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 2c6487d062a..f9c1ef94634 100644
--- a/apps/encryption/lib/KeyManager.php
+++ b/apps/encryption/lib/KeyManager.php
@@ -1,33 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Julius Härtl <jus@bitgrid.net>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <vincent@nextcloud.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption;
@@ -39,107 +15,34 @@ use OCA\Encryption\Exceptions\PrivateKeyMissingException;
use OCA\Encryption\Exceptions\PublicKeyMissingException;
use OCP\Encryption\Keys\IStorage;
use OCP\IConfig;
-use OCP\ILogger;
use OCP\IUserSession;
use OCP\Lock\ILockingProvider;
+use Psr\Log\LoggerInterface;
class KeyManager {
+ private string $recoveryKeyId;
+ private string $publicShareKeyId;
+ private string $masterKeyId;
+ private string $keyId;
+ private string $publicKeyId = 'publicKey';
+ private string $privateKeyId = 'privateKey';
+ private string $shareKeyId = 'shareKey';
+ private string $fileKeyId = 'fileKey';
- /**
- * @var Session
- */
- protected $session;
- /**
- * @var IStorage
- */
- private $keyStorage;
- /**
- * @var Crypt
- */
- private $crypt;
- /**
- * @var string
- */
- private $recoveryKeyId;
- /**
- * @var string
- */
- private $publicShareKeyId;
- /**
- * @var string
- */
- private $masterKeyId;
- /**
- * @var string UserID
- */
- private $keyId;
- /**
- * @var string
- */
- private $publicKeyId = 'publicKey';
- /**
- * @var string
- */
- private $privateKeyId = 'privateKey';
-
- /**
- * @var string
- */
- private $shareKeyId = 'shareKey';
-
- /**
- * @var string
- */
- private $fileKeyId = 'fileKey';
- /**
- * @var IConfig
- */
- private $config;
- /**
- * @var ILogger
- */
- private $log;
- /**
- * @var Util
- */
- private $util;
-
- /**
- * @var ILockingProvider
- */
- private $lockingProvider;
-
- /**
- * @param IStorage $keyStorage
- * @param Crypt $crypt
- * @param IConfig $config
- * @param IUserSession $userSession
- * @param Session $session
- * @param ILogger $log
- * @param Util $util
- */
public function __construct(
- IStorage $keyStorage,
- Crypt $crypt,
- IConfig $config,
+ private IStorage $keyStorage,
+ private Crypt $crypt,
+ private IConfig $config,
IUserSession $userSession,
- Session $session,
- ILogger $log,
- Util $util,
- ILockingProvider $lockingProvider
+ private Session $session,
+ private LoggerInterface $logger,
+ private Util $util,
+ private ILockingProvider $lockingProvider,
) {
- $this->util = $util;
- $this->session = $session;
- $this->keyStorage = $keyStorage;
- $this->crypt = $crypt;
- $this->config = $config;
- $this->log = $log;
- $this->lockingProvider = $lockingProvider;
-
$this->recoveryKeyId = $this->config->getAppValue('encryption',
'recoveryKeyId');
if (empty($this->recoveryKeyId)) {
- $this->recoveryKeyId = 'recoveryKey_' . substr(md5(time()), 0, 8);
+ $this->recoveryKeyId = 'recoveryKey_' . substr(md5((string)time()), 0, 8);
$this->config->setAppValue('encryption',
'recoveryKeyId',
$this->recoveryKeyId);
@@ -148,19 +51,18 @@ class KeyManager {
$this->publicShareKeyId = $this->config->getAppValue('encryption',
'publicShareKeyId');
if (empty($this->publicShareKeyId)) {
- $this->publicShareKeyId = 'pubShare_' . substr(md5(time()), 0, 8);
+ $this->publicShareKeyId = 'pubShare_' . substr(md5((string)time()), 0, 8);
$this->config->setAppValue('encryption', 'publicShareKeyId', $this->publicShareKeyId);
}
$this->masterKeyId = $this->config->getAppValue('encryption',
'masterKeyId');
if (empty($this->masterKeyId)) {
- $this->masterKeyId = 'master_' . substr(md5(time()), 0, 8);
+ $this->masterKeyId = 'master_' . substr(md5((string)time()), 0, 8);
$this->config->setAppValue('encryption', 'masterKeyId', $this->masterKeyId);
}
$this->keyId = $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false;
- $this->log = $log;
}
/**
@@ -224,10 +126,10 @@ class KeyManager {
}
$this->lockingProvider->releaseLock('encryption-generateMasterKey', ILockingProvider::LOCK_EXCLUSIVE);
} elseif (empty($publicMasterKey)) {
- $this->log->error('A private master key is available but the public key could not be found. This should never happen.');
+ $this->logger->error('A private master key is available but the public key could not be found. This should never happen.');
return;
} elseif (empty($privateMasterKey)) {
- $this->log->error('A public master key is available but the private key could not be found. This should never happen.');
+ $this->logger->error('A public master key is available but the private key could not be found. This should never happen.');
return;
}
@@ -309,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);
@@ -385,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 {
@@ -398,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);
@@ -406,11 +310,13 @@ class KeyManager {
} catch (DecryptionFailedException $e) {
return false;
} catch (\Exception $e) {
- $this->log->logException($e, [
- 'message' => 'Could not decrypt the private key from user "' . $uid . '"" during login. Assume password change on the user back-end.',
- 'level' => ILogger::WARN,
- 'app' => 'encryption',
- ]);
+ $this->logger->warning(
+ 'Could not decrypt the private key from user "' . $uid . '"" during login. Assume password change on the user back-end.',
+ [
+ 'app' => 'encryption',
+ 'exception' => $e,
+ ]
+ );
return false;
}
@@ -439,22 +345,25 @@ class KeyManager {
}
/**
- * @param string $path
- * @param $uid
- * @return string
+ * @param ?bool $useLegacyFileKey null means try both
*/
- public function getFileKey($path, $uid) {
+ public function getFileKey(string $path, ?string $uid, ?bool $useLegacyFileKey, bool $useDecryptAll = false): string {
if ($uid === '') {
$uid = null;
}
$publicAccess = is_null($uid);
- $encryptedFileKey = $this->keyStorage->getFileKey($path, $this->fileKeyId, Encryption::ID);
+ $encryptedFileKey = '';
+ if ($useLegacyFileKey ?? true) {
+ $encryptedFileKey = $this->keyStorage->getFileKey($path, $this->fileKeyId, Encryption::ID);
- if (empty($encryptedFileKey)) {
- return '';
+ if (empty($encryptedFileKey) && $useLegacyFileKey) {
+ return '';
+ }
}
-
- if ($this->util->isMasterKeyEnabled()) {
+ if ($useDecryptAll) {
+ $shareKey = $this->getShareKey($path, $this->session->getDecryptAllUid());
+ $privateKey = $this->session->getDecryptAllKey();
+ } elseif ($this->util->isMasterKeyEnabled()) {
$uid = $this->getMasterKeyId();
$shareKey = $this->getShareKey($path, $uid);
if ($publicAccess) {
@@ -475,10 +384,17 @@ class KeyManager {
$privateKey = $this->session->getPrivateKey();
}
- if ($encryptedFileKey && $shareKey && $privateKey) {
- return $this->crypt->multiKeyDecrypt($encryptedFileKey,
- $shareKey,
- $privateKey);
+ if ($useLegacyFileKey ?? true) {
+ if ($encryptedFileKey && $shareKey && $privateKey) {
+ return $this->crypt->multiKeyDecryptLegacy($encryptedFileKey,
+ $shareKey,
+ $privateKey);
+ }
+ }
+ if (!($useLegacyFileKey ?? false)) {
+ if ($shareKey && $privateKey) {
+ return $this->crypt->multiKeyDecrypt($shareKey, $privateKey);
+ }
}
return '';
@@ -656,6 +572,10 @@ class KeyManager {
return $this->keyStorage->deleteAllFileKeys($path);
}
+ public function deleteLegacyFileKey(string $path): bool {
+ return $this->keyStorage->deleteFileKey($path, $this->fileKeyId, Encryption::ID);
+ }
+
/**
* @param array $userIds
* @return array
@@ -713,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 a80d7144cc4..5f98308de89 100644
--- a/apps/encryption/lib/Migration/SetMasterKeyStatus.php
+++ b/apps/encryption/lib/Migration/SetMasterKeyStatus.php
@@ -1,24 +1,8 @@
<?php
+
/**
- * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\Encryption\Migration;
@@ -34,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 f4336ec7c4e..38e78f5e822 100644
--- a/apps/encryption/lib/Recovery.php
+++ b/apps/encryption/lib/Recovery.php
@@ -1,28 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption;
@@ -35,32 +16,10 @@ use OCP\IUserSession;
use OCP\PreConditionNotMetException;
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
@@ -70,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;
}
/**
@@ -102,7 +58,7 @@ class Recovery {
}
if ($keyManager->checkRecoveryPassword($password)) {
- $appConfig->setAppValue('encryption', 'recoveryAdminEnabled', 1);
+ $appConfig->setAppValue('encryption', 'recoveryAdminEnabled', '1');
return true;
}
@@ -140,7 +96,7 @@ class Recovery {
if ($keyManager->checkRecoveryPassword($recoveryPassword)) {
// Set recoveryAdmin as disabled
- $this->config->setAppValue('encryption', 'recoveryAdminEnabled', 0);
+ $this->config->setAppValue('encryption', 'recoveryAdminEnabled', '0');
return true;
}
return false;
@@ -169,7 +125,7 @@ class Recovery {
* @return bool
*/
public function isRecoveryKeyEnabled() {
- $enabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled', 0);
+ $enabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled', '0');
return ($enabled === '1');
}
@@ -199,16 +155,15 @@ class Recovery {
/**
* add recovery key to all encrypted files
- * @param string $path
*/
- private function addRecoveryKeys($path) {
+ private function addRecoveryKeys(string $path): void {
$dirContent = $this->view->getDirectoryContent($path);
foreach ($dirContent as $item) {
$filePath = $item->getPath();
if ($item['type'] === 'dir') {
$this->addRecoveryKeys($filePath . '/');
} else {
- $fileKey = $this->keyManager->getFileKey($filePath, $this->user->getUID());
+ $fileKey = $this->keyManager->getFileKey($filePath, $this->user->getUID(), null);
if (!empty($fileKey)) {
$accessList = $this->file->getAccessList($filePath);
$publicKeys = [];
@@ -218,8 +173,11 @@ class Recovery {
$publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $this->user->getUID());
- $encryptedKeyfiles = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
- $this->keyManager->setAllFileKeys($filePath, $encryptedKeyfiles);
+ $shareKeys = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
+ $this->keyManager->deleteLegacyFileKey($filePath);
+ foreach ($shareKeys as $uid => $keyFile) {
+ $this->keyManager->setShareKey($filePath, $uid, $keyFile);
+ }
}
}
}
@@ -227,9 +185,8 @@ class Recovery {
/**
* remove recovery key to all encrypted files
- * @param string $path
*/
- private function removeRecoveryKeys($path) {
+ private function removeRecoveryKeys(string $path): void {
$dirContent = $this->view->getDirectoryContent($path);
foreach ($dirContent as $item) {
$filePath = $item->getPath();
@@ -243,11 +200,8 @@ class Recovery {
/**
* recover users files with the recovery key
- *
- * @param string $recoveryPassword
- * @param string $user
*/
- public function recoverUsersFiles($recoveryPassword, $user) {
+ public function recoverUsersFiles(string $recoveryPassword, string $user): void {
$encryptedKey = $this->keyManager->getSystemPrivateKey($this->keyManager->getRecoveryKeyId());
$privateKey = $this->crypt->decryptPrivateKey($encryptedKey, $recoveryPassword);
@@ -258,12 +212,8 @@ class Recovery {
/**
* recover users files
- *
- * @param string $path
- * @param string $privateKey
- * @param string $uid
*/
- private function recoverAllFiles($path, $privateKey, $uid) {
+ private function recoverAllFiles(string $path, string $privateKey, string $uid): void {
$dirContent = $this->view->getDirectoryContent($path);
foreach ($dirContent as $item) {
@@ -279,19 +229,17 @@ class Recovery {
/**
* recover file
- *
- * @param string $path
- * @param string $privateKey
- * @param string $uid
*/
- private function recoverFile($path, $privateKey, $uid) {
+ private function recoverFile(string $path, string $privateKey, string $uid): void {
$encryptedFileKey = $this->keyManager->getEncryptedFileKey($path);
$shareKey = $this->keyManager->getShareKey($path, $this->keyManager->getRecoveryKeyId());
if ($encryptedFileKey && $shareKey && $privateKey) {
- $fileKey = $this->crypt->multiKeyDecrypt($encryptedFileKey,
+ $fileKey = $this->crypt->multiKeyDecryptLegacy($encryptedFileKey,
$shareKey,
$privateKey);
+ } elseif ($shareKey && $privateKey) {
+ $fileKey = $this->crypt->multiKeyDecrypt($shareKey, $privateKey);
}
if (!empty($fileKey)) {
@@ -303,8 +251,11 @@ class Recovery {
$publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $uid);
- $encryptedKeyfiles = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
- $this->keyManager->setAllFileKeys($path, $encryptedKeyfiles);
+ $shareKeys = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
+ $this->keyManager->deleteLegacyFileKey($path);
+ foreach ($shareKeys as $uid => $keyFile) {
+ $this->keyManager->setShareKey($path, $uid, $keyFile);
+ }
}
}
}
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 ad07008d480..df1e5d664ad 100644
--- a/apps/encryption/lib/Session.php
+++ b/apps/encryption/lib/Session.php
@@ -1,28 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption;
@@ -31,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';
@@ -41,8 +19,9 @@ class Session {
/**
* @param ISession $session
*/
- public function __construct(ISession $session) {
- $this->session = $session;
+ public function __construct(
+ protected ISession $session,
+ ) {
}
/**
@@ -87,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 e69379bb414..a5de4ba68ff 100644
--- a/apps/encryption/lib/Settings/Admin.php
+++ b/apps/encryption/lib/Settings/Admin.php
@@ -1,27 +1,8 @@
<?php
+
/**
- * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Julius Härtl <jus@bitgrid.net>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\Encryption\Settings;
@@ -32,46 +13,21 @@ use OCA\Encryption\Util;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\IL10N;
-use OCP\ILogger;
use OCP\ISession;
use OCP\IUserManager;
use OCP\IUserSession;
use OCP\Settings\ISettings;
+use Psr\Log\LoggerInterface;
class Admin implements ISettings {
-
- /** @var IL10N */
- private $l;
-
- /** @var ILogger */
- private $logger;
-
- /** @var IUserSession */
- private $userSession;
-
- /** @var IConfig */
- private $config;
-
- /** @var IUserManager */
- private $userManager;
-
- /** @var ISession */
- private $session;
-
public function __construct(
- IL10N $l,
- ILogger $logger,
- IUserSession $userSession,
- IConfig $config,
- IUserManager $userManager,
- ISession $session
+ private IL10N $l,
+ private LoggerInterface $logger,
+ private IUserSession $userSession,
+ private IConfig $config,
+ private IUserManager $userManager,
+ private ISession $session,
) {
- $this->l = $l;
- $this->logger = $logger;
- $this->userSession = $userSession;
- $this->config = $config;
- $this->userManager = $userManager;
- $this->session = $session;
}
/**
@@ -87,7 +43,6 @@ class Admin implements ISettings {
$util = new Util(
new View(),
$crypt,
- $this->logger,
$this->userSession,
$this->config,
$this->userManager);
@@ -117,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 70b85a667a9..8814d3afb58 100644
--- a/apps/encryption/lib/Settings/Personal.php
+++ b/apps/encryption/lib/Settings/Personal.php
@@ -1,25 +1,8 @@
<?php
+
/**
- * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\Encryption\Settings;
@@ -32,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,
+ ) {
}
/**
@@ -82,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 c28a83d8115..f2189d6dab2 100644
--- a/apps/encryption/lib/Users/Setup.php
+++ b/apps/encryption/lib/Users/Setup.php
@@ -1,29 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Julius Härtl <jus@bitgrid.net>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Users;
@@ -31,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 07bca9cbfdf..ccbdcdcb242 100644
--- a/apps/encryption/lib/Util.php
+++ b/apps/encryption/lib/Util.php
@@ -1,89 +1,33 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Phil Davis <phil.davis@inf.org>
- * @author Robin Appelman <robin@icewind.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
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\ILogger;
use OCP\IUser;
use OCP\IUserManager;
use OCP\IUserSession;
use OCP\PreConditionNotMetException;
class Util {
- /**
- * @var View
- */
- private $files;
- /**
- * @var Crypt
- */
- private $crypt;
- /**
- * @var ILogger
- */
- private $logger;
- /**
- * @var bool|IUser
- */
- private $user;
- /**
- * @var IConfig
- */
- private $config;
- /**
- * @var IUserManager
- */
- private $userManager;
+ private IUser|false $user;
- /**
- * Util constructor.
- *
- * @param View $files
- * @param Crypt $crypt
- * @param ILogger $logger
- * @param IUserSession $userSession
- * @param IConfig $config
- * @param IUserManager $userManager
- */
- public function __construct(View $files,
- Crypt $crypt,
- ILogger $logger,
- IUserSession $userSession,
- IConfig $config,
- IUserManager $userManager
+ public function __construct(
+ private View $files,
+ private Crypt $crypt,
+ IUserSession $userSession,
+ private IConfig $config,
+ private IUserManager $userManager,
) {
- $this->files = $files;
- $this->crypt = $crypt;
- $this->logger = $logger;
- $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser() : false;
- $this->config = $config;
- $this->userManager = $userManager;
+ $this->user = $userSession->isLoggedIn() ? $userSession->getUser() : false;
}
/**
@@ -132,10 +76,8 @@ class Util {
/**
* check if master key is enabled
- *
- * @return bool
*/
- public function isMasterKeyEnabled() {
+ public function isMasterKeyEnabled(): bool {
$userMasterKey = $this->config->getAppValue('encryption', 'useMasterKey', '1');
return ($userMasterKey === '1');
}
@@ -179,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/altmail.php b/apps/encryption/templates/altmail.php
deleted file mode 100644
index 2044fd8e74c..00000000000
--- a/apps/encryption/templates/altmail.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/** @var OC_Theme $theme */
-/** @var array $_ */
-
-print_unescaped($l->t("Hey there,\n\nThe administration 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", [$_['password']]));
-if (isset($_['expiration'])) {
- print_unescaped($l->t("The share will expire on %s.", [$_['expiration']]));
- print_unescaped("\n\n");
-}
-// TRANSLATORS term at the end of a mail
-p($l->t("Cheers!"));
-?>
-
- --
-<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
-<?php print_unescaped("\n".$theme->getBaseUrl());
diff --git a/apps/encryption/templates/mail.php b/apps/encryption/templates/mail.php
deleted file mode 100644
index 0db4b67d08d..00000000000
--- a/apps/encryption/templates/mail.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/** @var OC_Theme $theme */
-/** @var array $_ */
-?>
-<table cellspacing="0" cellpadding="0" border="0" width="100%">
- <tr><td>
- <table cellspacing="0" cellpadding="0" border="0" width="600px">
- <tr>
- <td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>">
- <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('core', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
- </td>
- </tr>
- <tr><td colspan="2">&nbsp;</td></tr>
- <tr>
- <td width="20px">&nbsp;</td>
- <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
- <?php
- print_unescaped($l->t('Hey there,<br><br>The administration 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>', [$_['password']]));
- // TRANSLATORS term at the end of a mail
- p($l->t('Cheers!'));
- ?>
- </td>
- </tr>
- <tr><td colspan="2">&nbsp;</td></tr>
- <tr>
- <td width="20px">&nbsp;</td>
- <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
- <?php p($theme->getName()); ?> -
- <?php p($theme->getSlogan()); ?>
- <br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
- </td>
- </tr>
- <tr>
- <td colspan="2">&nbsp;</td>
- </tr>
- </table>
- </td></tr>
-</table>
diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index 1ae93dfb0e2..432ba2f11b0 100644
--- a/apps/encryption/templates/settings-admin.php
+++ b/apps/encryption/templates/settings-admin.php
@@ -1,75 +1,81 @@
<?php
+
+/**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
/** @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"
value="1" <?php if ($_['encryptHomeStorage']) {
- print_unescaped('checked="checked"');
-} ?> />
+ 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 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.")) ?>
+ <?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:")); ?>
+ print_unescaped('class="hidden"');
+ }?>>
+ <?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 899ba4a1747..604bed53a8f 100644
--- a/apps/encryption/templates/settings-personal.php
+++ b/apps/encryption/templates/settings-personal.php
@@ -1,54 +1,60 @@
<?php
- /** @var array $_ */
- /** @var \OCP\IL10N $l */
-script('encryption', 'settings-personal');
+
+/**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+/** @var array $_ */
+/** @var \OCP\IL10N $l */
+\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"
@@ -56,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
@@ -66,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 5c938b4350d..d0af359183b 100644
--- a/apps/encryption/tests/Command/FixEncryptedVersionTest.php
+++ b/apps/encryption/tests/Command/FixEncryptedVersionTest.php
@@ -1,22 +1,11 @@
<?php
+
+declare(strict_types=1);
+
/**
- * @author Sujith Haridasan <sharidasan@owncloud.com>
- *
- * @copyright Copyright (c) 2019, ownCloud GmbH
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2019 ownCloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Tests\Command;
@@ -24,6 +13,13 @@ 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;
use Test\Traits\EncryptionTrait;
@@ -41,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();
@@ -63,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->getLogger(),
- \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');
@@ -155,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');
@@ -214,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++) {
@@ -239,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');
@@ -263,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 = $view->getLocalFolder(''). '/hello.txt';
+ $absPath = $storage1->getSourcePath('') . $fileInfo1->getInternalPath();
// create unencrypted file on disk, the version stays
file_put_contents($absPath, 'hello contents');
@@ -287,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();
@@ -311,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');
@@ -323,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();
@@ -333,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();
@@ -347,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();
@@ -364,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);
@@ -381,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 269e99eae4b..ead3dfd0195 100644
--- a/apps/encryption/tests/Command/TestEnableMasterKey.php
+++ b/apps/encryption/tests/Command/TestEnableMasterKey.php
@@ -1,26 +1,11 @@
<?php
+
+declare(strict_types=1);
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Tests\Command;
@@ -34,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 {
@@ -70,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);
@@ -96,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 7a33b4b1346..0fec3f4d6a9 100644
--- a/apps/encryption/tests/Controller/RecoveryControllerTest.php
+++ b/apps/encryption/tests/Controller/RecoveryControllerTest.php
@@ -1,27 +1,11 @@
<?php
+
+declare(strict_types=1);
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Tests\Controller;
@@ -31,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);
@@ -81,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],
@@ -92,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)
@@ -116,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]
@@ -124,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 219e2c6ae0f..bee20f67cec 100644
--- a/apps/encryption/tests/Controller/SettingsControllerTest.php
+++ b/apps/encryption/tests/Controller/SettingsControllerTest.php
@@ -1,27 +1,11 @@
<?php
+
+declare(strict_types=1);
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * 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\Controller;
@@ -42,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;
+ protected SettingsController $controller;
- /** @var \OCA\Encryption\KeyManager|\PHPUnit\Framework\MockObject\MockObject */
- private $keyManagerMock;
-
- /** @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();
@@ -133,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';
@@ -158,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';
@@ -184,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())
@@ -245,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 dffc4a97718..1bbcad77411 100644
--- a/apps/encryption/tests/Controller/StatusControllerTest.php
+++ b/apps/encryption/tests/Controller/StatusControllerTest.php
@@ -1,28 +1,11 @@
<?php
+
+declare(strict_types=1);
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * 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\Controller;
@@ -31,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();
@@ -74,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();
@@ -87,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 08d0bba2668..1355e2c855d 100644
--- a/apps/encryption/tests/Crypto/CryptTest.php
+++ b/apps/encryption/tests/Crypto/CryptTest.php
@@ -1,65 +1,39 @@
<?php
+
+declare(strict_types=1);
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * 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\Crypto;
use OCA\Encryption\Crypto\Crypt;
+use OCP\Encryption\Exceptions\GenericEncryptionException;
use OCP\IConfig;
use OCP\IL10N;
-use OCP\ILogger;
use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
use Test\TestCase;
class CryptTest extends TestCase {
+ protected LoggerInterface&MockObject $logger;
+ protected IUserSession&MockObject $userSession;
+ protected IConfig&MockObject $config;
+ protected IL10N&MockObject $l;
-
- /** @var \OCP\ILogger|\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;
-
- /** @var Crypt */
- private $crypt;
+ protected Crypt $crypt;
protected function setUp(): void {
parent::setUp();
- $this->logger = $this->getMockBuilder(ILogger::class)
+ $this->logger = $this->getMockBuilder(LoggerInterface::class)
->disableOriginalConstructor()
->getMock();
$this->logger->expects($this->any())
- ->method('warning')
- ->willReturn(true);
+ ->method('warning');
$this->userSession = $this->getMockBuilder(IUserSession::class)
->disableOriginalConstructor()
->getMock();
@@ -74,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([]))
@@ -89,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([]))
@@ -106,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'))
@@ -128,42 +101,39 @@ 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:hash:encoding:binary:HEND'],
+ [null, 'HBEGIN:cipher:AES-128-CFB:keyFormat:hash2:encoding:binary:HEND'],
['password', 'HBEGIN:cipher:AES-128-CFB:keyFormat:password:encoding:binary:HEND'],
['hash', 'HBEGIN:cipher:AES-128-CFB:keyFormat:hash:encoding:binary:HEND']
];
}
- 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')
->with('Unsupported cipher (Not-Existing-Cipher) defined in config.php supported. Falling back to AES-256-CTR');
- $this->assertSame('AES-256-CTR', $this->crypt->getCipher());
+ $this->assertSame('AES-256-CTR', $this->crypt->getCipher());
}
/**
- * @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'))
@@ -176,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'],
@@ -193,7 +161,7 @@ class CryptTest extends TestCase {
/**
* test concatIV()
*/
- public function testConcatIV() {
+ public function testConcatIV(): void {
$result = self::invokePrivate(
$this->crypt,
'concatIV',
@@ -204,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);
@@ -222,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]],
@@ -231,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);
@@ -243,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'],
@@ -272,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);
}
@@ -280,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]
@@ -304,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]);
@@ -349,7 +309,7 @@ class CryptTest extends TestCase {
*
* @depends testEncrypt
*/
- public function testDecrypt($data) {
+ public function testDecrypt($data): void {
$result = self::invokePrivate(
$this->crypt,
'decrypt',
@@ -360,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);
}
@@ -372,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],
@@ -390,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);
@@ -437,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'],
@@ -451,7 +399,7 @@ class CryptTest extends TestCase {
];
}
- public function testIsValidPrivateKey() {
+ public function testIsValidPrivateKey(): void {
$res = openssl_pkey_new();
openssl_pkey_export($res, $privateKey);
@@ -465,4 +413,17 @@ class CryptTest extends TestCase {
$this->invokePrivate($this->crypt, 'isValidPrivateKey', ['foo'])
);
}
+
+ public function testMultiKeyEncrypt(): void {
+ $res = openssl_pkey_new();
+ openssl_pkey_export($res, $privateKey);
+ $publicKeyPem = openssl_pkey_get_details($res)['key'];
+ $publicKey = openssl_pkey_get_public($publicKeyPem);
+
+ $shareKeys = $this->crypt->multiKeyEncrypt('content', ['user1' => $publicKey]);
+ $this->assertEquals(
+ 'content',
+ $this->crypt->multiKeyDecrypt($shareKeys['user1'], $privateKey)
+ );
+ }
}
diff --git a/apps/encryption/tests/Crypto/DecryptAllTest.php b/apps/encryption/tests/Crypto/DecryptAllTest.php
index 68b49307f31..82e6100bce5 100644
--- a/apps/encryption/tests/Crypto/DecryptAllTest.php
+++ b/apps/encryption/tests/Crypto/DecryptAllTest.php
@@ -1,26 +1,11 @@
<?php
+
+declare(strict_types=1);
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Tests\Crypto;
@@ -29,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();
@@ -75,7 +51,7 @@ class DecryptAllTest extends TestCase {
);
}
- public function testUpdateSession() {
+ public function testUpdateSession(): void {
$this->session->expects($this->once())->method('prepareDecryptAll')
->with('user1', 'key1');
@@ -83,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')
@@ -122,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 126dbec680e..c56e3375a73 100644
--- a/apps/encryption/tests/Crypto/EncryptAllTest.php
+++ b/apps/encryption/tests/Crypto/EncryptAllTest.php
@@ -1,29 +1,11 @@
<?php
+
+declare(strict_types=1);
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Kenneth Newwood <kenneth@newwood.name>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * 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\Crypto;
@@ -36,9 +18,12 @@ use OCP\Files\FileInfo;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IUserManager;
+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;
@@ -48,47 +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 | \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();
@@ -106,6 +67,7 @@ class EncryptAllTest extends TestCase {
->disableOriginalConstructor()->getMock();
$this->mailer = $this->getMockBuilder(IMailer::class)
->disableOriginalConstructor()->getMock();
+ $this->l10nFactory = $this->createMock(IFactory::class);
$this->l = $this->getMockBuilder(IL10N::class)
->disableOriginalConstructor()->getMock();
$this->questionHelper = $this->getMockBuilder(QuestionHelper::class)
@@ -116,9 +78,14 @@ 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 */
+ /**
+ * We need format method to return a string
+ * @var OutputFormatterInterface&MockObject
+ */
$outputFormatter = $this->createMock(OutputFormatterInterface::class);
+ $outputFormatter->method('isDecorated')->willReturn(false);
$outputFormatter->method('format')->willReturnArgument(0);
$this->outputInterface->expects($this->any())->method('getFormatter')
@@ -140,13 +107,22 @@ class EncryptAllTest extends TestCase {
$this->config,
$this->mailer,
$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(
[
@@ -158,11 +134,13 @@ class EncryptAllTest extends TestCase {
$this->config,
$this->mailer,
$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);
@@ -173,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(
[
@@ -186,11 +164,13 @@ class EncryptAllTest extends TestCase {
$this->config,
$this->mailer,
$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);
@@ -202,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(
[
@@ -215,11 +195,13 @@ class EncryptAllTest extends TestCase {
$this->config,
$this->mailer,
$this->l,
+ $this->l10nFactory,
$this->questionHelper,
- $this->secureRandom
+ $this->secureRandom,
+ $this->logger,
]
)
- ->setMethods(['setupUserFS', 'generateOneTimePassword'])
+ ->onlyMethods(['setupUserFS', 'generateOneTimePassword'])
->getMock();
@@ -251,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(
[
@@ -264,11 +246,13 @@ class EncryptAllTest extends TestCase {
$this->config,
$this->mailer,
$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);
@@ -277,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(
[
@@ -299,54 +288,61 @@ class EncryptAllTest extends TestCase {
$this->config,
$this->mailer,
$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);
$this->outputInterface->expects($this->any())
->method('getFormatter')
- ->willReturn($this->createMock(OutputFormatterInterface::class));
+ ->willReturn($outputFormatter);
$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));
@@ -357,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) {
@@ -377,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 63698dcdc63..37e484550ef 100644
--- a/apps/encryption/tests/Crypto/EncryptionTest.php
+++ b/apps/encryption/tests/Crypto/EncryptionTest.php
@@ -1,31 +1,16 @@
<?php
+
+declare(strict_types=1);
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * 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\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;
@@ -34,49 +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 OCP\ILogger;
+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 \OCP\ILogger|\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()
@@ -96,7 +64,7 @@ class EncryptionTest extends TestCase {
$this->decryptAllMock = $this->getMockBuilder(DecryptAll::class)
->disableOriginalConstructor()
->getMock();
- $this->loggerMock = $this->getMockBuilder(ILogger::class)
+ $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
->disableOriginalConstructor()
->getMock();
$this->l10nMock = $this->getMockBuilder(IL10N::class)
@@ -122,7 +90,11 @@ 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);
+
$this->instance->begin('/foo/bar', 'user1', 'r', [], ['users' => ['user1', 'user2', 'user3']]);
$this->endTest();
}
@@ -131,8 +103,12 @@ class EncryptionTest extends TestCase {
* test if public key from owner is missing
*
*/
- public function testEndUser2() {
- $this->expectException(\OCA\Encryption\Exceptions\PublicKeyMissingException::class);
+ public function testEndUser2(): void {
+ $this->sessionMock->expects($this->once())
+ ->method('decryptAllModeActivated')
+ ->willReturn(false);
+
+ $this->expectException(PublicKeyMissingException::class);
$this->instance->begin('/foo/bar', 'user2', 'r', [], ['users' => ['user1', 'user2', 'user3']]);
$this->endTest();
@@ -156,7 +132,7 @@ class EncryptionTest extends TestCase {
->willReturnCallback([$this, 'addSystemKeysCallback']);
$this->cryptMock->expects($this->any())
->method('multiKeyEncrypt')
- ->willReturn(true);
+ ->willReturn([]);
$this->instance->end('/foo/bar');
}
@@ -176,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'],
@@ -194,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);
@@ -238,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'],
@@ -251,37 +223,18 @@ class EncryptionTest extends TestCase {
/**
* test begin() if decryptAll mode was activated
*/
- public function testBeginDecryptAll() {
+ public function testBeginDecryptAll(): void {
$path = '/user/files/foo.txt';
- $recoveryKeyId = 'recoveryKeyId';
- $recoveryShareKey = 'recoveryShareKey';
- $decryptAllKey = 'decryptAllKey';
$fileKey = 'fileKey';
$this->sessionMock->expects($this->once())
->method('decryptAllModeActivated')
->willReturn(true);
- $this->sessionMock->expects($this->once())
- ->method('getDecryptAllUid')
- ->willReturn($recoveryKeyId);
- $this->sessionMock->expects($this->once())
- ->method('getDecryptAllKey')
- ->willReturn($decryptAllKey);
-
- $this->keyManagerMock->expects($this->once())
- ->method('getEncryptedFileKey')
- ->willReturn('encryptedFileKey');
$this->keyManagerMock->expects($this->once())
- ->method('getShareKey')
- ->with($path, $recoveryKeyId)
- ->willReturn($recoveryShareKey);
- $this->cryptMock->expects($this->once())
- ->method('multiKeyDecrypt')
- ->with('encryptedFileKey', $recoveryShareKey, $decryptAllKey)
+ ->method('getFileKey')
+ ->with($path, 'user', null, true)
->willReturn($fileKey);
- $this->keyManagerMock->expects($this->never())->method('getFileKey');
-
$this->instance->begin($path, 'user', 'r', [], []);
$this->assertSame($fileKey,
@@ -294,7 +247,11 @@ 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);
+
$this->sessionMock->expects($this->once())->method('isReady')->willReturn(false);
$this->utilMock->expects($this->once())->method('isMasterKeyEnabled')
->willReturn(true);
@@ -304,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);
@@ -330,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', []);
}
@@ -356,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);
}
);
@@ -378,6 +335,7 @@ class EncryptionTest extends TestCase {
function ($fileKey, $publicKeys) {
$this->assertEmpty($publicKeys);
$this->assertSame('fileKey', $fileKey);
+ return [];
}
);
@@ -392,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);
@@ -411,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],
@@ -428,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
new file mode 100644
index 00000000000..59f419a7f7a
--- /dev/null
+++ b/apps/encryption/tests/EncryptedStorageTest.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\encryption\tests;
+
+use OC\Files\Storage\Temporary;
+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;
+use Test\Traits\UserTrait;
+
+class TemporaryNoEncrypted extends Temporary implements IDisableEncryptionStorage {
+
+}
+
+/**
+ * @group DB
+ */
+class EncryptedStorageTest extends TestCase {
+ use MountProviderTrait;
+ use EncryptionTrait;
+ use UserTrait;
+
+ 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->loginWithEncryption('test1');
+
+ $view = new View('/test1/files');
+
+ /** @var IMountManager $mountManager */
+ $mountManager = Server::get(IMountManager::class);
+
+ $encryptedMount = $mountManager->find('/test1/files/enc');
+ $unencryptedMount = $mountManager->find('/test1/files/unenc');
+ $encryptedStorage = $encryptedMount->getStorage();
+ $unencryptedStorage = $unencryptedMount->getStorage();
+ $encryptedCache = $encryptedStorage->getCache();
+ $unencryptedCache = $unencryptedStorage->getCache();
+
+ $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'));
+
+ $this->assertTrue($encryptedCache->get('foo.txt')->isEncrypted());
+
+ $view->rename('enc/foo.txt', 'unenc/foo.txt');
+
+ $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 13102c87168..00000000000
--- a/apps/encryption/tests/HookManagerTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-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 e06feb1e370..00000000000
--- a/apps/encryption/tests/Hooks/UserHooksTest.php
+++ /dev/null
@@ -1,391 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-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\ILogger;
-use OCP\IUser;
-use OCP\IUserManager;
-use OCP\IUserSession;
-use PHPUnit\Framework\MockObject\MockObject;
-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(ILogger::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 c08f8b576d9..3fe76fc4f59 100644
--- a/apps/encryption/tests/KeyManagerTest.php
+++ b/apps/encryption/tests/KeyManagerTest.php
@@ -1,89 +1,48 @@
<?php
+
+declare(strict_types=1);
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Julius Härtl <jus@bitgrid.net>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <vincent@nextcloud.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * 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 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\ILogger;
use OCP\IUserSession;
use OCP\Lock\ILockingProvider;
use OCP\Lock\LockedException;
use PHPUnit\Framework\MockObject\MockObject;
+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;
-
- /** @var \OCP\IUserSession|\PHPUnit\Framework\MockObject\MockObject */
- private $userMock;
-
- /** @var \OCA\Encryption\Session|\PHPUnit\Framework\MockObject\MockObject */
- private $sessionMock;
- /** @var \OCP\ILogger|\PHPUnit\Framework\MockObject\MockObject */
- private $logMock;
+ protected KeyManager $instance;
- /** @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();
@@ -101,7 +60,7 @@ class KeyManagerTest extends TestCase {
$this->sessionMock = $this->getMockBuilder(Session::class)
->disableOriginalConstructor()
->getMock();
- $this->logMock = $this->createMock(ILogger::class);
+ $this->logMock = $this->createMock(LoggerInterface::class);
$this->utilMock = $this->getMockBuilder(Util::class)
->disableOriginalConstructor()
->getMock();
@@ -119,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'))
@@ -130,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'))
@@ -142,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'))
@@ -154,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'))
@@ -164,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'))
@@ -177,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(
@@ -192,7 +151,7 @@ class KeyManagerTest extends TestCase {
);
}
- public function testSetPrivateKey() {
+ public function testSetPrivateKey(): void {
$this->keyStorageMock->expects($this->any())
->method('setUserKey')
->with(
@@ -207,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())
@@ -222,7 +179,7 @@ class KeyManagerTest extends TestCase {
);
}
- public function dataTestUserHasKeys() {
+ public static function dataTestUserHasKeys(): array {
return [
['key', true],
['', false]
@@ -230,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')
@@ -246,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')
@@ -262,13 +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(
[
@@ -281,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');
@@ -312,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]
@@ -322,7 +282,7 @@ class KeyManagerTest extends TestCase {
}
- public function testSetRecoveryKey() {
+ public function testSetRecoveryKey(): void {
$this->keyStorageMock->expects($this->exactly(2))
->method('setSystemUserKey')
->willReturn(true);
@@ -338,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'))
@@ -350,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'))
@@ -362,7 +322,7 @@ class KeyManagerTest extends TestCase {
);
}
- public function testGetEncryptedFileKey() {
+ public function testGetEncryptedFileKey(): void {
$this->keyStorageMock->expects($this->once())
->method('getFileKey')
->with('/', 'fileKey')
@@ -371,28 +331,36 @@ class KeyManagerTest extends TestCase {
$this->assertTrue($this->instance->getEncryptedFileKey('/'));
}
- public function dataTestGetFileKey() {
+ public static function dataTestGetFileKey(): array {
return [
- ['user1', false, 'privateKey', true],
- ['user1', false, false, ''],
- ['user1', true, 'privateKey', true],
- ['user1', true, false, ''],
- [null, false, 'privateKey', true],
- [null, false, false, ''],
- [null, true, 'privateKey', true],
- [null, true, false, '']
+ ['user1', false, 'privateKey', 'legacyKey', 'multiKeyDecryptResult'],
+ ['user1', false, 'privateKey', '', 'multiKeyDecryptResult'],
+ ['user1', false, false, 'legacyKey', ''],
+ ['user1', false, false, '', ''],
+ ['user1', true, 'privateKey', 'legacyKey', 'multiKeyDecryptResult'],
+ ['user1', true, 'privateKey', '', 'multiKeyDecryptResult'],
+ ['user1', true, false, 'legacyKey', ''],
+ ['user1', true, false, '', ''],
+ [null, false, 'privateKey', 'legacyKey', 'multiKeyDecryptResult'],
+ [null, false, 'privateKey', '', 'multiKeyDecryptResult'],
+ [null, false, false, 'legacyKey', ''],
+ [null, false, false, '', ''],
+ [null, true, 'privateKey', 'legacyKey', 'multiKeyDecryptResult'],
+ [null, true, 'privateKey', '', 'multiKeyDecryptResult'],
+ [null, true, false, 'legacyKey', ''],
+ [null, true, false, '', ''],
];
}
/**
- * @dataProvider dataTestGetFileKey
*
* @param $uid
* @param $isMasterKeyEnabled
* @param $privateKey
* @param $expected
*/
- public function testGetFileKey($uid, $isMasterKeyEnabled, $privateKey, $expected) {
+ #[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetFileKey')]
+ public function testGetFileKey($uid, $isMasterKeyEnabled, $privateKey, $encryptedFileKey, $expected): void {
$path = '/foo.txt';
if ($isMasterKeyEnabled) {
@@ -409,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(
- true,
- true,
- );
+ ->willReturnMap([
+ [$path, 'fileKey', 'OC_DEFAULT_MODULE', $encryptedFileKey],
+ [$path, $expectedUid . '.shareKey', 'OC_DEFAULT_MODULE', 'fileKey'],
+ ]);
$this->utilMock->expects($this->any())->method('isMasterKeyEnabled')
->willReturn($isMasterKeyEnabled);
@@ -434,21 +398,36 @@ class KeyManagerTest extends TestCase {
$this->sessionMock->expects($this->once())->method('getPrivateKey')->willReturn($privateKey);
}
- if ($privateKey) {
- $this->cryptMock->expects($this->once())
- ->method('multiKeyDecrypt')
- ->willReturn(true);
- } else {
+ if (!empty($encryptedFileKey)) {
$this->cryptMock->expects($this->never())
->method('multiKeyDecrypt');
+ if ($privateKey) {
+ $this->cryptMock->expects($this->once())
+ ->method('multiKeyDecryptLegacy')
+ ->willReturn('multiKeyDecryptResult');
+ } else {
+ $this->cryptMock->expects($this->never())
+ ->method('multiKeyDecryptLegacy');
+ }
+ } else {
+ $this->cryptMock->expects($this->never())
+ ->method('multiKeyDecryptLegacy');
+ if ($privateKey) {
+ $this->cryptMock->expects($this->once())
+ ->method('multiKeyDecrypt')
+ ->willReturn('multiKeyDecryptResult');
+ } else {
+ $this->cryptMock->expects($this->never())
+ ->method('multiKeyDecrypt');
+ }
}
$this->assertSame($expected,
- $this->instance->getFileKey($path, $uid)
+ $this->instance->getFileKey($path, $uid, null)
);
}
- public function testDeletePrivateKey() {
+ public function testDeletePrivateKey(): void {
$this->keyStorageMock->expects($this->once())
->method('deleteUserKey')
->with('user1', 'privateKey')
@@ -459,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);
@@ -470,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';
@@ -514,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']],
@@ -523,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(
@@ -537,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');
@@ -547,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')
@@ -557,13 +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(
[
@@ -576,9 +553,12 @@ class KeyManagerTest extends TestCase {
$this->utilMock,
$this->lockingProviderMock
]
- )->setMethods(['getPublicMasterKey', 'setSystemPrivateKey', 'getMasterKeyPassword'])
+ )->onlyMethods(['getPublicMasterKey', 'setSystemPrivateKey', 'getMasterKeyPassword'])
->getMock();
+ $this->utilMock->expects($this->once())->method('isMasterKeyEnabled')
+ ->willReturn(true);
+
$instance->expects($this->once())->method('getPublicMasterKey')
->willReturn($masterKey);
@@ -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,23 +587,25 @@ 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')
+ ->willReturn(true);
+
$instance->expects($this->once())->method('getPublicMasterKey')
->willReturn('');
$instance->expects($this->once())->method('getPrivateMasterKey')
@@ -640,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())
@@ -655,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)
@@ -672,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)
@@ -684,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')
@@ -702,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())
@@ -714,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 37b6671d5cb..0627724a856 100644
--- a/apps/encryption/tests/RecoveryTest.php
+++ b/apps/encryption/tests/RecoveryTest.php
@@ -1,29 +1,11 @@
<?php
+
+declare(strict_types=1);
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * 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;
@@ -41,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;
/**
@@ -57,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;
/**
@@ -73,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);
@@ -100,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);
@@ -127,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);
@@ -139,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'));
@@ -157,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())
@@ -170,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);
@@ -182,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');
@@ -191,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([]);
@@ -205,18 +187,19 @@ 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([]);
$this->cryptMock->expects($this->once())
- ->method('decryptPrivateKey');
+ ->method('decryptPrivateKey')
+ ->willReturn('privateKey');
$this->instance->recoverUsersFiles('password', 'admin');
$this->addToAssertionCount(1);
}
- public function testRecoverFile() {
+ public function testRecoverFile(): void {
$this->keyManagerMock->expects($this->once())
->method('getEncryptedFileKey')
->willReturn(true);
@@ -226,8 +209,8 @@ class RecoveryTest extends TestCase {
->willReturn(true);
$this->cryptMock->expects($this->once())
- ->method('multiKeyDecrypt')
- ->willReturn(true);
+ ->method('multiKeyDecryptLegacy')
+ ->willReturn('multiKeyDecryptLegacyResult');
$this->fileMock->expects($this->once())
->method('getAccessList')
@@ -244,10 +227,13 @@ class RecoveryTest extends TestCase {
$this->cryptMock->expects($this->once())
- ->method('multiKeyEncrypt');
+ ->method('multiKeyEncrypt')
+ ->willReturn(['admin' => 'shareKey']);
$this->keyManagerMock->expects($this->once())
- ->method('setAllFileKeys');
+ ->method('deleteLegacyFileKey');
+ $this->keyManagerMock->expects($this->once())
+ ->method('setShareKey');
$this->assertNull(self::invokePrivate($this->instance,
'recoverFile',
diff --git a/apps/encryption/tests/SessionTest.php b/apps/encryption/tests/SessionTest.php
index 91c83b80fa9..986502749c8 100644
--- a/apps/encryption/tests/SessionTest.php
+++ b/apps/encryption/tests/SessionTest.php
@@ -1,47 +1,28 @@
<?php
+
+declare(strict_types=1);
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * 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\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();
@@ -50,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());
}
@@ -58,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());
@@ -69,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();
@@ -92,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');
@@ -102,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();
}
@@ -111,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());
@@ -134,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);
@@ -151,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],
@@ -186,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');
@@ -202,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 e4b2933dd3b..8355cdf6729 100644
--- a/apps/encryption/tests/Settings/AdminTest.php
+++ b/apps/encryption/tests/Settings/AdminTest.php
@@ -1,27 +1,10 @@
<?php
+
+declare(strict_types=1);
+
/**
- * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\Encryption\Tests\Settings;
@@ -29,33 +12,29 @@ use OCA\Encryption\Settings\Admin;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\IL10N;
-use OCP\ILogger;
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 ILogger */
- 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();
$this->l = $this->getMockBuilder(IL10N::class)->getMock();
- $this->logger = $this->getMockBuilder(ILogger::class)->getMock();
+ $this->logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
$this->userSession = $this->getMockBuilder(IUserSession::class)->getMock();
$this->config = $this->getMockBuilder(IConfig::class)->getMock();
$this->userManager = $this->getMockBuilder(IUserManager::class)->getMock();
@@ -71,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';
}
@@ -82,7 +61,7 @@ class AdminTest extends TestCase {
return '1';
}
return $default;
- }));
+ });
$params = [
'recoveryEnabled' => '1',
'initStatus' => '0',
@@ -93,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 00888ba8c60..6b2b8b4cad5 100644
--- a/apps/encryption/tests/Users/SetupTest.php
+++ b/apps/encryption/tests/Users/SetupTest.php
@@ -1,48 +1,26 @@
<?php
+
+declare(strict_types=1);
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Julius Härtl <jus@bitgrid.net>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * 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\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();
@@ -60,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');
@@ -68,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);
@@ -90,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 9d5d93809bc..41860a44ffb 100644
--- a/apps/encryption/tests/UtilTest.php
+++ b/apps/encryption/tests/UtilTest.php
@@ -1,29 +1,11 @@
<?php
+
+declare(strict_types=1);
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * 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;
@@ -31,9 +13,8 @@ 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\ILogger;
use OCP\IUser;
use OCP\IUserManager;
use OCP\IUserSession;
@@ -41,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
@@ -71,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);
@@ -85,12 +58,10 @@ 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();
- /** @var \OCP\ILogger $loggerMock */
- $loggerMock = $this->createMock(ILogger::class);
$user = $this->createMock(IUser::class);
$user->expects($this->any())
@@ -116,7 +87,7 @@ class UtilTest extends TestCase {
->method('setUserValue')
->willReturnCallback([$this, 'setValueTester']);
- $this->instance = new Util($this->filesMock, $cryptMock, $loggerMock, $userSessionMock, $this->configMock, $this->userManagerMock);
+ $this->instance = new Util($this->filesMock, $cryptMock, $userSessionMock, $this->configMock, $this->userManagerMock);
}
/**
@@ -144,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,
@@ -157,7 +128,7 @@ class UtilTest extends TestCase {
);
}
- public function dataTestIsMasterKeyEnabled() {
+ public static function dataTestIsMasterKeyEnabled(): array {
return [
['0', false],
['1', true]
@@ -165,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);
@@ -178,7 +149,7 @@ class UtilTest extends TestCase {
$this->instance->shouldEncryptHomeStorage());
}
- public function dataTestShouldEncryptHomeStorage() {
+ public static function dataTestShouldEncryptHomeStorage(): array {
return [
['1', true],
['0', false]
@@ -186,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();