diff --git a/.drone.yml b/.drone.yml
index e4a108825c8..bd06ae13739 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -247,6 +247,9 @@ pipeline:
image: nextcloudci/integration-php7.0:integration-php7.0-4
commands:
- ./occ maintenance:install --admin-pass=admin
+ - ./occ config:system:set redis host --value=cache
+ - ./occ config:system:set redis port --value=6379 --type=integer
+ - ./occ config:system:set redis timeout --value=0 --type=integer
- ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
- ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
- ./occ app:enable testing
@@ -561,12 +564,12 @@ matrix:
- TESTS: integration-transfer-ownership-features
- TESTS: integration-ldap-features
- TESTS: integration-trashbin
- - TESTS: acceptance
- TESTS-ACCEPTANCE: access-levels
- - TESTS: acceptance
- TESTS-ACCEPTANCE: app-files
- - TESTS: acceptance
- TESTS-ACCEPTANCE: login
+# - TESTS: acceptance
+# TESTS-ACCEPTANCE: access-levels
+# - TESTS: acceptance
+# TESTS-ACCEPTANCE: app-files
+# - TESTS: acceptance
+# TESTS-ACCEPTANCE: login
- TESTS: jsunit
- TESTS: syntax-php5.6
- TESTS: syntax-php7.0
@@ -577,13 +580,13 @@ matrix:
- TESTS: caldavtester-new-endpoint
- TESTS: carddavtester-new-endpoint
- TESTS: carddavtester-old-endpoint
- - TESTS: object-store
- OBJECT_STORE: s3
+# - TESTS: object-store
+# OBJECT_STORE: s3
- TESTS: sqlite-php7.0-samba-native
- TESTS: sqlite-php7.0-samba-non-native
- TEST: memcache-memcached
- - TEST: memcache-redis-cluster
- ENABLE_REDIS_CLUSTER: true
+# - TEST: memcache-redis-cluster
+# ENABLE_REDIS_CLUSTER: true
- TESTS: sqlite-php7.0-webdav-apache
ENABLE_REDIS: true
- DB: NODB
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000000..833eba04006
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
+*/Activity/* @nickvergessen
+*/Notifications/* @nickvergessen
diff --git a/.mention-bot b/.mention-bot
deleted file mode 100644
index 1f4e6f911f7..00000000000
--- a/.mention-bot
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "maxReviewers": 3,
- "numFilesToCheck": 5,
- "alwaysNotifyForPaths": [
- {
- "name": "nickvergessen",
- "files": [
- "lib/private/Activity/**",
- "lib/private/Notification/**",
- "lib/public/Activity/**",
- "lib/public/Notification/**"
- ]
- },
- {
- "name": "Xenopathic",
- "files": [
- "apps/files_external/**"
- ]
- }
- ],
- "userBlacklist": [
- "DeepDiver1975",
- "nextcloud-bot",
- "owncloud-bot",
- "PVince81",
- "scrutinizer-auto-fixer",
- "th3fallen",
- "zander",
- "luckydonald",
- "jancborchardt"
- ],
- "createReviewRequest": true,
- "createComment": false
-}
diff --git a/apps/admin_audit/appinfo/app.php b/apps/admin_audit/appinfo/app.php
index 59f7e3987a1..fef5b9ef02b 100644
--- a/apps/admin_audit/appinfo/app.php
+++ b/apps/admin_audit/appinfo/app.php
@@ -23,15 +23,5 @@
*
*/
-$logger = \OC::$server->getLogger();
-$userSession = \OC::$server->getUserSession();
-$groupManager = \OC::$server->getGroupManager();
-$eventDispatcher = \OC::$server->getEventDispatcher();
-
-$auditLogger = new \OCA\Admin_Audit\AuditLogger(
- $logger,
- $userSession,
- $groupManager,
- $eventDispatcher
-);
-$auditLogger->registerHooks();
+$app = new \OCA\AdminAudit\AppInfo\Application();
+$app->register();
diff --git a/apps/admin_audit/appinfo/info.xml b/apps/admin_audit/appinfo/info.xml
index b29b0f0b01d..3b7a7a89570 100644
--- a/apps/admin_audit/appinfo/info.xml
+++ b/apps/admin_audit/appinfo/info.xml
@@ -6,6 +6,7 @@
AGPLNextcloud1.3.0
+ AdminAudit
diff --git a/apps/admin_audit/lib/actions/action.php b/apps/admin_audit/lib/Actions/Action.php
similarity index 98%
rename from apps/admin_audit/lib/actions/action.php
rename to apps/admin_audit/lib/Actions/Action.php
index 2d036675869..d9257b53fd5 100644
--- a/apps/admin_audit/lib/actions/action.php
+++ b/apps/admin_audit/lib/Actions/Action.php
@@ -20,7 +20,8 @@
* along with this program. If not, see .
*
*/
-namespace OCA\Admin_Audit\Actions;
+
+namespace OCA\AdminAudit\Actions;
use OCP\ILogger;
diff --git a/apps/admin_audit/lib/Actions/AppManagement.php b/apps/admin_audit/lib/Actions/AppManagement.php
new file mode 100644
index 00000000000..e12ff2f694e
--- /dev/null
+++ b/apps/admin_audit/lib/Actions/AppManagement.php
@@ -0,0 +1,58 @@
+
+ *
+ * @author Joas Schilling
+ *
+ * @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 .
+ *
+ */
+
+namespace OCA\AdminAudit\Actions;
+
+class AppManagement extends Action {
+
+ /**
+ * @param string $appName
+ */
+ public function enableApp($appName) {
+ $this->log('App "%s" enabled',
+ ['app' => $appName],
+ ['app']
+ );
+ }
+
+ /**
+ * @param string $appName
+ * @param string[] $groups
+ */
+ public function enableAppForGroups($appName, array $groups) {
+ $this->log('App "%s" enabled for groups: %s',
+ ['app' => $appName, 'groups' => implode(', ', $groups)],
+ ['app', 'groups']
+ );
+ }
+
+ /**
+ * @param string $appName
+ */
+ public function disableApp($appName) {
+ $this->log('App "%s" disabled',
+ ['app' => $appName],
+ ['app']
+ );
+ }
+}
diff --git a/apps/admin_audit/lib/actions/auth.php b/apps/admin_audit/lib/Actions/Auth.php
similarity index 94%
rename from apps/admin_audit/lib/actions/auth.php
rename to apps/admin_audit/lib/Actions/Auth.php
index 405ea5e6d22..a6a37409b96 100644
--- a/apps/admin_audit/lib/actions/auth.php
+++ b/apps/admin_audit/lib/Actions/Auth.php
@@ -20,12 +20,13 @@
* along with this program. If not, see .
*
*/
-namespace OCA\Admin_Audit\Actions;
+
+namespace OCA\AdminAudit\Actions;
/**
* Class Auth logs all auth related actions
*
- * @package OCA\Admin_Audit\Actions
+ * @package OCA\AdminAudit\Actions
*/
class Auth extends Action {
public function loginAttempt(array $params) {
diff --git a/apps/admin_audit/lib/Actions/Console.php b/apps/admin_audit/lib/Actions/Console.php
new file mode 100644
index 00000000000..20553ef23d0
--- /dev/null
+++ b/apps/admin_audit/lib/Actions/Console.php
@@ -0,0 +1,45 @@
+
+ *
+ * @author Joas Schilling
+ *
+ * @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 .
+ *
+ */
+
+namespace OCA\AdminAudit\Actions;
+
+
+class Console extends Action {
+ /**
+ * @param $arguments
+ */
+ public function runCommand($arguments) {
+ if ($arguments[1] === '_completion') {
+ // Don't log autocompletion
+ return;
+ }
+
+ // Remove `./occ`
+ array_shift($arguments);
+
+ $this->log('Console command executed: %s',
+ ['arguments' => implode(' ', $arguments)],
+ ['arguments']
+ );
+ }
+}
diff --git a/apps/admin_audit/lib/actions/files.php b/apps/admin_audit/lib/Actions/Files.php
similarity index 97%
rename from apps/admin_audit/lib/actions/files.php
rename to apps/admin_audit/lib/Actions/Files.php
index e8d178e6070..2f8626497cb 100644
--- a/apps/admin_audit/lib/actions/files.php
+++ b/apps/admin_audit/lib/Actions/Files.php
@@ -20,12 +20,13 @@
* along with this program. If not, see .
*
*/
-namespace OCA\Admin_Audit\Actions;
+
+namespace OCA\AdminAudit\Actions;
/**
* Class Files logs the actions to files
*
- * @package OCA\Admin_Audit\Actions
+ * @package OCA\AdminAudit\Actions
*/
class Files extends Action {
/**
diff --git a/apps/admin_audit/lib/actions/groupmanagement.php b/apps/admin_audit/lib/Actions/GroupManagement.php
similarity index 95%
rename from apps/admin_audit/lib/actions/groupmanagement.php
rename to apps/admin_audit/lib/Actions/GroupManagement.php
index 34aec7812c5..07d65ec0687 100644
--- a/apps/admin_audit/lib/actions/groupmanagement.php
+++ b/apps/admin_audit/lib/Actions/GroupManagement.php
@@ -23,18 +23,16 @@
*
*/
+namespace OCA\AdminAudit\Actions;
-namespace OCA\Admin_Audit\Actions;
-
-use OCA\Admin_Audit\Actions\Action;
use OCP\IGroup;
use OCP\IUser;
/**
* Class GroupManagement logs all group manager related events
*
- * @package OCA\Admin_Audit
+ * @package OCA\AdminAudit\Actions
*/
class GroupManagement extends Action {
diff --git a/apps/admin_audit/lib/actions/sharing.php b/apps/admin_audit/lib/Actions/Sharing.php
similarity index 98%
rename from apps/admin_audit/lib/actions/sharing.php
rename to apps/admin_audit/lib/Actions/Sharing.php
index 85afeccd6fc..48e8121f8b0 100644
--- a/apps/admin_audit/lib/actions/sharing.php
+++ b/apps/admin_audit/lib/Actions/Sharing.php
@@ -20,13 +20,16 @@
* along with this program. If not, see .
*
*/
-namespace OCA\Admin_Audit\Actions;
+
+namespace OCA\AdminAudit\Actions;
+
+
use OCP\Share;
/**
* Class Sharing logs the sharing actions
*
- * @package OCA\Admin_Audit\Actions
+ * @package OCA\AdminAudit\Actions
*/
class Sharing extends Action {
/**
diff --git a/apps/admin_audit/lib/actions/trashbin.php b/apps/admin_audit/lib/Actions/Trashbin.php
similarity index 97%
rename from apps/admin_audit/lib/actions/trashbin.php
rename to apps/admin_audit/lib/Actions/Trashbin.php
index b04bd6b8f61..27830345b6c 100644
--- a/apps/admin_audit/lib/actions/trashbin.php
+++ b/apps/admin_audit/lib/Actions/Trashbin.php
@@ -21,8 +21,7 @@
*
*/
-
-namespace OCA\Admin_Audit\Actions;
+namespace OCA\AdminAudit\Actions;
class Trashbin extends Action {
diff --git a/apps/admin_audit/lib/actions/usermanagement.php b/apps/admin_audit/lib/Actions/UserManagement.php
similarity index 96%
rename from apps/admin_audit/lib/actions/usermanagement.php
rename to apps/admin_audit/lib/Actions/UserManagement.php
index 0ee192d9a31..6cb70fad50c 100644
--- a/apps/admin_audit/lib/actions/usermanagement.php
+++ b/apps/admin_audit/lib/Actions/UserManagement.php
@@ -21,13 +21,16 @@
* along with this program. If not, see .
*
*/
-namespace OCA\Admin_Audit\Actions;
+
+namespace OCA\AdminAudit\Actions;
+
+
use OCP\IUser;
/**
* Class UserManagement logs all user management related actions.
*
- * @package OCA\Admin_Audit\Actions
+ * @package OCA\AdminAudit\Actions
*/
class UserManagement extends Action {
/**
diff --git a/apps/admin_audit/lib/actions/versions.php b/apps/admin_audit/lib/Actions/Versions.php
similarity index 97%
rename from apps/admin_audit/lib/actions/versions.php
rename to apps/admin_audit/lib/Actions/Versions.php
index 3e690e12a25..9c8a1c81326 100644
--- a/apps/admin_audit/lib/actions/versions.php
+++ b/apps/admin_audit/lib/Actions/Versions.php
@@ -21,8 +21,7 @@
*
*/
-
-namespace OCA\Admin_Audit\Actions;
+namespace OCA\AdminAudit\Actions;
class Versions extends Action {
diff --git a/apps/admin_audit/lib/AppInfo/Application.php b/apps/admin_audit/lib/AppInfo/Application.php
new file mode 100644
index 00000000000..2748efc56ff
--- /dev/null
+++ b/apps/admin_audit/lib/AppInfo/Application.php
@@ -0,0 +1,218 @@
+
+ *
+ * @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 .
+ *
+ */
+
+namespace OCA\AdminAudit\AppInfo;
+
+use OC\Files\Filesystem;
+use OC\Files\Node\File;
+use OC\Group\Manager;
+use OC\User\Session;
+use OCA\AdminAudit\Actions\AppManagement;
+use OCA\AdminAudit\Actions\Auth;
+use OCA\AdminAudit\Actions\Console;
+use OCA\AdminAudit\Actions\Files;
+use OCA\AdminAudit\Actions\GroupManagement;
+use OCA\AdminAudit\Actions\Sharing;
+use OCA\AdminAudit\Actions\Trashbin;
+use OCA\AdminAudit\Actions\UserManagement;
+use OCA\AdminAudit\Actions\Versions;
+use OCP\App\ManagerEvent;
+use OCP\AppFramework\App;
+use OCP\Console\ConsoleEvent;
+use OCP\IGroupManager;
+use OCP\ILogger;
+use OCP\IPreview;
+use OCP\IUserSession;
+use OCP\Util;
+use Symfony\Component\EventDispatcher\GenericEvent;
+
+class Application extends App {
+
+ public function __construct() {
+ parent::__construct('admin_audit');
+ }
+
+ public function register() {
+ $this->registerHooks();
+ }
+
+ /**
+ * Register hooks in order to log them
+ */
+ protected function registerHooks() {
+ $logger = $this->getContainer()->getServer()->getLogger();
+
+ $this->userManagementHooks($logger);
+ $this->groupHooks($logger);
+ $this->authHooks($logger);
+
+ $this->consoleHooks($logger);
+ $this->appHooks($logger);
+
+ $this->sharingHooks($logger);
+
+ $this->fileHooks($logger);
+ $this->trashbinHooks($logger);
+ $this->versionsHooks($logger);
+ }
+
+ protected function userManagementHooks(ILogger $logger) {
+ $userActions = new UserManagement($logger);
+
+ Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
+ Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
+ Util::connectHook('OC_User', 'changeUser', $userActions, 'change');
+
+ /** @var IUserSession|Session $userSession */
+ $userSession = $this->getContainer()->getServer()->getUserSession();
+ $userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
+ }
+
+ protected function groupHooks(ILogger $logger) {
+ $groupActions = new GroupManagement($logger);
+
+ /** @var IGroupManager|Manager $groupManager */
+ $groupManager = $this->getContainer()->getServer()->getGroupManager();
+ $groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
+ $groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
+ $groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']);
+ $groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']);
+ }
+
+ protected function sharingHooks(ILogger $logger) {
+ $shareActions = new Sharing($logger);
+
+ Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared');
+ Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare');
+ Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions');
+ Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword');
+ Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
+ Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed');
+ }
+
+ protected function authHooks(ILogger $logger) {
+ $authActions = new Auth($logger);
+
+ Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
+ Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
+ Util::connectHook('OC_User', 'logout', $authActions, 'logout');
+ }
+
+ protected function appHooks(ILogger $logger) {
+
+ $eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
+ $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function(ManagerEvent $event) use ($logger) {
+ $appActions = new AppManagement($logger);
+ $appActions->enableApp($event->getAppID());
+ });
+ $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function(ManagerEvent $event) use ($logger) {
+ $appActions = new AppManagement($logger);
+ $appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
+ });
+ $eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function(ManagerEvent $event) use ($logger) {
+ $appActions = new AppManagement($logger);
+ $appActions->disableApp($event->getAppID());
+ });
+
+ }
+
+ protected function consoleHooks(ILogger $logger) {
+ $eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
+ $eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function(ConsoleEvent $event) use ($logger) {
+ $appActions = new Console($logger);
+ $appActions->runCommand($event->getArguments());
+ });
+ }
+
+ protected function fileHooks(ILogger $logger) {
+ $fileActions = new Files($logger);
+ $eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
+ $eventDispatcher->addListener(
+ IPreview::EVENT,
+ function(GenericEvent $event) use ($fileActions) {
+ /** @var File $file */
+ $file = $event->getSubject();
+ $fileActions->preview([
+ 'path' => substr($file->getInternalPath(), 5),
+ 'width' => $event->getArguments()['width'],
+ 'height' => $event->getArguments()['height'],
+ 'crop' => $event->getArguments()['crop'],
+ 'mode' => $event->getArguments()['mode']
+ ]);
+ }
+ );
+
+ Util::connectHook(
+ Filesystem::CLASSNAME,
+ Filesystem::signal_post_rename,
+ $fileActions,
+ 'rename'
+ );
+ Util::connectHook(
+ Filesystem::CLASSNAME,
+ Filesystem::signal_post_create,
+ $fileActions,
+ 'create'
+ );
+ Util::connectHook(
+ Filesystem::CLASSNAME,
+ Filesystem::signal_post_copy,
+ $fileActions,
+ 'copy'
+ );
+ Util::connectHook(
+ Filesystem::CLASSNAME,
+ Filesystem::signal_post_write,
+ $fileActions,
+ 'write'
+ );
+ Util::connectHook(
+ Filesystem::CLASSNAME,
+ Filesystem::signal_post_update,
+ $fileActions,
+ 'update'
+ );
+ Util::connectHook(
+ Filesystem::CLASSNAME,
+ Filesystem::signal_read,
+ $fileActions,
+ 'read'
+ );
+ Util::connectHook(
+ Filesystem::CLASSNAME,
+ Filesystem::signal_delete,
+ $fileActions,
+ 'delete'
+ );
+ }
+
+ protected function versionsHooks(ILogger $logger) {
+ $versionsActions = new Versions($logger);
+ Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
+ Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
+ }
+
+ protected function trashbinHooks(ILogger $logger) {
+ $trashActions = new Trashbin($logger);
+ Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
+ Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
+ }
+}
diff --git a/apps/admin_audit/lib/auditlogger.php b/apps/admin_audit/lib/auditlogger.php
deleted file mode 100644
index 4e1909c6475..00000000000
--- a/apps/admin_audit/lib/auditlogger.php
+++ /dev/null
@@ -1,209 +0,0 @@
-
- * @copyright Copyright (c) 2017 Lukas Reschke
- *
- * @author Bjoern Schiessle
- * @author Lukas Reschke
- * @author Roger Szabo
- *
- * @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 .
- *
- */
-
-namespace OCA\Admin_Audit;
-
-use OC\Files\Filesystem;
-use OC\Files\Node\File;
-use OCA\Admin_Audit\Actions\Auth;
-use OCA\Admin_Audit\Actions\Files;
-use OCA\Admin_Audit\Actions\GroupManagement;
-use OCA\Admin_Audit\Actions\Sharing;
-use OCA\Admin_Audit\Actions\Trashbin;
-use OCA\Admin_Audit\Actions\UserManagement;
-use OCA\Admin_Audit\Actions\Versions;
-use OCP\IGroupManager;
-use OCP\ILogger;
-use OCP\IPreview;
-use OCP\IUserSession;
-use OCP\Util;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
-
-class AuditLogger {
- /** @var ILogger */
- private $logger;
- /** @var IUserSession */
- private $userSession;
- /** @var IGroupManager */
- private $groupManager;
-
- /**
- * AuditLogger constructor.
- *
- * @param ILogger $logger
- * @param IUserSession $userSession
- * @param IGroupManager $groupManager
- * @param EventDispatcherInterface $eventDispatcher
- */
- public function __construct(ILogger $logger,
- IUserSession $userSession,
- IGroupManager $groupManager,
- EventDispatcherInterface $eventDispatcher) {
- $this->logger = $logger;
- $this->userSession = $userSession;
- $this->groupManager = $groupManager;
- $this->eventDispatcher = $eventDispatcher;
- }
-
- /**
- * Register hooks in order to log them
- */
- public function registerHooks() {
- $this->userManagementHooks();
- $this->groupHooks();
- $this->sharingHooks();
- $this->authHooks();
- $this->fileHooks();
- $this->trashbinHooks();
- $this->versionsHooks();
- }
-
- /**
- * Connect to user management hooks
- */
- private function userManagementHooks() {
- $userActions = new UserManagement($this->logger);
-
- Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
- Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
- Util::connectHook('OC_User', 'changeUser', $userActions, 'change');
- $this->userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
- }
-
- private function groupHooks() {
- $groupActions = new GroupManagement($this->logger);
- $this->groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
- $this->groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
- $this->groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']);
- $this->groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']);
- }
-
- /**
- * connect to sharing events
- */
- private function sharingHooks() {
- $shareActions = new Sharing($this->logger);
-
- Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared');
- Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare');
- Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions');
- Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword');
- Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
- Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed');
- }
-
- /**
- * connect to authentication event and related actions
- */
- private function authHooks() {
- $authActions = new Auth($this->logger);
-
- Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
- Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
- Util::connectHook('OC_User', 'logout', $authActions, 'logout');
- }
-
- /**
- * Connect to file hooks
- */
- private function fileHooks() {
- $fileActions = new Files($this->logger);
- $this->eventDispatcher->addListener(
- IPreview::EVENT,
- function(GenericEvent $event) use ($fileActions) {
- /** @var File $file */
- $file = $event->getSubject();
- $fileActions->preview([
- 'path' => substr($file->getInternalPath(), 5),
- 'width' => $event->getArguments()['width'],
- 'height' => $event->getArguments()['height'],
- 'crop' => $event->getArguments()['crop'],
- 'mode' => $event->getArguments()['mode']
- ]);
- }
- );
-
- Util::connectHook(
- Filesystem::CLASSNAME,
- Filesystem::signal_post_rename,
- $fileActions,
- 'rename'
- );
- Util::connectHook(
- Filesystem::CLASSNAME,
- Filesystem::signal_post_create,
- $fileActions,
- 'create'
- );
- Util::connectHook(
- Filesystem::CLASSNAME,
- Filesystem::signal_post_copy,
- $fileActions,
- 'copy'
- );
- Util::connectHook(
- Filesystem::CLASSNAME,
- Filesystem::signal_post_write,
- $fileActions,
- 'write'
- );
- Util::connectHook(
- Filesystem::CLASSNAME,
- Filesystem::signal_post_update,
- $fileActions,
- 'update'
- );
- Util::connectHook(
- Filesystem::CLASSNAME,
- Filesystem::signal_read,
- $fileActions,
- 'read'
- );
- Util::connectHook(
- Filesystem::CLASSNAME,
- Filesystem::signal_delete,
- $fileActions,
- 'delete'
- );
- }
-
- public function versionsHooks() {
- $versionsActions = new Versions($this->logger);
- Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
- Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
- }
-
- /**
- * Connect to trash bin hooks
- */
- private function trashbinHooks() {
- $trashActions = new Trashbin($this->logger);
- Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
- Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
- }
-
-}
diff --git a/apps/comments/img/comments-dark.svg b/apps/comments/img/comments-dark.svg
new file mode 100644
index 00000000000..d331ea7711b
--- /dev/null
+++ b/apps/comments/img/comments-dark.svg
@@ -0,0 +1 @@
+
diff --git a/apps/comments/l10n/es_MX.js b/apps/comments/l10n/es_MX.js
index 627b9e20e7f..e291a497795 100644
--- a/apps/comments/l10n/es_MX.js
+++ b/apps/comments/l10n/es_MX.js
@@ -3,13 +3,13 @@ OC.L10N.register(
{
"Comments" : "Comentarios",
"Unknown user" : "Usuario desconocido",
- "New comment …" : "Nuevo comentario ...",
+ "New comment …" : "Comentario nuevo ...",
"Delete comment" : "Borrar comentario",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"Edit comment" : "Editar comentario",
"[Deleted user]" : "[Usuario borrado]",
- "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicie la conversación!",
+ "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
@@ -18,17 +18,17 @@ OC.L10N.register(
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
- "You commented" : "Usted comentó",
+ "You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
- "You commented on {file}" : "Usted comentó en {file}",
+ "You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"Comments for files" : "Comentarios de los archivos",
- "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado lo mencionó en un commentario en “%s”",
- "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado lo mencionó en un commentario en “{file}”",
- "%1$s mentioned you in a comment on “%2$s”" : "%1$s lo mencionó en un comentario en “%2$s”",
- "{user} mentioned you in a comment on “{file}”" : "{user} lo menciono en un comentario en “{file}”"
+ "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
+ "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/comments/l10n/es_MX.json b/apps/comments/l10n/es_MX.json
index e327496b8c6..1a9e2231489 100644
--- a/apps/comments/l10n/es_MX.json
+++ b/apps/comments/l10n/es_MX.json
@@ -1,13 +1,13 @@
{ "translations": {
"Comments" : "Comentarios",
"Unknown user" : "Usuario desconocido",
- "New comment …" : "Nuevo comentario ...",
+ "New comment …" : "Comentario nuevo ...",
"Delete comment" : "Borrar comentario",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"Edit comment" : "Editar comentario",
"[Deleted user]" : "[Usuario borrado]",
- "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicie la conversación!",
+ "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
@@ -16,17 +16,17 @@
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
- "You commented" : "Usted comentó",
+ "You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
- "You commented on {file}" : "Usted comentó en {file}",
+ "You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"Comments for files" : "Comentarios de los archivos",
- "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado lo mencionó en un commentario en “%s”",
- "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado lo mencionó en un commentario en “{file}”",
- "%1$s mentioned you in a comment on “%2$s”" : "%1$s lo mencionó en un comentario en “%2$s”",
- "{user} mentioned you in a comment on “{file}”" : "{user} lo menciono en un comentario en “{file}”"
+ "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”",
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
+ "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
\ No newline at end of file
diff --git a/apps/comments/l10n/sk.js b/apps/comments/l10n/sk.js
index f0faff23f82..0854a947ea7 100644
--- a/apps/comments/l10n/sk.js
+++ b/apps/comments/l10n/sk.js
@@ -26,6 +26,8 @@ OC.L10N.register(
"%1$s commented on %2$s" : "%1$s komentoval %2$s",
"{author} commented on {file}" : "{author} komentoval {file}",
"Comments for files" : "Komentáre pre súbory",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "Teraz už odstránený používateľ vás spomenul v komentári k \"%s\"",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "Teraz už odstránený používateľ vás spomenul v komentári k \"{file}\"",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vás spomenul v komentári k \"%2$s\"",
"{user} mentioned you in a comment on “{file}”" : "{user} vás spomenul v komentári k “{file}”"
},
diff --git a/apps/comments/l10n/sk.json b/apps/comments/l10n/sk.json
index a20efdd5b30..15df97291c2 100644
--- a/apps/comments/l10n/sk.json
+++ b/apps/comments/l10n/sk.json
@@ -24,6 +24,8 @@
"%1$s commented on %2$s" : "%1$s komentoval %2$s",
"{author} commented on {file}" : "{author} komentoval {file}",
"Comments for files" : "Komentáre pre súbory",
+ "A (now) deleted user mentioned you in a comment on “%s”" : "Teraz už odstránený používateľ vás spomenul v komentári k \"%s\"",
+ "A (now) deleted user mentioned you in a comment on “{file}”" : "Teraz už odstránený používateľ vás spomenul v komentári k \"{file}\"",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vás spomenul v komentári k \"%2$s\"",
"{user} mentioned you in a comment on “{file}”" : "{user} vás spomenul v komentári k “{file}”"
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
diff --git a/apps/comments/l10n/tr.js b/apps/comments/l10n/tr.js
index c8cf529c0b8..acab6a24100 100644
--- a/apps/comments/l10n/tr.js
+++ b/apps/comments/l10n/tr.js
@@ -13,9 +13,9 @@ OC.L10N.register(
"More comments …" : "Diğer yorumlar ...",
"Save" : "Kaydet",
"Allowed characters {count} of {max}" : "Yazılabilecek karakter sayısı {count}/{max}",
- "Error occurred while retrieving comment with id {id}" : "{id} kodlu yorum alınırken bir sorun çıktı",
- "Error occurred while updating comment with id {id}" : "{id} kodlu yorum güncellenirken bir sorun çıktı",
- "Error occurred while posting comment" : "Yorum gönderilirken bir sorun çıktı",
+ "Error occurred while retrieving comment with id {id}" : "{id} kodlu yorum alınırken sorun çıktı",
+ "Error occurred while updating comment with id {id}" : "{id} kodlu yorum güncellenirken sorun çıktı",
+ "Error occurred while posting comment" : "Yorum gönderilirken sorun çıktı",
"_%n unread comment_::_%n unread comments_" : ["%n okunmamış yorum","%n okunmamış yorum"],
"Comment" : "Yorum",
"You commented" : "Yorum yaptınız",
diff --git a/apps/comments/l10n/tr.json b/apps/comments/l10n/tr.json
index 97a2689f410..a39dfc68f8b 100644
--- a/apps/comments/l10n/tr.json
+++ b/apps/comments/l10n/tr.json
@@ -11,9 +11,9 @@
"More comments …" : "Diğer yorumlar ...",
"Save" : "Kaydet",
"Allowed characters {count} of {max}" : "Yazılabilecek karakter sayısı {count}/{max}",
- "Error occurred while retrieving comment with id {id}" : "{id} kodlu yorum alınırken bir sorun çıktı",
- "Error occurred while updating comment with id {id}" : "{id} kodlu yorum güncellenirken bir sorun çıktı",
- "Error occurred while posting comment" : "Yorum gönderilirken bir sorun çıktı",
+ "Error occurred while retrieving comment with id {id}" : "{id} kodlu yorum alınırken sorun çıktı",
+ "Error occurred while updating comment with id {id}" : "{id} kodlu yorum güncellenirken sorun çıktı",
+ "Error occurred while posting comment" : "Yorum gönderilirken sorun çıktı",
"_%n unread comment_::_%n unread comments_" : ["%n okunmamış yorum","%n okunmamış yorum"],
"Comment" : "Yorum",
"You commented" : "Yorum yaptınız",
diff --git a/apps/comments/l10n/zh_TW.js b/apps/comments/l10n/zh_TW.js
index 9c3ac8e1275..e57ae8e7d40 100644
--- a/apps/comments/l10n/zh_TW.js
+++ b/apps/comments/l10n/zh_TW.js
@@ -2,6 +2,7 @@ OC.L10N.register(
"comments",
{
"Comments" : "留言",
+ "Unknown user" : "未知的使用者",
"New comment …" : "新留言…",
"Delete comment" : "刪除留言",
"Post" : "送出",
@@ -17,14 +18,15 @@ OC.L10N.register(
"Error occurred while posting comment" : "張貼留言出錯",
"_%n unread comment_::_%n unread comments_" : ["%n 未讀留言"],
"Comment" : "留言",
- "You commented" : "您已留言",
+ "You commented" : "你已留言",
"%1$s commented" : "%1$s 留言",
+ "{author} commented" : "{author} 已留言",
+ "You commented on %1$s" : "你對 %1$s 留言",
+ "You commented on {file}" : "你對 {file} 留言",
"%1$s commented on %2$s" : "%1$s 在 %2$s 留言",
+ "{author} commented on {file}" : "{author} 對 {file} 留言",
"Comments for files" : "檔案的留言",
- "Type in a new comment..." : "輸入新留言…",
- "No other comments available" : "沒有其他留言",
- "More comments..." : "其他留言…",
- "{count} unread comments" : "{count} 則未讀留言",
- "You commented on %2$s" : "您對 %2$s 留言"
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s 在 “%2$s” 的留言中提到你",
+ "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的留言中提到你"
},
"nplurals=1; plural=0;");
diff --git a/apps/comments/l10n/zh_TW.json b/apps/comments/l10n/zh_TW.json
index cee6d1ff903..b77bcb88fa8 100644
--- a/apps/comments/l10n/zh_TW.json
+++ b/apps/comments/l10n/zh_TW.json
@@ -1,5 +1,6 @@
{ "translations": {
"Comments" : "留言",
+ "Unknown user" : "未知的使用者",
"New comment …" : "新留言…",
"Delete comment" : "刪除留言",
"Post" : "送出",
@@ -15,14 +16,15 @@
"Error occurred while posting comment" : "張貼留言出錯",
"_%n unread comment_::_%n unread comments_" : ["%n 未讀留言"],
"Comment" : "留言",
- "You commented" : "您已留言",
+ "You commented" : "你已留言",
"%1$s commented" : "%1$s 留言",
+ "{author} commented" : "{author} 已留言",
+ "You commented on %1$s" : "你對 %1$s 留言",
+ "You commented on {file}" : "你對 {file} 留言",
"%1$s commented on %2$s" : "%1$s 在 %2$s 留言",
+ "{author} commented on {file}" : "{author} 對 {file} 留言",
"Comments for files" : "檔案的留言",
- "Type in a new comment..." : "輸入新留言…",
- "No other comments available" : "沒有其他留言",
- "More comments..." : "其他留言…",
- "{count} unread comments" : "{count} 則未讀留言",
- "You commented on %2$s" : "您對 %2$s 留言"
+ "%1$s mentioned you in a comment on “%2$s”" : "%1$s 在 “%2$s” 的留言中提到你",
+ "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的留言中提到你"
},"pluralForm" :"nplurals=1; plural=0;"
}
\ No newline at end of file
diff --git a/apps/comments/lib/Activity/Provider.php b/apps/comments/lib/Activity/Provider.php
index c55982827b3..7bf686e796e 100644
--- a/apps/comments/lib/Activity/Provider.php
+++ b/apps/comments/lib/Activity/Provider.php
@@ -87,7 +87,11 @@ class Provider implements IProvider {
if ($event->getSubject() === 'add_comment_subject') {
$this->parseMessage($event);
- $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')));
+ if ($this->activityManager->getRequirePNG()) {
+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.png')));
+ } else {
+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')));
+ }
if ($this->activityManager->isFormattingFilteredObject()) {
try {
diff --git a/apps/dav/l10n/es_MX.js b/apps/dav/l10n/es_MX.js
index e55ba031d13..92e79388cbd 100644
--- a/apps/dav/l10n/es_MX.js
+++ b/apps/dav/l10n/es_MX.js
@@ -4,38 +4,38 @@ OC.L10N.register(
"Calendar" : "Calendario",
"Todos" : "Pendientes",
"{actor} created calendar {calendar}" : "{actor} creó el calendario {calendar}",
- "You created calendar {calendar}" : "Usted creó el calendario {calendar}",
+ "You created calendar {calendar}" : "Creaste el calendario {calendar}",
"{actor} deleted calendar {calendar}" : "{actor} borró el calendario {calendar}",
- "You deleted calendar {calendar}" : "Usted borró el calendario {calendar}",
+ "You deleted calendar {calendar}" : "Borraste el calendario {calendar}",
"{actor} updated calendar {calendar}" : "{actor} actualizó el calendario {calendar}",
- "You updated calendar {calendar}" : "Usted actualizó el calendario {calendar}",
- "{actor} shared calendar {calendar} with you" : "{actor} ha compartido el calendario {calendar} con usted",
- "You shared calendar {calendar} with {user}" : "Usted ha compartido el calendario {calendar} con {user}",
+ "You updated calendar {calendar}" : "Actualizaste el calendario {calendar}",
+ "{actor} shared calendar {calendar} with you" : "{actor} ha compartido el calendario {calendar} contigo",
+ "You shared calendar {calendar} with {user}" : "Compartiste el calendario {calendar} con {user}",
"{actor} shared calendar {calendar} with {user}" : "{actor} compartió el calendario {calendar} con {user}",
- "{actor} unshared calendar {calendar} from you" : "{actor} ha dejado de compartir el calendario {calendar} con usted",
- "You unshared calendar {calendar} from {user}" : "Usted ha dejado de compartir el calendario {calendar} con {user}",
+ "{actor} unshared calendar {calendar} from you" : "{actor} ha dejado de compartir el calendario {calendar} contigo",
+ "You unshared calendar {calendar} from {user}" : "Has dejado de compartir el calendario {calendar} con {user}",
"{actor} unshared calendar {calendar} from {user}" : "{actor} dejó de compartir el calendario {calendar} con {user}",
"{actor} unshared calendar {calendar} from themselves" : "{actor} dejó de compartir {el calendario calendar} con él mismo",
- "You shared calendar {calendar} with group {group}" : "Usted ha compartido el calendario {calendar} con el grupo {group}",
+ "You shared calendar {calendar} with group {group}" : "Compartiste el calendario {calendar} con el grupo {group}",
"{actor} shared calendar {calendar} with group {group}" : "{actor} compartió el calendario {calendar} con el grupo {group}",
- "You unshared calendar {calendar} from group {group}" : "Usted ha dejado de compartir el calendario {calendar} con el grupo {group}",
+ "You unshared calendar {calendar} from group {group}" : "Dejaste de compartir el calendario {calendar} con el grupo {group}",
"{actor} unshared calendar {calendar} from group {group}" : "{actor} dejó de compartir el calendrio {calendar} con el grupo {group}",
"{actor} created event {event} in calendar {calendar}" : "{actor} creó el evento {event} en el calendario {calendar}",
- "You created event {event} in calendar {calendar}" : "Usted creó el evento {event} en el calendario {calendar}",
+ "You created event {event} in calendar {calendar}" : "Creaste el evento {event} en el calendario {calendar}",
"{actor} deleted event {event} from calendar {calendar}" : "{actor} borró el eventó {event} del calendario {calendar}",
- "You deleted event {event} from calendar {calendar}" : "Usted borró el evento {event} del calendario {calendar}",
+ "You deleted event {event} from calendar {calendar}" : "Borraste el evento {event} del calendario {calendar}",
"{actor} updated event {event} in calendar {calendar}" : "{actor} actualizó el evento {event} en el calendario {calendar}",
- "You updated event {event} in calendar {calendar}" : "Usted actualizó el evento {event} en el calendario {calendar}",
+ "You updated event {event} in calendar {calendar}" : "Actualizaste el evento {event} en el calendario {calendar}",
"{actor} created todo {todo} in list {calendar}" : "{actor} creó el pendiente {todo} en la lista {calendar}",
- "You created todo {todo} in list {calendar}" : "Usted creo el pendiente {todo} en la lista {calendar}",
+ "You created todo {todo} in list {calendar}" : "Creaste el pendiente {todo} en la lista {calendar}",
"{actor} deleted todo {todo} from list {calendar}" : "{actor} borró el pendiente {todo} de la lista {calendar}",
- "You deleted todo {todo} from list {calendar}" : "Usted borró el pendiente {todo} de la lista {calendar}",
+ "You deleted todo {todo} from list {calendar}" : "Borraste el pendiente {todo} de la lista {calendar}",
"{actor} updated todo {todo} in list {calendar}" : "{actor} actualizó el pendiente {todo} de la lista {calendar}",
- "You updated todo {todo} in list {calendar}" : "Usted actualizó el pendiente {todo} de la lista {calendar}",
+ "You updated todo {todo} in list {calendar}" : "Actualizaste el pendiente {todo} de la lista {calendar}",
"{actor} solved todo {todo} in list {calendar}" : "{actor} resolvió el pendiente {todo} de la lista {calendar}",
- "You solved todo {todo} in list {calendar}" : "Usted resolvió el pendiente {todo} de la lista {calendar}",
+ "You solved todo {todo} in list {calendar}" : "Resolviste el pendiente {todo} de la lista {calendar}",
"{actor} reopened todo {todo} in list {calendar}" : "{actor} reabrió el pendiente {todo} de la lista{calendar}",
- "You reopened todo {todo} in list {calendar}" : "Usted reabrió el pendiente {todo} de la lista {calendar}",
+ "You reopened todo {todo} in list {calendar}" : "Reabriste el pendiente {todo} de la lista {calendar}",
"A calendar was modified" : "Un calendario fue modificado",
"A calendar event was modified" : "Un evento de un calendario fue modificado",
"A calendar todo was modified" : "Un pendiente de un calendario fue modificado",
diff --git a/apps/dav/l10n/es_MX.json b/apps/dav/l10n/es_MX.json
index 1cec1017fd6..ef132c50184 100644
--- a/apps/dav/l10n/es_MX.json
+++ b/apps/dav/l10n/es_MX.json
@@ -2,38 +2,38 @@
"Calendar" : "Calendario",
"Todos" : "Pendientes",
"{actor} created calendar {calendar}" : "{actor} creó el calendario {calendar}",
- "You created calendar {calendar}" : "Usted creó el calendario {calendar}",
+ "You created calendar {calendar}" : "Creaste el calendario {calendar}",
"{actor} deleted calendar {calendar}" : "{actor} borró el calendario {calendar}",
- "You deleted calendar {calendar}" : "Usted borró el calendario {calendar}",
+ "You deleted calendar {calendar}" : "Borraste el calendario {calendar}",
"{actor} updated calendar {calendar}" : "{actor} actualizó el calendario {calendar}",
- "You updated calendar {calendar}" : "Usted actualizó el calendario {calendar}",
- "{actor} shared calendar {calendar} with you" : "{actor} ha compartido el calendario {calendar} con usted",
- "You shared calendar {calendar} with {user}" : "Usted ha compartido el calendario {calendar} con {user}",
+ "You updated calendar {calendar}" : "Actualizaste el calendario {calendar}",
+ "{actor} shared calendar {calendar} with you" : "{actor} ha compartido el calendario {calendar} contigo",
+ "You shared calendar {calendar} with {user}" : "Compartiste el calendario {calendar} con {user}",
"{actor} shared calendar {calendar} with {user}" : "{actor} compartió el calendario {calendar} con {user}",
- "{actor} unshared calendar {calendar} from you" : "{actor} ha dejado de compartir el calendario {calendar} con usted",
- "You unshared calendar {calendar} from {user}" : "Usted ha dejado de compartir el calendario {calendar} con {user}",
+ "{actor} unshared calendar {calendar} from you" : "{actor} ha dejado de compartir el calendario {calendar} contigo",
+ "You unshared calendar {calendar} from {user}" : "Has dejado de compartir el calendario {calendar} con {user}",
"{actor} unshared calendar {calendar} from {user}" : "{actor} dejó de compartir el calendario {calendar} con {user}",
"{actor} unshared calendar {calendar} from themselves" : "{actor} dejó de compartir {el calendario calendar} con él mismo",
- "You shared calendar {calendar} with group {group}" : "Usted ha compartido el calendario {calendar} con el grupo {group}",
+ "You shared calendar {calendar} with group {group}" : "Compartiste el calendario {calendar} con el grupo {group}",
"{actor} shared calendar {calendar} with group {group}" : "{actor} compartió el calendario {calendar} con el grupo {group}",
- "You unshared calendar {calendar} from group {group}" : "Usted ha dejado de compartir el calendario {calendar} con el grupo {group}",
+ "You unshared calendar {calendar} from group {group}" : "Dejaste de compartir el calendario {calendar} con el grupo {group}",
"{actor} unshared calendar {calendar} from group {group}" : "{actor} dejó de compartir el calendrio {calendar} con el grupo {group}",
"{actor} created event {event} in calendar {calendar}" : "{actor} creó el evento {event} en el calendario {calendar}",
- "You created event {event} in calendar {calendar}" : "Usted creó el evento {event} en el calendario {calendar}",
+ "You created event {event} in calendar {calendar}" : "Creaste el evento {event} en el calendario {calendar}",
"{actor} deleted event {event} from calendar {calendar}" : "{actor} borró el eventó {event} del calendario {calendar}",
- "You deleted event {event} from calendar {calendar}" : "Usted borró el evento {event} del calendario {calendar}",
+ "You deleted event {event} from calendar {calendar}" : "Borraste el evento {event} del calendario {calendar}",
"{actor} updated event {event} in calendar {calendar}" : "{actor} actualizó el evento {event} en el calendario {calendar}",
- "You updated event {event} in calendar {calendar}" : "Usted actualizó el evento {event} en el calendario {calendar}",
+ "You updated event {event} in calendar {calendar}" : "Actualizaste el evento {event} en el calendario {calendar}",
"{actor} created todo {todo} in list {calendar}" : "{actor} creó el pendiente {todo} en la lista {calendar}",
- "You created todo {todo} in list {calendar}" : "Usted creo el pendiente {todo} en la lista {calendar}",
+ "You created todo {todo} in list {calendar}" : "Creaste el pendiente {todo} en la lista {calendar}",
"{actor} deleted todo {todo} from list {calendar}" : "{actor} borró el pendiente {todo} de la lista {calendar}",
- "You deleted todo {todo} from list {calendar}" : "Usted borró el pendiente {todo} de la lista {calendar}",
+ "You deleted todo {todo} from list {calendar}" : "Borraste el pendiente {todo} de la lista {calendar}",
"{actor} updated todo {todo} in list {calendar}" : "{actor} actualizó el pendiente {todo} de la lista {calendar}",
- "You updated todo {todo} in list {calendar}" : "Usted actualizó el pendiente {todo} de la lista {calendar}",
+ "You updated todo {todo} in list {calendar}" : "Actualizaste el pendiente {todo} de la lista {calendar}",
"{actor} solved todo {todo} in list {calendar}" : "{actor} resolvió el pendiente {todo} de la lista {calendar}",
- "You solved todo {todo} in list {calendar}" : "Usted resolvió el pendiente {todo} de la lista {calendar}",
+ "You solved todo {todo} in list {calendar}" : "Resolviste el pendiente {todo} de la lista {calendar}",
"{actor} reopened todo {todo} in list {calendar}" : "{actor} reabrió el pendiente {todo} de la lista{calendar}",
- "You reopened todo {todo} in list {calendar}" : "Usted reabrió el pendiente {todo} de la lista {calendar}",
+ "You reopened todo {todo} in list {calendar}" : "Reabriste el pendiente {todo} de la lista {calendar}",
"A calendar was modified" : "Un calendario fue modificado",
"A calendar event was modified" : "Un evento de un calendario fue modificado",
"A calendar todo was modified" : "Un pendiente de un calendario fue modificado",
diff --git a/apps/dav/l10n/zh_CN.js b/apps/dav/l10n/zh_CN.js
index 9239d47ab5c..ac32f11251d 100644
--- a/apps/dav/l10n/zh_CN.js
+++ b/apps/dav/l10n/zh_CN.js
@@ -9,7 +9,7 @@ OC.L10N.register(
"You deleted calendar {calendar}" : "您删除的日历 {calendar}",
"{actor} updated calendar {calendar}" : "{actor} 更新了日历 {calendar}",
"You updated calendar {calendar}" : "您更新了日历 {calendar}",
- "{actor} shared calendar {calendar} with you" : "{actor} 分享给您的日历 {calendar}",
+ "{actor} shared calendar {calendar} with you" : "{actor} 收到的日历分享 {calendar}",
"You shared calendar {calendar} with {user}" : "您与 {user} 分享了日历 {calendar}",
"{actor} shared calendar {calendar} with {user}" : "{actor} 与 {user} 分享了日历 {calendar}",
"{actor} unshared calendar {calendar} from you" : "{actor} 取消分享 {calendar} 给您",
diff --git a/apps/dav/l10n/zh_CN.json b/apps/dav/l10n/zh_CN.json
index 10be90a6128..2e494d456a4 100644
--- a/apps/dav/l10n/zh_CN.json
+++ b/apps/dav/l10n/zh_CN.json
@@ -7,7 +7,7 @@
"You deleted calendar {calendar}" : "您删除的日历 {calendar}",
"{actor} updated calendar {calendar}" : "{actor} 更新了日历 {calendar}",
"You updated calendar {calendar}" : "您更新了日历 {calendar}",
- "{actor} shared calendar {calendar} with you" : "{actor} 分享给您的日历 {calendar}",
+ "{actor} shared calendar {calendar} with you" : "{actor} 收到的日历分享 {calendar}",
"You shared calendar {calendar} with {user}" : "您与 {user} 分享了日历 {calendar}",
"{actor} shared calendar {calendar} with {user}" : "{actor} 与 {user} 分享了日历 {calendar}",
"{actor} unshared calendar {calendar} from you" : "{actor} 取消分享 {calendar} 给您",
diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php b/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php
index d7730da61f4..6082e68dcd2 100644
--- a/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php
+++ b/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php
@@ -84,7 +84,11 @@ class Calendar extends Base {
$this->l = $this->languageFactory->get('dav', $language);
- $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
+ if ($this->activityManager->getRequirePNG()) {
+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
+ } else {
+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
+ }
if ($event->getSubject() === self::SUBJECT_ADD) {
$subject = $this->l->t('{actor} created calendar {calendar}');
diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Event.php b/apps/dav/lib/CalDAV/Activity/Provider/Event.php
index daaace6b5be..b591eaa351c 100644
--- a/apps/dav/lib/CalDAV/Activity/Provider/Event.php
+++ b/apps/dav/lib/CalDAV/Activity/Provider/Event.php
@@ -80,7 +80,11 @@ class Event extends Base {
$this->l = $this->languageFactory->get('dav', $language);
- $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
+ if ($this->activityManager->getRequirePNG()) {
+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
+ } else {
+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
+ }
if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Todo.php b/apps/dav/lib/CalDAV/Activity/Provider/Todo.php
index 747b39ddb7f..0ad1d137455 100644
--- a/apps/dav/lib/CalDAV/Activity/Provider/Todo.php
+++ b/apps/dav/lib/CalDAV/Activity/Provider/Todo.php
@@ -40,7 +40,11 @@ class Todo extends Event {
$this->l = $this->languageFactory->get('dav', $language);
- $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
+ if ($this->activityManager->getRequirePNG()) {
+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.png')));
+ } else {
+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
+ }
if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') {
$subject = $this->l->t('{actor} created todo {todo} in list {calendar}');
diff --git a/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php b/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
index 4f7c2286827..dce2f9c45e4 100644
--- a/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
@@ -94,26 +94,9 @@ class ExceptionLoggerPlugin extends \Sabre\DAV\ServerPlugin {
$level = \OCP\Util::DEBUG;
}
- $message = $ex->getMessage();
- if ($ex instanceof Exception) {
- if (empty($message)) {
- $response = new Response($ex->getHTTPCode());
- $message = $response->getStatusText();
- }
- $message = "HTTP/1.1 {$ex->getHTTPCode()} $message";
- }
-
- $user = \OC_User::getUser();
-
- $exception = [
- 'Message' => $message,
- 'Exception' => $exceptionClass,
- 'Code' => $ex->getCode(),
- 'Trace' => $ex->getTraceAsString(),
- 'File' => $ex->getFile(),
- 'Line' => $ex->getLine(),
- 'User' => $user,
- ];
- $this->logger->log($level, 'Exception: ' . json_encode($exception), ['app' => $this->appName]);
+ $this->logger->logException($ex, [
+ 'app' => $this->appName,
+ 'level' => $level,
+ ]);
}
}
diff --git a/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php
index 8088ee6dc4d..85ede2ad681 100644
--- a/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php
@@ -71,13 +71,13 @@ class ExceptionLoggerPluginTest extends TestCase {
$this->plugin->logException($exception);
$this->assertEquals($expectedLogLevel, $this->logger->level);
- $this->assertStringStartsWith('Exception: {"Message":"' . $expectedMessage, $this->logger->message);
+ $this->assertStringStartsWith('Exception: {"Exception":' . json_encode(get_class($exception)) . ',"Message":"' . $expectedMessage . '",', $this->logger->message);
}
public function providesExceptions() {
return [
- [0, 'HTTP\/1.1 404 Not Found', new NotFound()],
- [4, 'HTTP\/1.1 400 This path leads to nowhere', new InvalidPath('This path leads to nowhere')]
+ [0, '', new NotFound()],
+ [4, 'This path leads to nowhere', new InvalidPath('This path leads to nowhere')]
];
}
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionMasterKeyUploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionMasterKeyUploadTest.php
new file mode 100644
index 00000000000..480baab6baf
--- /dev/null
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionMasterKeyUploadTest.php
@@ -0,0 +1,50 @@
+
+ * @author Robin Appelman
+ * @author Thomas Müller
+ *
+ * @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
+ *
+ */
+
+namespace OCA\DAV\Tests\unit\Connector\Sabre\RequestTest;
+
+use OC\Files\View;
+use Test\Traits\EncryptionTrait;
+
+/**
+ * Class EncryptionMasterKeyUploadTest
+ *
+ * @group DB
+ *
+ * @package OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest
+ */
+class EncryptionMasterKeyUploadTest extends UploadTest {
+ use EncryptionTrait;
+
+ protected function setupUser($name, $password) {
+ $this->createUser($name, $password);
+ $tmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+ $this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
+ // we use the master key
+ \OC::$server->getConfig()->setAppValue('encryption', 'useMasterKey', '1');
+ $this->setupForUser($name, $password);
+ $this->loginWithEncryption($name);
+ return new View('/' . $name . '/files');
+ }
+}
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php
index e65d58b816f..c0cba121386 100644
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php
@@ -41,6 +41,8 @@ class EncryptionUploadTest extends UploadTest {
$this->createUser($name, $password);
$tmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
$this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
+ // we use per-user keys
+ \OC::$server->getConfig()->setAppValue('encryption', 'useMasterKey', '0');
$this->setupForUser($name, $password);
$this->loginWithEncryption($name);
return new View('/' . $name . '/files');
diff --git a/apps/encryption/appinfo/app.php b/apps/encryption/appinfo/app.php
index 22c35f87913..4f54f0e7251 100644
--- a/apps/encryption/appinfo/app.php
+++ b/apps/encryption/appinfo/app.php
@@ -31,5 +31,5 @@ $app = new Application([], $encryptionSystemReady);
if ($encryptionSystemReady) {
$app->registerEncryptionModule();
$app->registerHooks();
- $app->registerSettings();
+ $app->setUp();
}
diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml
index 36b6774c6ec..f35a87aa4f2 100644
--- a/apps/encryption/appinfo/info.xml
+++ b/apps/encryption/appinfo/info.xml
@@ -19,7 +19,7 @@
user-encryptionadmin-encryption
- 1.7.0
+ 2.0.0
@@ -29,9 +29,17 @@
OCA\Encryption\Settings\Admin
+ OCA\Encryption\Settings\PersonalOCA\Encryption\Command\EnableMasterKey
+ OCA\Encryption\Command\DisableMasterKeyOCA\Encryption\Command\MigrateKeys
+
+
+
+ OCA\Encryption\Migration\SetMasterKeyStatus
+
+
diff --git a/apps/encryption/l10n/cs.js b/apps/encryption/l10n/cs.js
index caf843803a0..f54efc4af7c 100644
--- a/apps/encryption/l10n/cs.js
+++ b/apps/encryption/l10n/cs.js
@@ -24,6 +24,7 @@ OC.L10N.register(
"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" : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Spusťte příkaz 'occ encryption:migrate' nebo kontaktujte svého administrátora.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče v osobním nastavení, abyste znovu získali přístup ke svým zašifrovaným souborům.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Chcete-li používat šifrovací modul, povolte prosím šifrování na straně serveru v nastavení administrátora.",
"Encryption app is enabled and ready" : "Aplikace šifrování je již povolena a připravena",
"Bad Signature" : "Špatný podpis",
"Missing Signature" : "Chybějící podpis",
diff --git a/apps/encryption/l10n/cs.json b/apps/encryption/l10n/cs.json
index 923847a9773..6c7bc0de484 100644
--- a/apps/encryption/l10n/cs.json
+++ b/apps/encryption/l10n/cs.json
@@ -22,6 +22,7 @@
"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" : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Spusťte příkaz 'occ encryption:migrate' nebo kontaktujte svého administrátora.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče v osobním nastavení, abyste znovu získali přístup ke svým zašifrovaným souborům.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Chcete-li používat šifrovací modul, povolte prosím šifrování na straně serveru v nastavení administrátora.",
"Encryption app is enabled and ready" : "Aplikace šifrování je již povolena a připravena",
"Bad Signature" : "Špatný podpis",
"Missing Signature" : "Chybějící podpis",
diff --git a/apps/encryption/l10n/da.js b/apps/encryption/l10n/da.js
index af3a850ea41..37d7c293653 100644
--- a/apps/encryption/l10n/da.js
+++ b/apps/encryption/l10n/da.js
@@ -24,6 +24,7 @@ OC.L10N.register(
"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" : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen. Kør venligst \"occ encryption:migrate\" eller kontakt din administrator.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle til Krypteringsprogrammet. Venligst opdater din kode til privat nøgle i dine personlige indstillinger for at gendanne adgang til dine krypterede filer.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Krypteringsprogrammet er aktiveret, men dine nøgler er ikke indlæst. Log venligst ud og ind igen.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Venligst aktiver Server kryptering under administrationen hvis du vil anvende krypterings modulet.",
"Encryption app is enabled and ready" : "Krypteringsprogrammet er aktiveret og klar",
"Bad Signature" : "Ugyldig signatur",
"Missing Signature" : "Signatur mangler",
@@ -31,10 +32,10 @@ OC.L10N.register(
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
"Can not 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 fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig på ny.",
"Default encryption module" : "Standard krypterings modul",
- "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" : "Hejsa,\n\nadministrator aktiveret kryptering på serverdelen. '%s'.\n\nVenligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.\n\n",
+ "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" : "Hej,\n\nAdministrator aktiveret kryptering på serverdelen. '%s'.\n\nVenligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.\n\n",
"The share will expire on %s." : "Delingen vil udløbe om %s.",
"Cheers!" : "Hej!",
- "Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hejsa,
administrator aktiveret kryptering på serverdelen. Dine file er blevet krypteret med kodeordet %s.
Venligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.
",
+ "Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hej,
administrator aktiveret kryptering på serverdelen. Dine file er blevet krypteret med kodeordet %s.
Venligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.
",
"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",
diff --git a/apps/encryption/l10n/da.json b/apps/encryption/l10n/da.json
index 437e407509f..4b368d5307a 100644
--- a/apps/encryption/l10n/da.json
+++ b/apps/encryption/l10n/da.json
@@ -22,6 +22,7 @@
"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" : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen. Kør venligst \"occ encryption:migrate\" eller kontakt din administrator.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle til Krypteringsprogrammet. Venligst opdater din kode til privat nøgle i dine personlige indstillinger for at gendanne adgang til dine krypterede filer.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Krypteringsprogrammet er aktiveret, men dine nøgler er ikke indlæst. Log venligst ud og ind igen.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Venligst aktiver Server kryptering under administrationen hvis du vil anvende krypterings modulet.",
"Encryption app is enabled and ready" : "Krypteringsprogrammet er aktiveret og klar",
"Bad Signature" : "Ugyldig signatur",
"Missing Signature" : "Signatur mangler",
@@ -29,10 +30,10 @@
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
"Can not 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 fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig på ny.",
"Default encryption module" : "Standard krypterings modul",
- "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" : "Hejsa,\n\nadministrator aktiveret kryptering på serverdelen. '%s'.\n\nVenligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.\n\n",
+ "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" : "Hej,\n\nAdministrator aktiveret kryptering på serverdelen. '%s'.\n\nVenligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.\n\n",
"The share will expire on %s." : "Delingen vil udløbe om %s.",
"Cheers!" : "Hej!",
- "Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hejsa,
administrator aktiveret kryptering på serverdelen. Dine file er blevet krypteret med kodeordet %s.
Venligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.
",
+ "Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hej,
administrator aktiveret kryptering på serverdelen. Dine file er blevet krypteret med kodeordet %s.
Venligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.
",
"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",
diff --git a/apps/encryption/l10n/de.js b/apps/encryption/l10n/de.js
index b627af5f3ee..d241c5e0fdd 100644
--- a/apps/encryption/l10n/de.js
+++ b/apps/encryption/l10n/de.js
@@ -5,58 +5,59 @@ OC.L10N.register(
"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",
- "Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
+ "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. Überprüfe Dein Wiederherstellungspasswort!",
+ "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!",
"Missing parameters" : "Fehlende Parameter",
- "Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+ "Please provide the old recovery password" : "Bitte das alte Wiederherstellungspasswort eingeben",
"Please provide a new recovery password" : "Bitte ein neues Wiederherstellungspasswort eingeben",
"Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
- "Password successfully changed." : "Dein Passwort wurde geändert.",
+ "Password successfully changed." : "Das Passwort wurde geändert.",
"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 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 nicht korrekt, bitte versuche es noch einmal.",
+ "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." : "Passwort des privaten Schlüssels erfolgreich aktualisiert",
- "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" : "Verschlüsselungsschlüssel müssen von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migriert werden. Bitte 'occ encryption:migrate' ausführen oder Ihren Administrator kontaktieren.",
+ "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
+ "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" : "Verschlüsselungsschlüssel müssen von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migriert werden. Bitte 'occ encryption:migrate' ausführen oder Deinen Administrator kontaktieren.",
"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 Administrator-Einstellungen 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",
- "Can not 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 freigegebene Datei. Bitte den Eigentümer der Datei kontaktieren, um die Datei erneut freizugeben.",
+ "Can not 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.",
"Can not 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" : "Standard-Verschlüsselungsmodul",
"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" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte über die Web-Oberfläche anmelden und die persönlichen Einstellungen aufrufen. Dort findet sich die Option 'Basisverschlüsselungsmodul' und das Verschlüsselungspasswort kann aktualisiert werden, indem das Passwort in das Feld 'altes Anmelde-Passwort' und in das 'aktuelles Anmelde-Passwort'-Feld eingegeben wird.\n\n",
"The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
"Cheers!" : "Noch einen schönen Tag!",
"Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hallo,
der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort %s verschlüsselt.
Bitte melde dich im Web-Interface 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.
",
- "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.",
- "Encrypt the home storage" : "Verschlüssle den Speicher",
+ "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",
+ "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 oder ihr Passwort vergessen hat.",
- "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
+ "The recovery key is an extra 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.",
+ "Recovery key password" : "Passwort für den Wiederherstellungsschlüsse",
"Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
- "Change recovery key password:" : "Wiederherstellungsschlüssel-Passwort ändern:",
+ "Change recovery key password:" : "Passwort für den Wiederherstellungsschlüssel ändern:",
"Old recovery key password" : "Altes Passwort für den Wiederherstellungsschlüssel",
"New recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel",
"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." : "Dein Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Anmelde-Passwort überein.",
- "Set your old private key password to your current log-in password:" : "Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Anmeldepasswort einstellen:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.",
+ "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.",
+ "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.",
"Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Passwort",
- "Update Private Key Password" : "Passwort für den privaten Schlüssel aktualisieren",
- "Enable password recovery:" : "Passwortwiederherstellung aktivieren:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst",
+ "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
+ "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option hast Du die Möglichkeit, wieder auf Deine verschlüsselten Dateien zugreifen zu können, wenn Du Dein Passwort verloren hast.",
"Enabled" : "Aktiviert",
"Disabled" : "Deaktiviert",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselungs-App ist aktiviert, aber deine Schlüssel sind nicht initialisiert. Bitte erneut ab- und wieder anmelden."
diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json
index f83b4abfd13..20a0662bcb7 100644
--- a/apps/encryption/l10n/de.json
+++ b/apps/encryption/l10n/de.json
@@ -3,58 +3,59 @@
"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",
- "Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
+ "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. Überprüfe Dein Wiederherstellungspasswort!",
+ "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!",
"Missing parameters" : "Fehlende Parameter",
- "Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+ "Please provide the old recovery password" : "Bitte das alte Wiederherstellungspasswort eingeben",
"Please provide a new recovery password" : "Bitte ein neues Wiederherstellungspasswort eingeben",
"Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
- "Password successfully changed." : "Dein Passwort wurde geändert.",
+ "Password successfully changed." : "Das Passwort wurde geändert.",
"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 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 nicht korrekt, bitte versuche es noch einmal.",
+ "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." : "Passwort des privaten Schlüssels erfolgreich aktualisiert",
- "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" : "Verschlüsselungsschlüssel müssen von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migriert werden. Bitte 'occ encryption:migrate' ausführen oder Ihren Administrator kontaktieren.",
+ "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
+ "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" : "Verschlüsselungsschlüssel müssen von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migriert werden. Bitte 'occ encryption:migrate' ausführen oder Deinen Administrator kontaktieren.",
"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 Administrator-Einstellungen 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",
- "Can not 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 freigegebene Datei. Bitte den Eigentümer der Datei kontaktieren, um die Datei erneut freizugeben.",
+ "Can not 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.",
"Can not 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" : "Standard-Verschlüsselungsmodul",
"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" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte über die Web-Oberfläche anmelden und die persönlichen Einstellungen aufrufen. Dort findet sich die Option 'Basisverschlüsselungsmodul' und das Verschlüsselungspasswort kann aktualisiert werden, indem das Passwort in das Feld 'altes Anmelde-Passwort' und in das 'aktuelles Anmelde-Passwort'-Feld eingegeben wird.\n\n",
"The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
"Cheers!" : "Noch einen schönen Tag!",
"Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hallo,
der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort %s verschlüsselt.
Bitte melde dich im Web-Interface 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.
",
- "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.",
- "Encrypt the home storage" : "Verschlüssle den Speicher",
+ "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",
+ "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 oder ihr Passwort vergessen hat.",
- "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
+ "The recovery key is an extra 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.",
+ "Recovery key password" : "Passwort für den Wiederherstellungsschlüsse",
"Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
- "Change recovery key password:" : "Wiederherstellungsschlüssel-Passwort ändern:",
+ "Change recovery key password:" : "Passwort für den Wiederherstellungsschlüssel ändern:",
"Old recovery key password" : "Altes Passwort für den Wiederherstellungsschlüssel",
"New recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel",
"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." : "Dein Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Anmelde-Passwort überein.",
- "Set your old private key password to your current log-in password:" : "Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Anmeldepasswort einstellen:",
- " If you don't remember your old password you can ask your administrator to recover your files." : "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.",
+ "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.",
+ "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.",
"Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Passwort",
- "Update Private Key Password" : "Passwort für den privaten Schlüssel aktualisieren",
- "Enable password recovery:" : "Passwortwiederherstellung aktivieren:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst",
+ "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
+ "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option hast Du die Möglichkeit, wieder auf Deine verschlüsselten Dateien zugreifen zu können, wenn Du Dein Passwort verloren hast.",
"Enabled" : "Aktiviert",
"Disabled" : "Deaktiviert",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselungs-App ist aktiviert, aber deine Schlüssel sind nicht initialisiert. Bitte erneut ab- und wieder anmelden."
diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js
index 39453855f0a..efb5ac8258e 100644
--- a/apps/encryption/l10n/de_DE.js
+++ b/apps/encryption/l10n/de_DE.js
@@ -12,53 +12,54 @@ OC.L10N.register(
"Please provide the old recovery password" : "Bitte das alte Wiederherstellungspasswort eingeben",
"Please provide a new recovery password" : "Bitte ein neues Wiederherstellungspasswort eingeben",
"Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
- "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
- "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+ "Password successfully changed." : "Das Passwort wurde geändert.",
+ "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 versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator",
"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 versuchen Sie es erneut.",
+ "The old password was not correct, please try again." : "Das alte Passwort war falsch, bitte versuchen Sie es erneut.",
"The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuchen Sie es noch einmal.",
- "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
+ "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
"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" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migrieren. Bitte führen Sie 'occ encryption:migrate' aus oder kontaktieren Sie Ihren Administrator.",
"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 aktiviere server-seitige Verschlüsselung in den Administrator-Einstellungen 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" : "Einmalpasswort für Serverseitige Verschlüsselung",
+ "one-time password for server-side-encryption" : "Einmal-Passwort für serverseitige Verschlüsselung",
"Can not 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.",
"Can not 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",
- "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" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte melden Sie sich im Web-Interface an, 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.\n\n",
+ "Default encryption module" : "Standard-Verschlüsselungsmodul",
+ "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" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte melden Sie sich im Web-Oberfläche an, 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.\n\n",
"The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
"Cheers!" : "Noch einen schönen Tag!",
"Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hollo,
der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort %s verschlüsselt.
Bitte melden Sie sich im Web-Interface 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.
",
"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üsslen",
+ "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.",
- "Recovery key password" : "Wiederherstellungschlüsselpasswort",
+ "Recovery key password" : "Passwort für den Wiederherstellungsschlüsse",
"Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
- "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
+ "Change recovery key password:" : "Passwort für den Wiederherstellungsschlüssel ändern",
"Old recovery key password" : "Altes Passwort für den Wiederherstellungsschlüssel",
"New recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel",
"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 Privatschlüsselpasswort stimmt nicht länger mit dem Anmeldepasswort überein.",
- "Set your old private key password to your current log-in password:" : "Ihr altes Privatschlüsselpasswort auf Ihr aktuelles Anmeldepasswort stellen:",
+ "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.",
- "Old log-in password" : "Altes Anmeldepasswort",
+ "Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Anmeldepasswort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
"Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
"Enabled" : "Aktiviert",
"Disabled" : "Deaktiviert",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden."
+ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte erneut ab- und wieder anmelden."
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json
index 3712de14c6c..0c6e55170ce 100644
--- a/apps/encryption/l10n/de_DE.json
+++ b/apps/encryption/l10n/de_DE.json
@@ -10,53 +10,54 @@
"Please provide the old recovery password" : "Bitte das alte Wiederherstellungspasswort eingeben",
"Please provide a new recovery password" : "Bitte ein neues Wiederherstellungspasswort eingeben",
"Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
- "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
- "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+ "Password successfully changed." : "Das Passwort wurde geändert.",
+ "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 versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator",
"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 versuchen Sie es erneut.",
+ "The old password was not correct, please try again." : "Das alte Passwort war falsch, bitte versuchen Sie es erneut.",
"The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuchen Sie es noch einmal.",
- "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
+ "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
"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" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migrieren. Bitte führen Sie 'occ encryption:migrate' aus oder kontaktieren Sie Ihren Administrator.",
"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 aktiviere server-seitige Verschlüsselung in den Administrator-Einstellungen 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" : "Einmalpasswort für Serverseitige Verschlüsselung",
+ "one-time password for server-side-encryption" : "Einmal-Passwort für serverseitige Verschlüsselung",
"Can not 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.",
"Can not 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",
- "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" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte melden Sie sich im Web-Interface an, 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.\n\n",
+ "Default encryption module" : "Standard-Verschlüsselungsmodul",
+ "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" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte melden Sie sich im Web-Oberfläche an, 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.\n\n",
"The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
"Cheers!" : "Noch einen schönen Tag!",
"Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hollo,
der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort %s verschlüsselt.
Bitte melden Sie sich im Web-Interface 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.
",
"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üsslen",
+ "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.",
- "Recovery key password" : "Wiederherstellungschlüsselpasswort",
+ "Recovery key password" : "Passwort für den Wiederherstellungsschlüsse",
"Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
- "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
+ "Change recovery key password:" : "Passwort für den Wiederherstellungsschlüssel ändern",
"Old recovery key password" : "Altes Passwort für den Wiederherstellungsschlüssel",
"New recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel",
"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 Privatschlüsselpasswort stimmt nicht länger mit dem Anmeldepasswort überein.",
- "Set your old private key password to your current log-in password:" : "Ihr altes Privatschlüsselpasswort auf Ihr aktuelles Anmeldepasswort stellen:",
+ "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.",
- "Old log-in password" : "Altes Anmeldepasswort",
+ "Old log-in password" : "Altes Anmelde-Passwort",
"Current log-in password" : "Aktuelles Anmeldepasswort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
"Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
"Enabled" : "Aktiviert",
"Disabled" : "Deaktiviert",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden."
+ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte erneut ab- und wieder anmelden."
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
\ No newline at end of file
diff --git a/apps/encryption/l10n/en_GB.js b/apps/encryption/l10n/en_GB.js
index ac668708fa0..45c1b0ec07f 100644
--- a/apps/encryption/l10n/en_GB.js
+++ b/apps/encryption/l10n/en_GB.js
@@ -24,6 +24,7 @@ OC.L10N.register(
"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" : "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",
"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",
diff --git a/apps/encryption/l10n/en_GB.json b/apps/encryption/l10n/en_GB.json
index 7db53f5938e..0d7e2f83db4 100644
--- a/apps/encryption/l10n/en_GB.json
+++ b/apps/encryption/l10n/en_GB.json
@@ -22,6 +22,7 @@
"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" : "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",
"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",
diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
index aeb9f47d271..db1e07c6b31 100644
--- a/apps/encryption/l10n/es.js
+++ b/apps/encryption/l10n/es.js
@@ -24,6 +24,7 @@ OC.L10N.register(
"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" : "Necesita migrar sus claves de cifrado desde el antiguo modelo de cifrado (ownCloud <= 8.0) al nuevo. Por favor ejecute 'occ encryption:migrate' o contáctese con su administrador.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualice la contraseña de su clave privada en sus ajustes personales para recuperar el acceso a sus archivos cifrados.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "La aplicación de cifrado esta activada, pero sus credenciales no han sido iniciadas. Por favor cierre sesión e inicie sesión nuevamente.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Por favor active el cifrado en el lado del servidor en los ajustes de administración para poder usar el módulo de cifrado.",
"Encryption app is enabled and ready" : "La app de cifrado esta habilitada y preparada",
"Bad Signature" : "Firma errónea",
"Missing Signature" : "No se encuentra la firma",
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
index 528b559ee78..8506acf014e 100644
--- a/apps/encryption/l10n/es.json
+++ b/apps/encryption/l10n/es.json
@@ -22,6 +22,7 @@
"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" : "Necesita migrar sus claves de cifrado desde el antiguo modelo de cifrado (ownCloud <= 8.0) al nuevo. Por favor ejecute 'occ encryption:migrate' o contáctese con su administrador.",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualice la contraseña de su clave privada en sus ajustes personales para recuperar el acceso a sus archivos cifrados.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "La aplicación de cifrado esta activada, pero sus credenciales no han sido iniciadas. Por favor cierre sesión e inicie sesión nuevamente.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Por favor active el cifrado en el lado del servidor en los ajustes de administración para poder usar el módulo de cifrado.",
"Encryption app is enabled and ready" : "La app de cifrado esta habilitada y preparada",
"Bad Signature" : "Firma errónea",
"Missing Signature" : "No se encuentra la firma",
diff --git a/apps/encryption/l10n/es_MX.js b/apps/encryption/l10n/es_MX.js
index cd134eec073..32993e64514 100644
--- a/apps/encryption/l10n/es_MX.js
+++ b/apps/encryption/l10n/es_MX.js
@@ -1,41 +1,42 @@
OC.L10N.register(
"encryption",
{
- "Missing recovery key password" : "Contraseña de llave de recuperacion faltante",
- "Please repeat the recovery key password" : "Favor de reingresar la contraseña de recuperación",
+ "Missing recovery key password" : "No se encontró la contraseña de la llave de recuperación",
+ "Please repeat the recovery key password" : "Por favor reingresa la contraseña de recuperación",
"Repeated recovery key password does not match the provided recovery key password" : "Las contraseñas de la llave de recuperación no coinciden",
"Recovery key successfully enabled" : "Llave de recuperación habilitada exitosamente",
- "Could not enable recovery key. Please check your recovery key password!" : "No fue posible habilitar la llave de recuperación. ¡Favor de comprobar la contraseña de su llave de recuperación!",
+ "Could not enable recovery key. Please check your recovery key password!" : "No fue posible habilitar la llave de recuperación. ¡Por favor comprueba la contraseña de tu llave de recuperación!",
"Recovery key successfully disabled" : "Llave de recuperación deshabilitada exitosamente",
- "Could not disable recovery key. Please check your recovery key password!" : "No fue posible deshabilitar la llave de recuperación. ¡Favor de comprobar la contraseña de la llave de recuperación!",
+ "Could not disable recovery key. Please check your recovery key password!" : "No fue posible deshabilitar la llave de recuperación. ¡Por favor comprueba la contraseña de tu llave de recuperación!",
"Missing parameters" : "Parámetros faltantes",
- "Please provide the old recovery password" : "Favor de proporcionar su contraseña de recuperación anterior",
- "Please provide a new recovery password" : "Favor de proporcionar una nueva contraseña de recuperación",
- "Please repeat the new recovery password" : "Favor de reingresar la nueva contraseña de recuperación",
+ "Please provide the old recovery password" : "Por favor proporciona tu contraseña de recuperación anterior",
+ "Please provide a new recovery password" : "Por favor proporciona una nueva contraseña de recuperación",
+ "Please repeat the new recovery password" : "Por favor reingresa la nueva contraseña de recuperación",
"Password successfully changed." : "La contraseña ha sido cambiada exitosamente",
- "Could not change the password. Maybe the old password was not correct." : "No fue posible cambiar la contraseña. Favor de verificar que contraseña anterior sea correcta.",
+ "Could not change the password. Maybe the old password was not correct." : "No fue posible cambiar la contraseña. Por favor verifica que contraseña anterior sea correcta.",
"Recovery Key disabled" : "Llave de recuperación deshabilitada",
"Recovery Key enabled" : "Llave de recuperación habilitada",
- "Could not enable the recovery key, please try again or contact your administrator" : "No fue posible habilitar la llave de recuperación, favor de intentarlo de nuevo o contacte a su administrador",
+ "Could not enable the recovery key, please try again or contact your administrator" : "No fue posible habilitar la llave de recuperación, por favor intentalo de nuevo o contacta a tu administrador",
"Could not update the private key password." : "No fue posible actualizar la contraseña de la llave privada.",
"The old password was not correct, please try again." : "La contraseña anterior no es correcta, favor de intentar de nuevo. ",
- "The current log-in password was not correct, please try again." : "La contraseña actual para iniciar sesión fue incorrecta, favor de volverlo a intentar. ",
+ "The current log-in password was not correct, please try again." : "La contraseña actual para iniciar sesión fue incorrecta, por favor vuelvelo a intentar. ",
"Private key password successfully updated." : "Contraseña de llave privada actualizada exitosamente.",
- "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" : "Usted necesita migar sus llaves de encripción de la encripción anterior (ownCloud <=8.0) a la nueva. Favor de ejecutar 'occ encryption:migrate' o contacte a su adminstrador",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "La llave de encripción privada es inválida para la aplicación de encripción. Favor de actualizar la contraseña de su llave privada en sus configuraciones personales para recuperar el acceso a sus archivos encriptados. ",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "La aplicación de encripción está habilitada, pero sus llaves no han sido inicializadas. Favor de cerrar sesión e iniciar sesión de nuevo. ",
+ "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" : "Necesitas migar tus llaves de encripción de la encripción anterior (ownCloud <=8.0) a la nueva. Por favor ejecuta 'occ encryption:migrate' o contacta a tu adminstrador",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "La llave de encripción privada es inválida para la aplicación de encripción. Por favor actualiza la contraseña de tu llave privada en tus configuraciones personales para recuperar el acceso a tus archivos encriptados. ",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "La aplicación de encripción está habilitada, pero tus llaves no han sido inicializadas. Por favor cierra sesión e inicia sesión de nuevo. ",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Por favor activa el encriptado del lado del servidor en los ajustes de administración para usar el módulo de encripción.",
"Encryption app is enabled and ready" : "La aplicación de encripción se cuentra habilitada y lista",
"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",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es posible decriptar este archivo, posiblemente sea un archivo compartido. Favor de solicitar al dueño del archivo que lo vuelva a compartir con usted.",
- "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es posible leer este archivo, posiblemente sea un archivo compatido. Favor de solicitar al dueño que vuelva a compartirlo con usted. ",
+ "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es posible decriptar este archivo, posiblemente sea un archivo compartido. Por favor solicita al dueño del archivo que lo vuelva a compartir contigo.",
+ "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es posible leer este archivo, posiblemente sea un archivo compatido. Por favor solicita al dueño que vuelva a compartirlo contigo.",
"Default encryption module" : "Módulo de encripción predeterminado",
- "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" : "Hola,\n\nel administrador ha habilitado la encripción de lado del servidor. Sus archivos fueron encriptados usando la contraseña '%s'\n\nFavor de iniciar sesión en la interface web, vaya a la sección \"módulo de encripción básica\" de sus configuraciones personales y actualice su contraseña de encripción 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. \n",
+ "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" : "Hola,\n\nel administrador ha habilitado la encripción de lado del servidor. Tus archivos fueron encriptados usando la contraseña '%s'\n\nPor favor inicia sesión en la interface web, ve a la sección \"módulo de encripción básica\" de tus configuraciones personales y actualiza su contraseña de encripción ingresando esta contraseña en el campo 'contraseña de inicio de sesión anterior' y tu contraseña de inicio de sesión actual. \n",
"The share will expire on %s." : "El elemento compartido expirará el %s.",
"Cheers!" : "¡Saludos!",
- "Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hola,
el administrador ha habilitado la encripción del lado del servidor. Sus archivos fueron encriptados usando la contraseña %s.
Favor de iniciar sesisón en la interface web, vaya a la sección \"módulo de encripción básica\" de sus configuraciones personales y actualice su contraseña de encripción 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.
",
- "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",
+ "Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hola,
el administrador ha habilitado la encripción del lado del servidor. Tus archivos fueron encriptados usando la contraseña %s.
Por favor inicia sesisón en la interface web, ve a la sección \"módulo de encripción básica\" de tus configuraciones personales y actualiza tu contraseña de encripción ingresando esta contraseña en el campo \"contraseña de inicio de sesión anterior\" y tu contraseña de inicio de sesión actual.
",
+ "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",
@@ -49,16 +50,16 @@ OC.L10N.register(
"Repeat new recovery key password" : "Reingresar la nueva contraseña de llave de recuperación",
"Change Password" : "Cambiar contraseña",
"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.",
+ "Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
+ "Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
+ " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"Enable password recovery:" : "Habilitar la recuperación de contraseña:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus archivos encriptados en caso de perder la contraseña",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
"Disabled" : "Deshabilitado",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción está habilitada pero tus llaves no han sido establecidas, favor de cerrar la sesión y volver a iniciarla."
+ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción está habilitada pero tus llaves no han sido establecidas, por favor cierra la sesión y vuelve a iniciarla."
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/es_MX.json b/apps/encryption/l10n/es_MX.json
index ce8b0a90304..a2c72aed1ce 100644
--- a/apps/encryption/l10n/es_MX.json
+++ b/apps/encryption/l10n/es_MX.json
@@ -1,39 +1,40 @@
{ "translations": {
- "Missing recovery key password" : "Contraseña de llave de recuperacion faltante",
- "Please repeat the recovery key password" : "Favor de reingresar la contraseña de recuperación",
+ "Missing recovery key password" : "No se encontró la contraseña de la llave de recuperación",
+ "Please repeat the recovery key password" : "Por favor reingresa la contraseña de recuperación",
"Repeated recovery key password does not match the provided recovery key password" : "Las contraseñas de la llave de recuperación no coinciden",
"Recovery key successfully enabled" : "Llave de recuperación habilitada exitosamente",
- "Could not enable recovery key. Please check your recovery key password!" : "No fue posible habilitar la llave de recuperación. ¡Favor de comprobar la contraseña de su llave de recuperación!",
+ "Could not enable recovery key. Please check your recovery key password!" : "No fue posible habilitar la llave de recuperación. ¡Por favor comprueba la contraseña de tu llave de recuperación!",
"Recovery key successfully disabled" : "Llave de recuperación deshabilitada exitosamente",
- "Could not disable recovery key. Please check your recovery key password!" : "No fue posible deshabilitar la llave de recuperación. ¡Favor de comprobar la contraseña de la llave de recuperación!",
+ "Could not disable recovery key. Please check your recovery key password!" : "No fue posible deshabilitar la llave de recuperación. ¡Por favor comprueba la contraseña de tu llave de recuperación!",
"Missing parameters" : "Parámetros faltantes",
- "Please provide the old recovery password" : "Favor de proporcionar su contraseña de recuperación anterior",
- "Please provide a new recovery password" : "Favor de proporcionar una nueva contraseña de recuperación",
- "Please repeat the new recovery password" : "Favor de reingresar la nueva contraseña de recuperación",
+ "Please provide the old recovery password" : "Por favor proporciona tu contraseña de recuperación anterior",
+ "Please provide a new recovery password" : "Por favor proporciona una nueva contraseña de recuperación",
+ "Please repeat the new recovery password" : "Por favor reingresa la nueva contraseña de recuperación",
"Password successfully changed." : "La contraseña ha sido cambiada exitosamente",
- "Could not change the password. Maybe the old password was not correct." : "No fue posible cambiar la contraseña. Favor de verificar que contraseña anterior sea correcta.",
+ "Could not change the password. Maybe the old password was not correct." : "No fue posible cambiar la contraseña. Por favor verifica que contraseña anterior sea correcta.",
"Recovery Key disabled" : "Llave de recuperación deshabilitada",
"Recovery Key enabled" : "Llave de recuperación habilitada",
- "Could not enable the recovery key, please try again or contact your administrator" : "No fue posible habilitar la llave de recuperación, favor de intentarlo de nuevo o contacte a su administrador",
+ "Could not enable the recovery key, please try again or contact your administrator" : "No fue posible habilitar la llave de recuperación, por favor intentalo de nuevo o contacta a tu administrador",
"Could not update the private key password." : "No fue posible actualizar la contraseña de la llave privada.",
"The old password was not correct, please try again." : "La contraseña anterior no es correcta, favor de intentar de nuevo. ",
- "The current log-in password was not correct, please try again." : "La contraseña actual para iniciar sesión fue incorrecta, favor de volverlo a intentar. ",
+ "The current log-in password was not correct, please try again." : "La contraseña actual para iniciar sesión fue incorrecta, por favor vuelvelo a intentar. ",
"Private key password successfully updated." : "Contraseña de llave privada actualizada exitosamente.",
- "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" : "Usted necesita migar sus llaves de encripción de la encripción anterior (ownCloud <=8.0) a la nueva. Favor de ejecutar 'occ encryption:migrate' o contacte a su adminstrador",
- "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "La llave de encripción privada es inválida para la aplicación de encripción. Favor de actualizar la contraseña de su llave privada en sus configuraciones personales para recuperar el acceso a sus archivos encriptados. ",
- "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "La aplicación de encripción está habilitada, pero sus llaves no han sido inicializadas. Favor de cerrar sesión e iniciar sesión de nuevo. ",
+ "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" : "Necesitas migar tus llaves de encripción de la encripción anterior (ownCloud <=8.0) a la nueva. Por favor ejecuta 'occ encryption:migrate' o contacta a tu adminstrador",
+ "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "La llave de encripción privada es inválida para la aplicación de encripción. Por favor actualiza la contraseña de tu llave privada en tus configuraciones personales para recuperar el acceso a tus archivos encriptados. ",
+ "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "La aplicación de encripción está habilitada, pero tus llaves no han sido inicializadas. Por favor cierra sesión e inicia sesión de nuevo. ",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Por favor activa el encriptado del lado del servidor en los ajustes de administración para usar el módulo de encripción.",
"Encryption app is enabled and ready" : "La aplicación de encripción se cuentra habilitada y lista",
"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",
- "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es posible decriptar este archivo, posiblemente sea un archivo compartido. Favor de solicitar al dueño del archivo que lo vuelva a compartir con usted.",
- "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es posible leer este archivo, posiblemente sea un archivo compatido. Favor de solicitar al dueño que vuelva a compartirlo con usted. ",
+ "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es posible decriptar este archivo, posiblemente sea un archivo compartido. Por favor solicita al dueño del archivo que lo vuelva a compartir contigo.",
+ "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es posible leer este archivo, posiblemente sea un archivo compatido. Por favor solicita al dueño que vuelva a compartirlo contigo.",
"Default encryption module" : "Módulo de encripción predeterminado",
- "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" : "Hola,\n\nel administrador ha habilitado la encripción de lado del servidor. Sus archivos fueron encriptados usando la contraseña '%s'\n\nFavor de iniciar sesión en la interface web, vaya a la sección \"módulo de encripción básica\" de sus configuraciones personales y actualice su contraseña de encripción 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. \n",
+ "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" : "Hola,\n\nel administrador ha habilitado la encripción de lado del servidor. Tus archivos fueron encriptados usando la contraseña '%s'\n\nPor favor inicia sesión en la interface web, ve a la sección \"módulo de encripción básica\" de tus configuraciones personales y actualiza su contraseña de encripción ingresando esta contraseña en el campo 'contraseña de inicio de sesión anterior' y tu contraseña de inicio de sesión actual. \n",
"The share will expire on %s." : "El elemento compartido expirará el %s.",
"Cheers!" : "¡Saludos!",
- "Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hola,
el administrador ha habilitado la encripción del lado del servidor. Sus archivos fueron encriptados usando la contraseña %s.
Favor de iniciar sesisón en la interface web, vaya a la sección \"módulo de encripción básica\" de sus configuraciones personales y actualice su contraseña de encripción 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.
",
- "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",
+ "Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hola,
el administrador ha habilitado la encripción del lado del servidor. Tus archivos fueron encriptados usando la contraseña %s.
Por favor inicia sesisón en la interface web, ve a la sección \"módulo de encripción básica\" de tus configuraciones personales y actualiza tu contraseña de encripción ingresando esta contraseña en el campo \"contraseña de inicio de sesión anterior\" y tu contraseña de inicio de sesión actual.
",
+ "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",
@@ -47,16 +48,16 @@
"Repeat new recovery key password" : "Reingresar la nueva contraseña de llave de recuperación",
"Change Password" : "Cambiar contraseña",
"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.",
+ "Your private key password no longer matches your log-in password." : "Tu contraseña de llave privada ya no corresónde con tu contraseña de inicio de sesión. ",
+ "Set your old private key password to your current log-in password:" : "Establece tu contraseña de llave privada a tu contraseña actual de inicio de seisón:",
+ " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerdas tu contraseña anterior le puedes pedir a tu administrador que recupere tus archivos.",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar Contraseña de Llave Privada",
"Enable password recovery:" : "Habilitar la recuperación de contraseña:",
- "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus archivos encriptados en caso de perder la contraseña",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción te permitirá volver a tener acceso a tus archivos encriptados en caso de que pierdas la contraseña",
"Enabled" : "Habilitado",
"Disabled" : "Deshabilitado",
- "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción está habilitada pero tus llaves no han sido establecidas, favor de cerrar la sesión y volver a iniciarla."
+ "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encripción está habilitada pero tus llaves no han sido establecidas, por favor cierra la sesión y vuelve a iniciarla."
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
\ No newline at end of file
diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js
index daecb1c404e..7d527bbb095 100644
--- a/apps/encryption/l10n/fr.js
+++ b/apps/encryption/l10n/fr.js
@@ -24,6 +24,7 @@ OC.L10N.register(
"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" : "Vous devez migrer vos clés de chiffrement de l'ancienne version (ownCloud <= 8.0) vers la nouvelle. Veuillez exécuter 'occ encryption:migrate' ou contacter votre administrateur",
"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 cryptage côté serveur dans les paramètres d'administration pour utiliser le module de cryptage.",
"Encryption app is enabled and ready" : "L'application de chiffrement est activée et prête",
"Bad Signature" : "Mauvaise signature",
"Missing Signature" : "Signature manquante",
diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json
index 30727c5c610..0977d7c44ab 100644
--- a/apps/encryption/l10n/fr.json
+++ b/apps/encryption/l10n/fr.json
@@ -22,6 +22,7 @@
"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" : "Vous devez migrer vos clés de chiffrement de l'ancienne version (ownCloud <= 8.0) vers la nouvelle. Veuillez exécuter 'occ encryption:migrate' ou contacter votre administrateur",
"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 cryptage côté serveur dans les paramètres d'administration pour utiliser le module de cryptage.",
"Encryption app is enabled and ready" : "L'application de chiffrement est activée et prête",
"Bad Signature" : "Mauvaise signature",
"Missing Signature" : "Signature manquante",
diff --git a/apps/encryption/l10n/is.js b/apps/encryption/l10n/is.js
index fb5b430ce52..707dae28d5e 100644
--- a/apps/encryption/l10n/is.js
+++ b/apps/encryption/l10n/is.js
@@ -15,21 +15,28 @@ OC.L10N.register(
"Could not change the password. Maybe the old password was not correct." : "Tókst ekki að breyta lykilorðinu. Kannski var gamla lykilorðið ekki rétt.",
"Recovery Key disabled" : "Endurheimtulykilorð óvirkt",
"Recovery Key enabled" : "Endurheimtulykilorð virkt",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Gat ekki virkjað endurheimtulykilinn, reyndu aftur eða hafðu samband við kerfisstjóra",
"Could not update the private key password." : "Tókst ekki að uppfæra lykilorð einkalykils.",
"The old password was not correct, please try again." : "Gamla lykilorðið var ekki rétt, reyndu aftur.",
"The current log-in password was not correct, please try again." : "Núgildandi innskráningarlykilorð var ekki rétt, reyndu aftur.",
"Private key password successfully updated." : "Tókst að uppfæra lykilorð einkalykils.",
"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" : "Þú verður að yfirfæra dulritunarlyklana þína úr gömlu dulrituninni (ownCloud <= 8.0) yfir í þá nýju. Keyrðu 'occ encryption:migrate' eða hafðu samband við kerfisstjórann þinn",
+ "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.",
"Encryption app is enabled and ready" : "Dulritunarforrit er virkt og tilbúið til notkunar",
"Bad Signature" : "Ógild undirritun",
"Missing Signature" : "Vantar undirritun",
"one-time password for server-side-encryption" : "eins-skiptis lykilorð fyrir dulritun á þjóni",
+ "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Get ekki afkóðað þessa skrá, hugsanlega er þetta deild skrá. Biddu eiganda skrárinnar að deila henni aftur til þín.",
+ "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Get ekki lesið þessa skrá, hugsanlega er þetta deild skrá. Biddu eiganda skrárinnar að deila henni aftur til þín.",
"Default encryption module" : "Sjálfgefin dulritunareining",
"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:",
@@ -40,11 +47,14 @@ 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 lykilorðið",
"Current log-in password" : "Núverandi lykilorð",
"Update Private Key Password" : "Uppfæra lykilorð einkalykils:",
"Enable password recovery:" : "Virkja endurheimtingu lykilorðs:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ef þessi kostur er virkur gerir það þér kleift að endurheimta aðgang að skránum þínum ef þú tapar lykilorðinu",
"Enabled" : "Virkt",
- "Disabled" : "Óvirkt"
+ "Disabled" : "Óvirkt",
+ "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"
},
"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/encryption/l10n/is.json b/apps/encryption/l10n/is.json
index 82792726eb3..c917b838caa 100644
--- a/apps/encryption/l10n/is.json
+++ b/apps/encryption/l10n/is.json
@@ -13,21 +13,28 @@
"Could not change the password. Maybe the old password was not correct." : "Tókst ekki að breyta lykilorðinu. Kannski var gamla lykilorðið ekki rétt.",
"Recovery Key disabled" : "Endurheimtulykilorð óvirkt",
"Recovery Key enabled" : "Endurheimtulykilorð virkt",
+ "Could not enable the recovery key, please try again or contact your administrator" : "Gat ekki virkjað endurheimtulykilinn, reyndu aftur eða hafðu samband við kerfisstjóra",
"Could not update the private key password." : "Tókst ekki að uppfæra lykilorð einkalykils.",
"The old password was not correct, please try again." : "Gamla lykilorðið var ekki rétt, reyndu aftur.",
"The current log-in password was not correct, please try again." : "Núgildandi innskráningarlykilorð var ekki rétt, reyndu aftur.",
"Private key password successfully updated." : "Tókst að uppfæra lykilorð einkalykils.",
"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" : "Þú verður að yfirfæra dulritunarlyklana þína úr gömlu dulrituninni (ownCloud <= 8.0) yfir í þá nýju. Keyrðu 'occ encryption:migrate' eða hafðu samband við kerfisstjórann þinn",
+ "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.",
"Encryption app is enabled and ready" : "Dulritunarforrit er virkt og tilbúið til notkunar",
"Bad Signature" : "Ógild undirritun",
"Missing Signature" : "Vantar undirritun",
"one-time password for server-side-encryption" : "eins-skiptis lykilorð fyrir dulritun á þjóni",
+ "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Get ekki afkóðað þessa skrá, hugsanlega er þetta deild skrá. Biddu eiganda skrárinnar að deila henni aftur til þín.",
+ "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Get ekki lesið þessa skrá, hugsanlega er þetta deild skrá. Biddu eiganda skrárinnar að deila henni aftur til þín.",
"Default encryption module" : "Sjálfgefin dulritunareining",
"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:",
@@ -38,11 +45,14 @@
"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 lykilorðið",
"Current log-in password" : "Núverandi lykilorð",
"Update Private Key Password" : "Uppfæra lykilorð einkalykils:",
"Enable password recovery:" : "Virkja endurheimtingu lykilorðs:",
+ "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ef þessi kostur er virkur gerir það þér kleift að endurheimta aðgang að skránum þínum ef þú tapar lykilorðinu",
"Enabled" : "Virkt",
- "Disabled" : "Óvirkt"
+ "Disabled" : "Óvirkt",
+ "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"
},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
}
\ No newline at end of file
diff --git a/apps/encryption/l10n/nb.js b/apps/encryption/l10n/nb.js
index 8c1ae4e59aa..353e475031c 100644
--- a/apps/encryption/l10n/nb.js
+++ b/apps/encryption/l10n/nb.js
@@ -24,18 +24,19 @@ OC.L10N.register(
"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" : "Du må migrere krypteringsnøklene din fra den gamle krypteringen (ownCloud <= 8.0) til den nye. Kjør 'occ encryption:migrate' eller kontakt en administrator",
"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 Krypteringsappen. 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." : "Program for kryptering 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å tjenersiden i innstillingene for å bruke krypteringsmodulen.",
"Encryption app is enabled and ready" : "Krypteringsappen er aktivert og klar",
"Bad Signature" : "Feil signatur",
"Missing Signature" : "Manglende signatur",
- "one-time password for server-side-encryption" : "engangspassord for tjenerkryptering",
+ "one-time password for server-side-encryption" : "engangspassord for kryptering på tjenersiden",
"Can not 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. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt.",
"Can not 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, som sannsynligvis er en delt fil. Be eieren av filen om å dele den med deg på nytt.",
"Default encryption module" : "Standard krypteringsmodul",
- "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" : "Hei,\n\nAdministratoren har aktivert tjenerkryptering. Filene dine er blitt kryptert med passordet '%s'.\n\nlogg inn på vev-grensesnittet, gå til seksjonen 'grunnleggende krypteringsmodul' i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet 'gammelt påloggingspassord' sammen med ditt nåværende påloggingspassord.\n",
+ "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" : "Hei,\n\nAdministratoren har aktivert kryptering på tjenersiden. Filene dine har blitt kryptert med passordet '%s'.\n\nlogg inn på vev-grensesnittet, gå til seksjonen 'grunnleggende krypteringsmodul' i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet 'gammelt påloggingspassord' sammen med ditt nåværende påloggingspassord.\n",
"The share will expire on %s." : "Delingen vil opphøre %s.",
"Cheers!" : "Ha det!",
- "Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hei,
Administratoren har skrudd på tjenerkryptering. Filene dine er blitt kryptert med passordet %s.
Logg inn på vev-grensesnittet, gå til seksjonen \"grunnleggende krypteringsmodul\" i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet \"gammelt påloggingspassord\" sammen med ditt nåværende påloggingspassord.
",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
+ "Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hei,
Administratoren har skrudd på kryptering på tjenersiden. Filene dine er blitt kryptert med passordet %s.
Logg inn på vev-grensesnittet, gå til seksjonen \"grunnleggende krypteringsmodul\" i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet \"gammelt påloggingspassord\" sammen med ditt nåværende påloggingspassord.
",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Program for kryptering 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",
diff --git a/apps/encryption/l10n/nb.json b/apps/encryption/l10n/nb.json
index 6bd09db1dc3..2d1a8fa2619 100644
--- a/apps/encryption/l10n/nb.json
+++ b/apps/encryption/l10n/nb.json
@@ -22,18 +22,19 @@
"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" : "Du må migrere krypteringsnøklene din fra den gamle krypteringen (ownCloud <= 8.0) til den nye. Kjør 'occ encryption:migrate' eller kontakt en administrator",
"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 Krypteringsappen. 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." : "Program for kryptering 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å tjenersiden i innstillingene for å bruke krypteringsmodulen.",
"Encryption app is enabled and ready" : "Krypteringsappen er aktivert og klar",
"Bad Signature" : "Feil signatur",
"Missing Signature" : "Manglende signatur",
- "one-time password for server-side-encryption" : "engangspassord for tjenerkryptering",
+ "one-time password for server-side-encryption" : "engangspassord for kryptering på tjenersiden",
"Can not 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. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt.",
"Can not 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, som sannsynligvis er en delt fil. Be eieren av filen om å dele den med deg på nytt.",
"Default encryption module" : "Standard krypteringsmodul",
- "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" : "Hei,\n\nAdministratoren har aktivert tjenerkryptering. Filene dine er blitt kryptert med passordet '%s'.\n\nlogg inn på vev-grensesnittet, gå til seksjonen 'grunnleggende krypteringsmodul' i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet 'gammelt påloggingspassord' sammen med ditt nåværende påloggingspassord.\n",
+ "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" : "Hei,\n\nAdministratoren har aktivert kryptering på tjenersiden. Filene dine har blitt kryptert med passordet '%s'.\n\nlogg inn på vev-grensesnittet, gå til seksjonen 'grunnleggende krypteringsmodul' i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet 'gammelt påloggingspassord' sammen med ditt nåværende påloggingspassord.\n",
"The share will expire on %s." : "Delingen vil opphøre %s.",
"Cheers!" : "Ha det!",
- "Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hei,
Administratoren har skrudd på tjenerkryptering. Filene dine er blitt kryptert med passordet %s.
Logg inn på vev-grensesnittet, gå til seksjonen \"grunnleggende krypteringsmodul\" i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet \"gammelt påloggingspassord\" sammen med ditt nåværende påloggingspassord.
",
- "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
+ "Hey there,
the admin enabled server-side-encryption. Your files were encrypted using the password %s.
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.
" : "Hei,
Administratoren har skrudd på kryptering på tjenersiden. Filene dine er blitt kryptert med passordet %s.
Logg inn på vev-grensesnittet, gå til seksjonen \"grunnleggende krypteringsmodul\" i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet \"gammelt påloggingspassord\" sammen med ditt nåværende påloggingspassord.
",
+ "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Program for kryptering 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",
diff --git a/apps/encryption/l10n/nl.js b/apps/encryption/l10n/nl.js
index edf8be08e4f..39c385808d0 100644
--- a/apps/encryption/l10n/nl.js
+++ b/apps/encryption/l10n/nl.js
@@ -24,6 +24,7 @@ OC.L10N.register(
"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" : "Je moet je cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe. Start 'occ encryption:migrate' of neem contact op met je beheerder",
"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",
"Bad Signature" : "Verkeerde handtekening",
"Missing Signature" : "Missende ondertekening",
diff --git a/apps/encryption/l10n/nl.json b/apps/encryption/l10n/nl.json
index 8194099ad82..210b1a0db86 100644
--- a/apps/encryption/l10n/nl.json
+++ b/apps/encryption/l10n/nl.json
@@ -22,6 +22,7 @@
"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" : "Je moet je cryptosleutels van de oude versleuteling (ownCloud <= 8.0) migreren naar de nieuwe. Start 'occ encryption:migrate' of neem contact op met je beheerder",
"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",
"Bad Signature" : "Verkeerde handtekening",
"Missing Signature" : "Missende ondertekening",
diff --git a/apps/encryption/l10n/pl.js b/apps/encryption/l10n/pl.js
index a7c84192c0c..cb8c9853486 100644
--- a/apps/encryption/l10n/pl.js
+++ b/apps/encryption/l10n/pl.js
@@ -24,6 +24,7 @@ OC.L10N.register(
"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" : "Musisz przenieść swoje klucze szyfrowania ze starego sposobu szyfrowania (Nextcloud <= 8,0) na nowy. Proszę uruchomić 'occ encryption:migrate' lub skontaktować się z administratorem",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Nieprawidłowy klucz prywatny do szyfrowania aplikacji. Należy zaktualizować hasło klucza prywatnego w ustawieniach osobistych, aby odzyskać dostęp do zaszyfrowanych plików.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Aplikacja szyfrująca jest włączona, ale twoje klucze nie sa zainicjalizowane. Proszę się wylogować i zalogować ponownie.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Aby móc korzystać z modułu szyfrowania trzeba włączyć w panelu administratora szyfrowanie po stronie serwera. ",
"Encryption app is enabled and ready" : "Szyfrowanie aplikacja jest włączone i gotowe",
"Bad Signature" : "Zła sygnatura",
"Missing Signature" : "Brakująca sygnatura",
diff --git a/apps/encryption/l10n/pl.json b/apps/encryption/l10n/pl.json
index 257bf82930e..f449aca18dc 100644
--- a/apps/encryption/l10n/pl.json
+++ b/apps/encryption/l10n/pl.json
@@ -22,6 +22,7 @@
"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" : "Musisz przenieść swoje klucze szyfrowania ze starego sposobu szyfrowania (Nextcloud <= 8,0) na nowy. Proszę uruchomić 'occ encryption:migrate' lub skontaktować się z administratorem",
"Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Nieprawidłowy klucz prywatny do szyfrowania aplikacji. Należy zaktualizować hasło klucza prywatnego w ustawieniach osobistych, aby odzyskać dostęp do zaszyfrowanych plików.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Aplikacja szyfrująca jest włączona, ale twoje klucze nie sa zainicjalizowane. Proszę się wylogować i zalogować ponownie.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Aby móc korzystać z modułu szyfrowania trzeba włączyć w panelu administratora szyfrowanie po stronie serwera. ",
"Encryption app is enabled and ready" : "Szyfrowanie aplikacja jest włączone i gotowe",
"Bad Signature" : "Zła sygnatura",
"Missing Signature" : "Brakująca sygnatura",
diff --git a/apps/encryption/l10n/pt_BR.js b/apps/encryption/l10n/pt_BR.js
index f6cb6d56d3e..aeab740b887 100644
--- a/apps/encryption/l10n/pt_BR.js
+++ b/apps/encryption/l10n/pt_BR.js
@@ -24,6 +24,7 @@ OC.L10N.register(
"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" : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova. Por favor, execute 'occ encryption:migrate' ou contate o administrador",
"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 o aplicativo de criptografia. Atualize a senha da sua chave privada nas configurações pessoais para recuperar o acesso aos seus arquivos criptografados.",
"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.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Habilite a criptografia do lado do servidor em configurações administrativas a fim de usar o módulo de criptografia.",
"Encryption app is enabled and ready" : "O aplicativo de criptografia está habilitado e pronto",
"Bad Signature" : "Assinatura ruim",
"Missing Signature" : "Assinatura faltante",
diff --git a/apps/encryption/l10n/pt_BR.json b/apps/encryption/l10n/pt_BR.json
index c8816f81f10..87694e0b698 100644
--- a/apps/encryption/l10n/pt_BR.json
+++ b/apps/encryption/l10n/pt_BR.json
@@ -22,6 +22,7 @@
"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" : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova. Por favor, execute 'occ encryption:migrate' ou contate o administrador",
"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 o aplicativo de criptografia. Atualize a senha da sua chave privada nas configurações pessoais para recuperar o acesso aos seus arquivos criptografados.",
"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.",
+ "Please enable server side encryption in the admin settings in order to use the encryption module." : "Habilite a criptografia do lado do servidor em configurações administrativas a fim de usar o módulo de criptografia.",
"Encryption app is enabled and ready" : "O aplicativo de criptografia está habilitado e pronto",
"Bad Signature" : "Assinatura ruim",
"Missing Signature" : "Assinatura faltante",
diff --git a/apps/encryption/l10n/ru.js b/apps/encryption/l10n/ru.js
index 4c43bacc294..c37e2b2afae 100644
--- a/apps/encryption/l10n/ru.js
+++ b/apps/encryption/l10n/ru.js
@@ -24,6 +24,7 @@ OC.L10N.register(
"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" : "Вам необходимо произвести конвертацию ключей шифрования из старого формата (ownCloud <= 8.0) в новый. Пожалуйста запустите команду 'occ encryption:migrate' или обратитесь к администратору.",
"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" : "Подпись отсутствует",
diff --git a/apps/encryption/l10n/ru.json b/apps/encryption/l10n/ru.json
index 307fed700ea..5305a1a9840 100644
--- a/apps/encryption/l10n/ru.json
+++ b/apps/encryption/l10n/ru.json
@@ -22,6 +22,7 @@
"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" : "Вам необходимо произвести конвертацию ключей шифрования из старого формата (ownCloud <= 8.0) в новый. Пожалуйста запустите команду 'occ encryption:migrate' или обратитесь к администратору.",
"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" : "Подпись отсутствует",
diff --git a/apps/encryption/l10n/tr.js b/apps/encryption/l10n/tr.js
index 2956760ff29..ed2471df2ca 100644
--- a/apps/encryption/l10n/tr.js
+++ b/apps/encryption/l10n/tr.js
@@ -24,6 +24,7 @@ OC.L10N.register(
"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" : "Eski şifreleme anahtarlarınızın eski şifrelemeden (ownCloud <= 8.0) yenisine aktarılması gerekiyor. Lütfen 'occ encryption:migrate' komutunu çalıştırın ya da sistem yöneticiniz ile görüşün",
"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ı özel anahtarı geçersiz. Şifrelenmiş dosyalarınıza erişebilmek için kişisel ayarlarınızdaki özel anahtar parolanızı güncelleyin.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Şifreleme Uygulaması etkin ancak anahtarlarınız 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",
"Bad Signature" : "İmza Kötü",
"Missing Signature" : "İmza Eksik",
diff --git a/apps/encryption/l10n/tr.json b/apps/encryption/l10n/tr.json
index d2a9803ee74..f02306e2413 100644
--- a/apps/encryption/l10n/tr.json
+++ b/apps/encryption/l10n/tr.json
@@ -22,6 +22,7 @@
"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" : "Eski şifreleme anahtarlarınızın eski şifrelemeden (ownCloud <= 8.0) yenisine aktarılması gerekiyor. Lütfen 'occ encryption:migrate' komutunu çalıştırın ya da sistem yöneticiniz ile görüşün",
"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ı özel anahtarı geçersiz. Şifrelenmiş dosyalarınıza erişebilmek için kişisel ayarlarınızdaki özel anahtar parolanızı güncelleyin.",
"Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Şifreleme Uygulaması etkin ancak anahtarlarınız 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",
"Bad Signature" : "İmza Kötü",
"Missing Signature" : "İmza Eksik",
diff --git a/apps/encryption/l10n/zh_CN.js b/apps/encryption/l10n/zh_CN.js
index 11d40b02a9f..75ae65a9dd7 100644
--- a/apps/encryption/l10n/zh_CN.js
+++ b/apps/encryption/l10n/zh_CN.js
@@ -24,6 +24,7 @@ OC.L10N.register(
"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" : "您需要从旧版本 (ownCloud <= 8.0) 迁移您的加密密钥. 请运行 'occ encryption:migrate' 或联系您的管理员.",
"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" : "签名已丢失",
diff --git a/apps/encryption/l10n/zh_CN.json b/apps/encryption/l10n/zh_CN.json
index fb7a1ac9e16..35d2bb2e3d7 100644
--- a/apps/encryption/l10n/zh_CN.json
+++ b/apps/encryption/l10n/zh_CN.json
@@ -22,6 +22,7 @@
"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" : "您需要从旧版本 (ownCloud <= 8.0) 迁移您的加密密钥. 请运行 'occ encryption:migrate' 或联系您的管理员.",
"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" : "签名已丢失",
diff --git a/apps/encryption/lib/AppInfo/Application.php b/apps/encryption/lib/AppInfo/Application.php
index a43646d86d9..dd9d173c8eb 100644
--- a/apps/encryption/lib/AppInfo/Application.php
+++ b/apps/encryption/lib/AppInfo/Application.php
@@ -67,7 +67,11 @@ class Application extends \OCP\AppFramework\App {
$session = $this->getContainer()->query('Session');
$session->setStatus(Session::RUN_MIGRATION);
}
- if ($this->encryptionManager->isEnabled() && $encryptionSystemReady) {
+
+ }
+
+ public function setUp() {
+ if ($this->encryptionManager->isEnabled()) {
/** @var Setup $setup */
$setup = $this->getContainer()->query('UserSetup');
$setup->setupSystem();
@@ -77,7 +81,6 @@ class Application extends \OCP\AppFramework\App {
/**
* register hooks
*/
-
public function registerHooks() {
if (!$this->config->getSystemValue('maintenance', false)) {
@@ -193,7 +196,8 @@ class Application extends \OCP\AppFramework\App {
$c->getAppName(),
$server->getRequest(),
$server->getL10N($c->getAppName()),
- $c->query('Session')
+ $c->query('Session'),
+ $server->getEncryptionManager()
);
});
@@ -266,9 +270,4 @@ class Application extends \OCP\AppFramework\App {
);
}
-
- public function registerSettings() {
- // Register settings scripts
- App::registerPersonal('encryption', 'settings/settings-personal');
- }
}
diff --git a/apps/encryption/lib/Command/DisableMasterKey.php b/apps/encryption/lib/Command/DisableMasterKey.php
new file mode 100644
index 00000000000..97c2ad40b61
--- /dev/null
+++ b/apps/encryption/lib/Command/DisableMasterKey.php
@@ -0,0 +1,89 @@
+
+ *
+ * @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 .
+ *
+ */
+
+
+namespace OCA\Encryption\Command;
+
+
+use OCA\Encryption\Util;
+use OCP\IConfig;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputInterface;
+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;
+ parent::__construct();
+ }
+
+ protected function configure() {
+ $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.');
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output) {
+
+ $isMasterKeyEnabled = $this->util->isMasterKeyEnabled();
+
+ 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.');
+ }
+ }
+
+ }
+
+}
diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php
index 0776a84ceb4..9ec9fd1234b 100644
--- a/apps/encryption/lib/Controller/StatusController.php
+++ b/apps/encryption/lib/Controller/StatusController.php
@@ -28,6 +28,7 @@ namespace OCA\Encryption\Controller;
use OCA\Encryption\Session;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\DataResponse;
+use OCP\Encryption\IManager;
use OCP\IL10N;
use OCP\IRequest;
@@ -39,20 +40,26 @@ class StatusController extends Controller {
/** @var Session */
private $session;
+ /** @var IManager */
+ private $encryptionManager;
+
/**
* @param string $AppName
* @param IRequest $request
* @param IL10N $l10n
* @param Session $session
+ * @param IManager $encryptionManager
*/
public function __construct($AppName,
IRequest $request,
IL10N $l10n,
- Session $session
+ Session $session,
+ IManager $encryptionManager
) {
parent::__construct($AppName, $request);
$this->l = $l10n;
$this->session = $session;
+ $this->encryptionManager = $encryptionManager;
}
/**
@@ -78,9 +85,15 @@ class StatusController extends Controller {
break;
case Session::NOT_INITIALIZED:
$status = 'interactionNeeded';
- $message = (string)$this->l->t(
- 'Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.'
- );
+ if ($this->encryptionManager->isEnabled()) {
+ $message = (string)$this->l->t(
+ 'Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.'
+ );
+ } else {
+ $message = (string)$this->l->t(
+ 'Please enable server side encryption in the admin settings in order to use the encryption module.'
+ );
+ }
break;
case Session::INIT_SUCCESSFUL:
$status = 'success';
diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php
index 7f7665a24fc..6869177ac31 100644
--- a/apps/encryption/lib/Crypto/Encryption.php
+++ b/apps/encryption/lib/Crypto/Encryption.php
@@ -569,4 +569,13 @@ class Encryption implements IEncryptionModule {
public function isReadyForUser($user) {
return $this->keyManager->userHasKeys($user);
}
+
+ /**
+ * We only need a detailed access list if the master key is not enabled
+ *
+ * @return bool
+ */
+ public function needDetailedAccessList() {
+ return !$this->util->isMasterKeyEnabled();
+ }
}
diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php
index 6b260c39bfb..6039aaaaa0e 100644
--- a/apps/encryption/lib/KeyManager.php
+++ b/apps/encryption/lib/KeyManager.php
@@ -179,8 +179,8 @@ class KeyManager {
return;
}
- $masterKey = $this->getPublicMasterKey();
- if (empty($masterKey)) {
+ $publicMasterKey = $this->getPublicMasterKey();
+ if (empty($publicMasterKey)) {
$keyPair = $this->crypt->createKeyPair();
// Save public key
@@ -193,6 +193,15 @@ class KeyManager {
$header = $this->crypt->generateHeader();
$this->setSystemPrivateKey($this->masterKeyId, $header . $encryptedKey);
}
+
+ if (!$this->session->isPrivateKeySet()) {
+ $masterKey = $this->getSystemPrivateKey($this->masterKeyId);
+ $decryptedMasterKey = $this->crypt->decryptPrivateKey($masterKey, $this->getMasterKeyPassword(), $this->masterKeyId);
+ $this->session->setPrivateKey($decryptedMasterKey);
+ }
+
+ // after the encryption key is available we are ready to go
+ $this->session->setStatus(Session::INIT_SUCCESSFUL);
}
/**
diff --git a/apps/encryption/lib/Migration/SetMasterKeyStatus.php b/apps/encryption/lib/Migration/SetMasterKeyStatus.php
new file mode 100644
index 00000000000..a21d0acae24
--- /dev/null
+++ b/apps/encryption/lib/Migration/SetMasterKeyStatus.php
@@ -0,0 +1,77 @@
+
+ *
+ * @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 .
+ *
+ */
+
+
+namespace OCA\Encryption\Migration;
+
+
+use OCP\IConfig;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+
+/**
+ * Class SetPasswordColumn
+ *
+ * @package OCA\Files_Sharing\Migration
+ */
+class SetMasterKeyStatus implements IRepairStep {
+
+
+ /** @var IConfig */
+ private $config;
+
+
+ public function __construct(IConfig $config) {
+ $this->config = $config;
+ }
+
+ /**
+ * Returns the step's name
+ *
+ * @return string
+ * @since 9.1.0
+ */
+ public function getName() {
+ return 'Write default encryption module configuration to the database';
+ }
+
+ /**
+ * @param IOutput $output
+ */
+ public function run(IOutput $output) {
+ if (!$this->shouldRun()) {
+ return;
+ }
+
+ // if no config for the master key is set we set it explicitly to '0' in
+ // order not to break old installations because the default changed to '1'.
+ $configAlreadySet = $this->config->getAppValue('encryption', 'useMasterKey', false);
+ if ($configAlreadySet === false) {
+ $this->config->setAppValue('encryption', 'useMasterKey', '0');
+ }
+ }
+
+ protected function shouldRun() {
+ $appVersion = $this->config->getAppValue('encryption', 'installed_version', '0.0.0');
+ return version_compare($appVersion, '2.0.0', '<');
+ }
+
+}
diff --git a/apps/encryption/lib/Settings/Personal.php b/apps/encryption/lib/Settings/Personal.php
new file mode 100644
index 00000000000..5b01c224538
--- /dev/null
+++ b/apps/encryption/lib/Settings/Personal.php
@@ -0,0 +1,95 @@
+
+ *
+ * @author Arthur Schiwon
+ *
+ * @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 .
+ *
+ */
+
+namespace OCA\Encryption\Settings;
+
+
+use OCA\Encryption\Session;
+use OCA\Encryption\Util;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
+use OCP\IUserSession;
+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;
+ }
+
+ /**
+ * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+ * @since 9.1
+ */
+ public function getForm() {
+ $recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled');
+ $privateKeySet = $this->session->isPrivateKeySet();
+
+ if (!$recoveryAdminEnabled && $privateKeySet) {
+ return new TemplateResponse('settings', 'settings/empty', [], '');
+ }
+
+ $userId = $this->userSession->getUser()->getUID();
+ $recoveryEnabledForUser = $this->util->isRecoveryEnabledForUser($userId);
+
+ $parameters = [
+ 'recoveryEnabled' => $recoveryAdminEnabled,
+ 'recoveryEnabledForUser' => $recoveryEnabledForUser,
+ 'privateKeySet' => $privateKeySet,
+ 'initialized' => $this->session->getStatus(),
+ ];
+ return new TemplateResponse('encryption', 'settings-personal', $parameters, '');
+ }
+
+ /**
+ * @return string the section ID, e.g. 'sharing'
+ * @since 9.1
+ */
+ public function getSection() {
+ return 'security';
+ }
+
+ /**
+ * @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.
+ *
+ * E.g.: 70
+ * @since 9.1
+ */
+ public function getPriority() {
+ return 80;
+ }
+}
diff --git a/apps/encryption/lib/Util.php b/apps/encryption/lib/Util.php
index 72afa68aad2..d6ae9bd7e5e 100644
--- a/apps/encryption/lib/Util.php
+++ b/apps/encryption/lib/Util.php
@@ -136,7 +136,7 @@ class Util {
* @return bool
*/
public function isMasterKeyEnabled() {
- $userMasterKey = $this->config->getAppValue('encryption', 'useMasterKey', '0');
+ $userMasterKey = $this->config->getAppValue('encryption', 'useMasterKey', '1');
return ($userMasterKey === '1');
}
diff --git a/apps/encryption/settings/settings-personal.php b/apps/encryption/settings/settings-personal.php
deleted file mode 100644
index 66083408881..00000000000
--- a/apps/encryption/settings/settings-personal.php
+++ /dev/null
@@ -1,76 +0,0 @@
-
- * @author Clark Tomlinson
- * @author Thomas Müller
- *
- * @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
- *
- */
-
-$session = new \OCA\Encryption\Session(\OC::$server->getSession());
-$userSession = \OC::$server->getUserSession();
-
-$template = new OCP\Template('encryption', 'settings-personal');
-$crypt = new \OCA\Encryption\Crypto\Crypt(
- \OC::$server->getLogger(),
- $userSession,
- \OC::$server->getConfig(),
- \OC::$server->getL10N('encryption'));
-
-$util = new \OCA\Encryption\Util(
- new \OC\Files\View(),
- $crypt,
- \OC::$server->getLogger(),
- $userSession,
- \OC::$server->getConfig(),
- \OC::$server->getUserManager());
-
-$keyManager = new \OCA\Encryption\KeyManager(
- \OC::$server->getEncryptionKeyStorage(),
- $crypt,
- \OC::$server->getConfig(),
- $userSession,
- $session,
- \OC::$server->getLogger(), $util);
-
-$user = $userSession->getUser()->getUID();
-
-$view = new \OC\Files\View('/');
-
-
-
-$privateKeySet = $session->isPrivateKeySet();
-// did we tried to initialize the keys for this session?
-$initialized = $session->getStatus();
-
-$recoveryAdminEnabled = \OC::$server->getConfig()->getAppValue('encryption', 'recoveryAdminEnabled');
-$recoveryEnabledForUser = $util->isRecoveryEnabledForUser($user);
-
-$result = false;
-
-if ($recoveryAdminEnabled || !$privateKeySet) {
- $template->assign('recoveryEnabled', $recoveryAdminEnabled);
- $template->assign('recoveryEnabledForUser', $recoveryEnabledForUser);
- $template->assign('privateKeySet', $privateKeySet);
- $template->assign('initialized', $initialized);
-
- $result = $template->fetchPage();
-}
-
-return $result;
-
diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index efe9c44ece7..c5f8d9f5536 100644
--- a/apps/encryption/templates/settings-admin.php
+++ b/apps/encryption/templates/settings-admin.php
@@ -7,7 +7,7 @@ style('encryption', 'settings-admin');
?>