Merge branch 'clean-settings-layout' of github.com:andreasjacobsen93/nextcloud-server into clean-settings-layout

.drone.yml

@@ -13,7 +13,7 @@ pipeline:
       matrix:
         TESTS: jsunit
   checkers:
-    image: nextcloudci/php7.0:php7.0-7
+    image: nextcloudci/php7.0:php7.0-13
     commands:
       - ./autotest-checkers.sh
     when:
@@ -23,12 +23,12 @@ pipeline:
     image: nextcloudci/php5.6:php5.6-7
     commands:
       - composer install
-      - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
+      - ./lib/composer/bin/parallel-lint --exclude build/.phan/ --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
     when:
       matrix:
         TESTS: syntax-php5.6
   syntax-php7.0:
-    image: nextcloudci/php7.0:php7.0-7
+    image: nextcloudci/php7.0:php7.0-13
     commands:
       - composer install
       - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
@@ -36,13 +36,24 @@ pipeline:
       matrix:
         TESTS: syntax-php7.0
   syntax-php7.1:
-    image: nextcloudci/php7.1:php7.1-11
+    image: nextcloudci/php7.1:php7.1-12
     commands:
       - composer install
       - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
     when:
       matrix:
         TESTS: syntax-php7.1
+  phan:
+    image: nextcloudci/php7.1:php7.1-12
+    commands:
+      - rm /etc/php/7.1/cli/conf.d/20-xdebug.ini
+      - composer install
+      - composer require --dev "etsy/phan:dev-master"
+      - ./lib/composer/etsy/phan/phan -k build/.phan/config.php
+      - php ./build/.phan/plugin-checker.php
+    when:
+      matrix:
+        TESTS: phan
   litmus-v1:
     image: nextcloudci/litmus-php7.0:litmus-php7.0-4
     commands:
@@ -143,7 +154,7 @@ pipeline:
         DB: NODB
         PHP: 5.6
   nodb-php7.0:
-    image: nextcloudci/php7.0:php7.0-7
+    image: nextcloudci/php7.0:php7.0-13
     commands:
       - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
     when:
@@ -151,7 +162,7 @@ pipeline:
         DB: NODB
         PHP: "7.0"
   nodb-php7.1:
-    image: nextcloudci/php7.1:php7.1-11
+    image: nextcloudci/php7.1:php7.1-12
     commands:
       - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
     when:
@@ -167,7 +178,7 @@ pipeline:
         DB: sqlite
         PHP: 5.6
   sqlite-php7.0:
-    image: nextcloudci/php7.0:php7.0-7
+    image: nextcloudci/php7.0:php7.0-13
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
     when:
@@ -175,7 +186,7 @@ pipeline:
         DB: sqlite
         PHP: "7.0"
   sqlite-php7.1:
-    image: nextcloudci/php7.1:php7.1-11
+    image: nextcloudci/php7.1:php7.1-12
     commands:
       - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
     when:
@@ -199,6 +210,15 @@ pipeline:
       matrix:
         DB: postgres
         PHP: 5.6
+  postgres-php7.0:
+    image: nextcloudci/php7.0:php7.0-13
+    commands:
+      - sleep 10 # gives the database enough time to initialize
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
+    when:
+      matrix:
+        DB: postgres
+        PHP: 7.0
   mysqlmb4-php5.6:
     image: nextcloudci/php5.6:php5.6-7
     commands:
@@ -459,26 +479,26 @@ pipeline:
   acceptance-access-levels:
       image: nextcloudci/integration-php7.0:integration-php7.0-4
       commands:
-        - tests/acceptance/run-local.sh --timeout-multiplier 10 allow-git-repository-modifications features/access-levels.feature
+        - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-access-levels --selenium-server selenium:4444 allow-git-repository-modifications features/access-levels.feature
       when:
         matrix:
           TESTS-ACCEPTANCE: access-levels
   acceptance-app-files:
       image: nextcloudci/integration-php7.0:integration-php7.0-4
       commands:
-        - tests/acceptance/run-local.sh --timeout-multiplier 10 allow-git-repository-modifications features/app-files.feature
+        - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files --selenium-server selenium:4444 allow-git-repository-modifications features/app-files.feature
       when:
         matrix:
           TESTS-ACCEPTANCE: app-files
   acceptance-login:
       image: nextcloudci/integration-php7.0:integration-php7.0-4
       commands:
-        - tests/acceptance/run-local.sh --timeout-multiplier 10 allow-git-repository-modifications features/login.feature
+        - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-login --selenium-server selenium:4444 allow-git-repository-modifications features/login.feature
       when:
         matrix:
           TESTS-ACCEPTANCE: login
   nodb-codecov:
-    image: nextcloudci/php7.0:php7.0-7
+    image: nextcloudci/php7.0:php7.0-13
     commands:
       - TEST_SELECTION=NODB ./autotest.sh sqlite
       - wget https://codecov.io/bash -O codecov.sh
@@ -488,7 +508,7 @@ pipeline:
       matrix:
         TESTS: nodb-codecov
   db-codecov:
-    image: nextcloudci/php7.0:php7.0-7
+    image: nextcloudci/php7.0:php7.0-13
     commands:
       - TEST_SELECTION=QUICKDB ./autotest.sh sqlite
       - wget https://codecov.io/bash -O codecov.sh
@@ -498,7 +518,7 @@ pipeline:
       matrix:
         TESTS: db-codecov
   object-store:
-      image: nextcloudci/php7.0:php7.0-7
+      image: nextcloudci/php7.0:php7.0-13
       commands:
         - TEST_SELECTION=PRIMARY-${OBJECT_STORE} ./autotest.sh sqlite
         - wget https://codecov.io/bash -O codecov.sh
@@ -519,7 +539,7 @@ pipeline:
       matrix:
         TEST: memcache-memcached
   memcache-redis-cluster:
-    image: nextcloudci/php7.0:php7.0-7
+    image: nextcloudci/php7.0:php7.0-13
     commands:
       - sleep 10
       - ./autotest.sh sqlite tests/lib/Memcache/RedisTest.php
@@ -536,6 +556,36 @@ matrix:
       ENABLE_REDIS: true
     - TESTS: db-codecov
       ENABLE_REDIS: true
+    - DB: NODB
+      PHP: 5.6
+      ENABLE_REDIS: true
+    - DB: NODB
+      PHP: 7.0
+      ENABLE_REDIS: true
+    - DB: NODB
+      PHP: 7.1
+      ENABLE_REDIS: true
+    - DB: sqlite
+      PHP: 5.6
+      ENABLE_REDIS: true
+    - DB: sqlite
+      PHP: 7.0
+      ENABLE_REDIS: true
+    - DB: sqlite
+      PHP: 7.1
+      ENABLE_REDIS: true
+    - DB: mysql
+      PHP: 5.6
+      ENABLE_REDIS: true
+    - DB: postgres
+      PHP: 5.6
+      ENABLE_REDIS: true
+    - DB: postgres
+      PHP: 7.0
+      ENABLE_REDIS: true
+    - DB: mysqlmb4
+      PHP: 5.6
+      ENABLE_REDIS: true
     - TESTS: integration-capabilities_features
     - TESTS: integration-federation_features
     - TESTS: integration-maintenance-mode
@@ -564,16 +614,17 @@ matrix:
     - TESTS: integration-transfer-ownership-features
     - TESTS: integration-ldap-features
     - TESTS: integration-trashbin
-#    - TESTS: acceptance
+    - TESTS: acceptance
-#      TESTS-ACCEPTANCE: access-levels
+      TESTS-ACCEPTANCE: access-levels
-#    - TESTS: acceptance
+    - TESTS: acceptance
-#      TESTS-ACCEPTANCE: app-files
+      TESTS-ACCEPTANCE: app-files
-#    - TESTS: acceptance
+    - TESTS: acceptance
-#      TESTS-ACCEPTANCE: login
+      TESTS-ACCEPTANCE: login
     - TESTS: jsunit
     - TESTS: syntax-php5.6
     - TESTS: syntax-php7.0
     - TESTS: syntax-php7.1
+    - TESTS: phan
     - TESTS: litmus-v1
     - TESTS: litmus-v2
     - TESTS: caldavtester-old-endpoint
@@ -589,33 +640,6 @@ matrix:
 #      ENABLE_REDIS_CLUSTER: true
     - TESTS: sqlite-php7.0-webdav-apache
       ENABLE_REDIS: true
-    - DB: NODB
-      PHP: 5.6
-      ENABLE_REDIS: true
-    - DB: NODB
-      PHP: 7.0
-      ENABLE_REDIS: true
-    - DB: NODB
-      PHP: 7.1
-      ENABLE_REDIS: true
-    - DB: sqlite
-      PHP: 5.6
-      ENABLE_REDIS: true
-    - DB: sqlite
-      PHP: 7.0
-      ENABLE_REDIS: true
-    - DB: sqlite
-      PHP: 7.1
-      ENABLE_REDIS: true
-    - DB: mysql
-      PHP: 5.6
-      ENABLE_REDIS: true
-    - DB: postgres
-      PHP: 5.6
-      ENABLE_REDIS: true
-    - DB: mysqlmb4
-      PHP: 5.6
-      ENABLE_REDIS: true
 
 services:
   cache:
@@ -632,7 +656,7 @@ services:
     image: postgres
     environment:
       - POSTGRES_USER=oc_autotest
-      - POSTGRES_PASSWORD=oc_autotest
+      - POSTGRES_PASSWORD=owncloud
     when:
       matrix:
         DB: postgres

.scrutinizer.yml

@@ -1,6 +1,11 @@
 before_commands:
   - 'git submodule update --init --recursive'
 
+checks:
+    php:
+        excluded_dependencies:
+            - etsy/phan
+
 filter:
     excluded_paths:
         - '3rdparty/*'

3rdparty

@@ -1 +1 @@
-Subproject commit cae79927de50c6ab0bf77e5653015b6579ae2aea
+Subproject commit 107e29e4c81d6b255abee5bc77fef3040df6ca07

CHANGELOG.md

@@ -1,20 +1,4 @@
-ChangeLog
+Changelog
 =========
 
-NC 11 (2016-12-13)
+The change log is at [https://nextcloud.com/changelog/](https://nextcloud.com/changelog/).
-------------------
-* PHP 5.4 and 5.5 no longer supported
-* PHP 7.1 support
-* OC_L10N removed use \OCP\IL10N (#1948)
-* Preview handling is improved by sharing previews:
-  * Preview sharing (shared files/external storages)
-  * Previews are stored in the AppData
-  * Previews are served faster by not first converting them to image objects
-* Core preview route changed:
-  * Route for the urlgenerator changed from 'core_ajax_preview' to 'core.Preview.getPreview'
-  * $urlGenerator->linkToRoute('core_ajax_preview', ...) => $urlGenerator->linkToRoute('core.Preview.getPreview', ...)
-* Avatars are cached
-* Avatars are moved to AppData
-  * For existing avatars this happens automatically in a background job which means that on upgrade you might
-    not see your avatar right away. However after the job has run it should show up again automatically.
-

README.md

@@ -32,6 +32,7 @@
 * :clipboard: [Forum](https://help.nextcloud.com)
 * :busts_in_silhouette: [Facebook](https://facebook.com/nextclouders)
 * :hatching_chick: [Twitter](https://twitter.com/Nextclouders)
+* :elephant: [Mastodon](https://mastodon.xyz/@nextcloud)
 
 […learn more about how to get support for Nextcloud here!](https://nextcloud.com/support)
 

apps/comments/appinfo/routes.php

@@ -20,9 +20,8 @@
  *
  */
 
-use \OCA\Comments\AppInfo\Application;
+return [
-
+	'routes' => [
-$application = new Application();
-$application->registerRoutes($this, ['routes' => [
 		['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
-]]);
+	]
+];

apps/comments/l10n/el.js

@@ -8,7 +8,7 @@ OC.L10N.register(
     "Post" : "Δημοσίευση",
     "Cancel" : "Ακύρωση",
     "Edit comment" : "Επεξεργασία σχολίου",
-    "[Deleted user]" : "[Διαγραφή χρήστη]",
+    "[Deleted user]" : "[Διαγραμμένος χρήστης]",
     "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
     "More comments …" : "Περισσότερα σχόλια ...",
     "Save" : "Αποθήκευση",

apps/comments/l10n/el.json

@@ -6,7 +6,7 @@
     "Post" : "Δημοσίευση",
     "Cancel" : "Ακύρωση",
     "Edit comment" : "Επεξεργασία σχολίου",
-    "[Deleted user]" : "[Διαγραφή χρήστη]",
+    "[Deleted user]" : "[Διαγραμμένος χρήστης]",
     "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
     "More comments …" : "Περισσότερα σχόλια ...",
     "Save" : "Αποθήκευση",

apps/comments/l10n/lt_LT.js

@@ -1,8 +1,34 @@
 OC.L10N.register(
     "comments",
     {
-    "Cancel" : "Atšaukti",
+    "Comments" : "Komentarai",
-    "Save" : "Išsaugoti",
+    "Unknown user" : "Nežinomas naudotojas",
-    "Comment" : "Komentaras"
+    "New comment …" : "Naujas komentaras …",
+    "Delete comment" : "Ištrinti komentarą",
+    "Post" : "Įrašas",
+    "Cancel" : "Atsisakyti",
+    "Edit comment" : "Redaguoti komentarą",
+    "[Deleted user]" : "[Ištrintas naudotojas]",
+    "No comments yet, start the conversation!" : "Kol kas komentarų nėra, pradėkite pokalbį!",
+    "More comments …" : "Daugiau komentarų …",
+    "Save" : "Įrašyti",
+    "Allowed characters {count} of {max}" : "Leidžiama simbolių {count} iš {max}",
+    "Error occurred while retrieving comment with id {id}" : "Klaida bandant parodyti komentarą pagal identifikavimo numerį {id}",
+    "Error occurred while updating comment with id {id}" : "Klaida bandant pataisyti komentarą pagal identifikavimo numerį {id}",
+    "Error occurred while posting comment" : "Skelbiant komentarą, įvyko klaida",
+    "_%n unread comment_::_%n unread comments_" : ["%n neskaitytas komentaras","%n neskaityti komentarai","%n neskaitytų komentarų"],
+    "Comment" : "Komentaras",
+    "You commented" : "Jūs pakomentavote",
+    "%1$s commented" : "%1$s pakomentavo",
+    "{author} commented" : "{author} pakomentavo",
+    "You commented on %1$s" : "Pakomentavote %1$s",
+    "You commented on {file}" : "Pakomentavote {file}",
+    "%1$s commented on %2$s" : "%1$s pakomentavo %2$s",
+    "{author} commented on {file}" : "{author} pakomentavo {file}",
+    "<strong>Comments</strong> for files" : "<strong>Failų komentarai</strong>",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Ištrintas vartotojas paminėjo jus komentare \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ištrintas vartotojas paminėjo jus komentare \"{file}\"",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s paminėjo jus komentare \"%2$s\"",
+    "{user} mentioned you in a comment on “{file}”" : "{user} paminėjo jus komentare “{file}”"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");

apps/comments/l10n/lt_LT.json

@@ -1,6 +1,32 @@
 { "translations": {
-    "Cancel" : "Atšaukti",
+    "Comments" : "Komentarai",
-    "Save" : "Išsaugoti",
+    "Unknown user" : "Nežinomas naudotojas",
-    "Comment" : "Komentaras"
+    "New comment …" : "Naujas komentaras …",
+    "Delete comment" : "Ištrinti komentarą",
+    "Post" : "Įrašas",
+    "Cancel" : "Atsisakyti",
+    "Edit comment" : "Redaguoti komentarą",
+    "[Deleted user]" : "[Ištrintas naudotojas]",
+    "No comments yet, start the conversation!" : "Kol kas komentarų nėra, pradėkite pokalbį!",
+    "More comments …" : "Daugiau komentarų …",
+    "Save" : "Įrašyti",
+    "Allowed characters {count} of {max}" : "Leidžiama simbolių {count} iš {max}",
+    "Error occurred while retrieving comment with id {id}" : "Klaida bandant parodyti komentarą pagal identifikavimo numerį {id}",
+    "Error occurred while updating comment with id {id}" : "Klaida bandant pataisyti komentarą pagal identifikavimo numerį {id}",
+    "Error occurred while posting comment" : "Skelbiant komentarą, įvyko klaida",
+    "_%n unread comment_::_%n unread comments_" : ["%n neskaitytas komentaras","%n neskaityti komentarai","%n neskaitytų komentarų"],
+    "Comment" : "Komentaras",
+    "You commented" : "Jūs pakomentavote",
+    "%1$s commented" : "%1$s pakomentavo",
+    "{author} commented" : "{author} pakomentavo",
+    "You commented on %1$s" : "Pakomentavote %1$s",
+    "You commented on {file}" : "Pakomentavote {file}",
+    "%1$s commented on %2$s" : "%1$s pakomentavo %2$s",
+    "{author} commented on {file}" : "{author} pakomentavo {file}",
+    "<strong>Comments</strong> for files" : "<strong>Failų komentarai</strong>",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Ištrintas vartotojas paminėjo jus komentare \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ištrintas vartotojas paminėjo jus komentare \"{file}\"",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s paminėjo jus komentare \"%2$s\"",
+    "{user} mentioned you in a comment on “{file}”" : "{user} paminėjo jus komentare “{file}”"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }

apps/comments/l10n/zh_TW.js

@@ -26,6 +26,8 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s 在 %2$s 留言",
     "{author} commented on {file}" : "{author} 對 {file} 留言",
     "<strong>Comments</strong> for files" : "檔案的<strong>留言</strong>",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "用戶(被刪除)在 “%s” 留言中提到你",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "用戶(被刪除)在 “{file}” 留言中提到你",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s 在 “%2$s” 的留言中提到你",
     "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的留言中提到你"
 },

apps/comments/l10n/zh_TW.json

@@ -24,6 +24,8 @@
     "%1$s commented on %2$s" : "%1$s 在 %2$s 留言",
     "{author} commented on {file}" : "{author} 對 {file} 留言",
     "<strong>Comments</strong> for files" : "檔案的<strong>留言</strong>",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "用戶(被刪除)在 “%s” 留言中提到你",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "用戶(被刪除)在 “{file}” 留言中提到你",
     "%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;"

apps/comments/lib/Activity/Listener.php

@@ -84,7 +84,7 @@ class Listener {
 
 		// Get all mount point owners
 		$cache = $this->mountCollection->getMountCache();
-		$mounts = $cache->getMountsForFileId($event->getComment()->getObjectId());
+		$mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
 		if (empty($mounts)) {
 			return;
 		}
@@ -93,7 +93,7 @@ class Listener {
 		foreach ($mounts as $mount) {
 			$owner = $mount->getUser()->getUID();
 			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById($event->getComment()->getObjectId());
+			$nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
 			if (!empty($nodes)) {
 				/** @var Node $node */
 				$node = array_shift($nodes);

apps/comments/lib/Activity/Provider.php

@@ -147,7 +147,7 @@ class Provider implements IProvider {
 						trim($subjectParameters[1], '/'),
 					]))
 					->setRichSubject($this->l->t('You commented on {file}'), [
-						'file' => $this->generateFileParameter($event->getObjectId(), $subjectParameters[1]),
+						'file' => $this->generateFileParameter((int)$event->getObjectId(), $subjectParameters[1]),
 					]);
 			} else {
 				$author = $this->generateUserParameter($subjectParameters[0]);
@@ -157,7 +157,7 @@ class Provider implements IProvider {
 					]))
 					->setRichSubject($this->l->t('{author} commented on {file}'), [
 						'author' => $author,
-						'file' => $this->generateFileParameter($event->getObjectId(), $subjectParameters[1]),
+						'file' => $this->generateFileParameter((int)$event->getObjectId(), $subjectParameters[1]),
 					]);
 			}
 		} else {
@@ -173,7 +173,7 @@ class Provider implements IProvider {
 	protected function parseMessage(IEvent $event) {
 		$messageParameters = $event->getMessageParameters();
 		try {
-			$comment = $this->commentsManager->get((int) $messageParameters[0]);
+			$comment = $this->commentsManager->get((string) $messageParameters[0]);
 			$message = $comment->getMessage();
 			$message = str_replace("\n", '<br />', str_replace(['<', '>'], ['&lt;', '&gt;'], $message));
 

apps/comments/lib/Controller/Notifications.php

@@ -96,7 +96,7 @@ class Notifications extends Controller {
 			if($comment->getObjectType() !== 'files') {
 				return new NotFoundResponse();
 			}
-			$files = $this->folder->getById($comment->getObjectId());
+			$files = $this->folder->getById((int)$comment->getObjectId());
 			if(count($files) === 0) {
 				$this->markProcessed($comment);
 				return new NotFoundResponse();

apps/comments/lib/Notification/Notifier.php

@@ -94,7 +94,7 @@ class Notifier implements INotifier {
 					throw new \InvalidArgumentException('Unsupported comment object');
 				}
 				$userFolder = $this->rootFolder->getUserFolder($notification->getUser());
-				$nodes = $userFolder->getById($parameters[1]);
+				$nodes = $userFolder->getById((int)$parameters[1]);
 				if(empty($nodes)) {
 					throw new \InvalidArgumentException('Cannot resolve file id to Node instance');
 				}

apps/dav/appinfo/v1/publicwebdav.php

@@ -79,10 +79,12 @@ $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, funct
 	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
 		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE));
 	});
+
 	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
 
+	OC_Util::tearDownFS();
 	OC_Util::setupFS($owner);
-	$ownerView = \OC\Files\Filesystem::getView();
+	$ownerView = new \OC\Files\View('/'. $owner . '/files');
 	$path = $ownerView->getPath($fileId);
 	$fileInfo = $ownerView->getFileInfo($path);
 	$linkCheckPlugin->setFileInfo($fileInfo);

apps/dav/l10n/el.js

@@ -1,11 +1,50 @@
 OC.L10N.register(
     "dav",
     {
+    "Calendar" : "Ημερολόγιο",
+    "Todos" : "Εργασίες προς εκτέλεση",
+    "{actor} created calendar {calendar}" : "{actor} δημιουργήθηκε το ημερολόγιο {calendar}",
+    "You created calendar {calendar}" : "Δημιουργήσατε ημερολόγιο {ημερολόγιο}",
+    "{actor} deleted calendar {calendar}" : "{actor} διέγραψε το ημερολόγιο {calendar}",
+    "You deleted calendar {calendar}" : "Διαγράψατε το ημερολόγιο {calendar}",
+    "{actor} updated calendar {calendar}" : "{actor} ενημέρωσε το ημερολόγιο {calendar}",
+    "You updated calendar {calendar}" : "Έχετε ενημερώσει το ημερολόγιο {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} διαμοιράστηκε το ημερολόγιο {calendar} με εσάς",
+    "You shared calendar {calendar} with {user}" : "Διαμοιραστήκατε το ημερολογίου {calendar} με {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} διαμοίρασε το ημερολόγιο {calendar} με {user}",
+    "{actor} unshared calendar {calendar} from you" : "Ο {actor} σταμάτησε τον διαμοιρασμό του ημερολογίου  {calendar} από εσάς",
+    "You unshared calendar {calendar} from {user}" : "Σταματήσατε τον διαμοιρασμό ημερολογίου  {calendar} από {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "Ο {actor} σταμάτησε τον διαμοιρασμό του ημερολογίου  {calendar} από τον χρήστη {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} σταμάτησε το διαμοιρασμένο ημερολόγιο {calendar} από τον εαυτό τους",
+    "You shared calendar {calendar} with group {group}" : "Διαμοιραστείκατε ένα ημερολόγιο {calendar} με την ομάδα {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "Ο {actor} διαμοιράστηκε το ημερολόγιο {calendar} με την ομάδα {group}",
+    "You unshared calendar {calendar} from group {group}" : "Σταματήσατε τον διαμοιρασμό του ημερολογίου {calendar} από την ομάδα {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} σταμάτησε το διαμοιρασμένο ημερολόγιο {calendar} από την ομάδα {group}",
+    "{actor} created event {event} in calendar {calendar}" : "Ο {actor} δημιούργησε το γεγονός {event} στο ημερολόγιο {calendar}",
+    "You created event {event} in calendar {calendar}" : "Δημιουργήσατε το γεγονός {event} στο ημερολόγιο {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "Ο {actor} διέγραψε το γεγονός {event} από το ημερολόγιο {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "Διαγράψατε το συμβάν {event} από το ημερολόγιο {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "Ο {actor} ενημέρωσε το γεγονός {event} στο ημερολόγιο {calendar}",
+    "You updated event {event} in calendar {calendar}" : "Ενημερώσατε το συμβάν {event} στο ημερολόγιο {calendar}",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} δημιούργησε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
+    "You created todo {todo} in list {calendar}" : "Δημιουργήσατε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
+    "{actor} deleted todo {todo} from list {calendar}" : "Ο {actor} διέγραψε την εκκρεμότητα  {todo} από τη  λίστα {ημερολόγιο}",
+    "You deleted todo {todo} from list {calendar}" : "Διέγραψες την εκκρεμότητα {todo} από τη λίστα {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} ενημέρωσε την εκκρεμότητα {todo} στη λίστα {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ενημέρωσες την εκκρεμότητα {todo} στη λίστα {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} επίλυσε την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Επίλυσες την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} άνοιξε ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Άνοιξες ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "A <strong>calendar</strong> was modified" : "Τροποποιήθηκε ένα <strong>ημερολόγιο</strong> ",
+    "A calendar <strong>event</strong> was modified" : "Τροποποιήθηκε ένα <strong>γεγονός</strong> του ημερολογίου",
+    "A calendar <strong>todo</strong> was modified" : "Ενός ημερολογίου η <strong>εκκρεμότητα</strong> τροποποιήθηκε",
     "Contact birthdays" : "Γενέθλια επαφών",
     "Personal" : "Προσωπικά",
     "Contacts" : "Επαφές",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Τεχνικές λεπτομέρειες",
     "Remote Address: %s" : "Απομακρυσμένη Διεύθυνση: %s",
-    "Request ID: %s" : "Αίτημα ID: %s"
+    "Request ID: %s" : "ID Αιτήματος: %s"
 },
 "nplurals=2; plural=(n != 1);");

apps/dav/l10n/el.json

@@ -1,9 +1,48 @@
 { "translations": {
+    "Calendar" : "Ημερολόγιο",
+    "Todos" : "Εργασίες προς εκτέλεση",
+    "{actor} created calendar {calendar}" : "{actor} δημιουργήθηκε το ημερολόγιο {calendar}",
+    "You created calendar {calendar}" : "Δημιουργήσατε ημερολόγιο {ημερολόγιο}",
+    "{actor} deleted calendar {calendar}" : "{actor} διέγραψε το ημερολόγιο {calendar}",
+    "You deleted calendar {calendar}" : "Διαγράψατε το ημερολόγιο {calendar}",
+    "{actor} updated calendar {calendar}" : "{actor} ενημέρωσε το ημερολόγιο {calendar}",
+    "You updated calendar {calendar}" : "Έχετε ενημερώσει το ημερολόγιο {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} διαμοιράστηκε το ημερολόγιο {calendar} με εσάς",
+    "You shared calendar {calendar} with {user}" : "Διαμοιραστήκατε το ημερολογίου {calendar} με {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} διαμοίρασε το ημερολόγιο {calendar} με {user}",
+    "{actor} unshared calendar {calendar} from you" : "Ο {actor} σταμάτησε τον διαμοιρασμό του ημερολογίου  {calendar} από εσάς",
+    "You unshared calendar {calendar} from {user}" : "Σταματήσατε τον διαμοιρασμό ημερολογίου  {calendar} από {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "Ο {actor} σταμάτησε τον διαμοιρασμό του ημερολογίου  {calendar} από τον χρήστη {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} σταμάτησε το διαμοιρασμένο ημερολόγιο {calendar} από τον εαυτό τους",
+    "You shared calendar {calendar} with group {group}" : "Διαμοιραστείκατε ένα ημερολόγιο {calendar} με την ομάδα {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "Ο {actor} διαμοιράστηκε το ημερολόγιο {calendar} με την ομάδα {group}",
+    "You unshared calendar {calendar} from group {group}" : "Σταματήσατε τον διαμοιρασμό του ημερολογίου {calendar} από την ομάδα {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} σταμάτησε το διαμοιρασμένο ημερολόγιο {calendar} από την ομάδα {group}",
+    "{actor} created event {event} in calendar {calendar}" : "Ο {actor} δημιούργησε το γεγονός {event} στο ημερολόγιο {calendar}",
+    "You created event {event} in calendar {calendar}" : "Δημιουργήσατε το γεγονός {event} στο ημερολόγιο {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "Ο {actor} διέγραψε το γεγονός {event} από το ημερολόγιο {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "Διαγράψατε το συμβάν {event} από το ημερολόγιο {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "Ο {actor} ενημέρωσε το γεγονός {event} στο ημερολόγιο {calendar}",
+    "You updated event {event} in calendar {calendar}" : "Ενημερώσατε το συμβάν {event} στο ημερολόγιο {calendar}",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} δημιούργησε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
+    "You created todo {todo} in list {calendar}" : "Δημιουργήσατε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
+    "{actor} deleted todo {todo} from list {calendar}" : "Ο {actor} διέγραψε την εκκρεμότητα  {todo} από τη  λίστα {ημερολόγιο}",
+    "You deleted todo {todo} from list {calendar}" : "Διέγραψες την εκκρεμότητα {todo} από τη λίστα {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} ενημέρωσε την εκκρεμότητα {todo} στη λίστα {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ενημέρωσες την εκκρεμότητα {todo} στη λίστα {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} επίλυσε την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Επίλυσες την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} άνοιξε ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Άνοιξες ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "A <strong>calendar</strong> was modified" : "Τροποποιήθηκε ένα <strong>ημερολόγιο</strong> ",
+    "A calendar <strong>event</strong> was modified" : "Τροποποιήθηκε ένα <strong>γεγονός</strong> του ημερολογίου",
+    "A calendar <strong>todo</strong> was modified" : "Ενός ημερολογίου η <strong>εκκρεμότητα</strong> τροποποιήθηκε",
     "Contact birthdays" : "Γενέθλια επαφών",
     "Personal" : "Προσωπικά",
     "Contacts" : "Επαφές",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Τεχνικές λεπτομέρειες",
     "Remote Address: %s" : "Απομακρυσμένη Διεύθυνση: %s",
-    "Request ID: %s" : "Αίτημα ID: %s"
+    "Request ID: %s" : "ID Αιτήματος: %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dav/l10n/sq.js

@@ -3,7 +3,7 @@ OC.L10N.register(
     {
     "Calendar" : "Kalendar",
     "Todos" : "Për tu bërë",
-    "{actor} created calendar {calendar}" : "{actor} krijoj kalendarin {calendar}",
+    "{actor} created calendar {calendar}" : "{aktori} krijoi kalendarin {kalendarin}",
     "You created calendar {calendar}" : "Ju krijuat kalendarin {calendar}",
     "{actor} deleted calendar {calendar}" : "{actor} fshiu kalendarin {calendar}",
     "You deleted calendar {calendar}" : "Ju fshit kalendarin {calendar}",
@@ -31,11 +31,18 @@ OC.L10N.register(
     "{actor} deleted todo {todo} from list {calendar}" : "{actor} u fshi todo{ todo} nga lista{calendar}",
     "You deleted todo {todo} from list {calendar}" : "Ju fshit todo{todo} nga lista {calendar}",
     "{actor} updated todo {todo} in list {calendar}" : "{actor} u përditësua todo{todo} në listën{calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ju përditësuat përtëbërë {todo} në listën{calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} zgjidhi përtëbërë {todo} në listën {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Ju zgjidhët përtëbërë {todo} në listën {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} rihapi përtëbërë {todo} në listën {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Ju rihapët përtëbërë {todo} në listën {calendar}",
     "A <strong>calendar</strong> was modified" : "Një <strong>kalendar</strong> u modifikua",
     "A calendar <strong>event</strong> was modified" : "Një <strong>event</strong> në kalendar u modifikua",
     "A calendar <strong>todo</strong> was modified" : "Një kalendar <strong>todo<strong> u modifikua",
+    "Contact birthdays" : "Ditëlindjet e kontakteve",
     "Personal" : "Personale",
     "Contacts" : "Kontaktet",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Detaje teknike",
     "Remote Address: %s" : "Adresa remote: %s",
     "Request ID: %s" : "ID e kërkesës: %s"

apps/dav/l10n/sq.json

@@ -1,7 +1,7 @@
 { "translations": {
     "Calendar" : "Kalendar",
     "Todos" : "Për tu bërë",
-    "{actor} created calendar {calendar}" : "{actor} krijoj kalendarin {calendar}",
+    "{actor} created calendar {calendar}" : "{aktori} krijoi kalendarin {kalendarin}",
     "You created calendar {calendar}" : "Ju krijuat kalendarin {calendar}",
     "{actor} deleted calendar {calendar}" : "{actor} fshiu kalendarin {calendar}",
     "You deleted calendar {calendar}" : "Ju fshit kalendarin {calendar}",
@@ -29,11 +29,18 @@
     "{actor} deleted todo {todo} from list {calendar}" : "{actor} u fshi todo{ todo} nga lista{calendar}",
     "You deleted todo {todo} from list {calendar}" : "Ju fshit todo{todo} nga lista {calendar}",
     "{actor} updated todo {todo} in list {calendar}" : "{actor} u përditësua todo{todo} në listën{calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ju përditësuat përtëbërë {todo} në listën{calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} zgjidhi përtëbërë {todo} në listën {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Ju zgjidhët përtëbërë {todo} në listën {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} rihapi përtëbërë {todo} në listën {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Ju rihapët përtëbërë {todo} në listën {calendar}",
     "A <strong>calendar</strong> was modified" : "Një <strong>kalendar</strong> u modifikua",
     "A calendar <strong>event</strong> was modified" : "Një <strong>event</strong> në kalendar u modifikua",
     "A calendar <strong>todo</strong> was modified" : "Një kalendar <strong>todo<strong> u modifikua",
+    "Contact birthdays" : "Ditëlindjet e kontakteve",
     "Personal" : "Personale",
     "Contacts" : "Kontaktet",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Detaje teknike",
     "Remote Address: %s" : "Adresa remote: %s",
     "Request ID: %s" : "ID e kërkesës: %s"

apps/dav/lib/CalDAV/Activity/Provider/Calendar.php

@@ -168,32 +168,32 @@ class Calendar extends Base {
 			case self::SUBJECT_UNSHARE_USER . '_self':
 				return [
 					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateCalendarParameter((int)$event->getObjectId(), $parameters[1]),
 				];
 			case self::SUBJECT_SHARE_USER . '_you':
 			case self::SUBJECT_UNSHARE_USER . '_you':
 				return [
 					'user' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateCalendarParameter((int)$event->getObjectId(), $parameters[1]),
 				];
 			case self::SUBJECT_SHARE_USER . '_by':
 			case self::SUBJECT_UNSHARE_USER . '_by':
 				return [
 					'user' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateCalendarParameter((int)$event->getObjectId(), $parameters[1]),
 					'actor' => $this->generateUserParameter($parameters[2]),
 				];
 			case self::SUBJECT_SHARE_GROUP . '_you':
 			case self::SUBJECT_UNSHARE_GROUP . '_you':
 				return [
 					'group' => $this->generateGroupParameter($parameters[0]),
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateCalendarParameter((int)$event->getObjectId(), $parameters[1]),
 				];
 			case self::SUBJECT_SHARE_GROUP . '_by':
 			case self::SUBJECT_UNSHARE_GROUP . '_by':
 				return [
 					'group' => $this->generateGroupParameter($parameters[0]),
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateCalendarParameter((int)$event->getObjectId(), $parameters[1]),
 					'actor' => $this->generateUserParameter($parameters[2]),
 				];
 		}

apps/dav/lib/CalDAV/Activity/Provider/Event.php

@@ -124,14 +124,14 @@ class Event extends Base {
 			case self::SUBJECT_OBJECT_UPDATE . '_event':
 				return [
 					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateCalendarParameter((int)$event->getObjectId(), $parameters[1]),
 					'event' => $this->generateObjectParameter($parameters[2]),
 				];
 			case self::SUBJECT_OBJECT_ADD . '_event_self':
 			case self::SUBJECT_OBJECT_DELETE . '_event_self':
 			case self::SUBJECT_OBJECT_UPDATE . '_event_self':
 				return [
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateCalendarParameter((int)$event->getObjectId(), $parameters[1]),
 					'event' => $this->generateObjectParameter($parameters[2]),
 				];
 		}

apps/dav/lib/CalDAV/Activity/Provider/Todo.php

@@ -95,7 +95,7 @@ class Todo extends Event {
 			case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
 				return [
 					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateCalendarParameter((int)$event->getObjectId(), $parameters[1]),
 					'todo' => $this->generateObjectParameter($parameters[2]),
 				];
 			case self::SUBJECT_OBJECT_ADD . '_todo_self':
@@ -104,7 +104,7 @@ class Todo extends Event {
 			case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
 			case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
 				return [
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateCalendarParameter((int)$event->getObjectId(), $parameters[1]),
 					'todo' => $this->generateObjectParameter($parameters[2]),
 				];
 		}

apps/dav/lib/CalDAV/BirthdayService.php

@@ -270,7 +270,7 @@ class BirthdayService {
 	 * @param string  $cardData
 	 * @param array $book
 	 * @param int $calendarId
-	 * @param string $type
+	 * @param string[] $type
 	 */
 	private function updateCalendar($cardUri, $cardData, $book, $calendarId, $type) {
 		$objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics';

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -50,6 +50,7 @@ use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\DateTimeParser;
 use Sabre\VObject\Reader;
 use Sabre\VObject\Recur\EventIterator;
+use Sabre\Uri;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
@@ -318,7 +319,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 				}
 			}
 
-			list(, $name) = URLUtil::splitPath($row['principaluri']);
+			list(, $name) = Uri\split($row['principaluri']);
 			$uri = $row['uri'] . '_shared_by_' . $name;
 			$row['displayname'] = $row['displayname'] . ' (' . $this->getUserDisplayName($name) . ')';
 			$components = [];
@@ -432,7 +433,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 			->execute();
 
 		while($row = $result->fetch()) {
-			list(, $name) = URLUtil::splitPath($row['principaluri']);
+			list(, $name) = Uri\split($row['principaluri']);
 			$row['displayname'] = $row['displayname'] . "($name)";
 			$components = [];
 			if ($row['components']) {
@@ -498,7 +499,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 			throw new NotFound('Node with name \'' . $uri . '\' could not be found');
 		}
 
-		list(, $name) = URLUtil::splitPath($row['principaluri']);
+		list(, $name) = Uri\split($row['principaluri']);
 		$row['displayname'] = $row['displayname'] . ' ' . "($name)";
 		$components = [];
 		if ($row['components']) {
@@ -635,6 +636,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param string $calendarUri
 	 * @param array $properties
 	 * @return int
+	 * @suppress SqlInjectionChecker
 	 */
 	function createCalendar($principalUri, $calendarUri, array $properties) {
 		$values = [
@@ -695,6 +697,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 *
 	 * Read the PropPatch documentation for more info and examples.
 	 *
+	 * @param mixed $calendarId
 	 * @param PropPatch $propPatch
 	 * @return void
 	 */
@@ -702,6 +705,9 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 		$supportedProperties = array_keys($this->propertyMap);
 		$supportedProperties[] = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
 
+		/**
+		 * @suppress SqlInjectionChecker
+		 */
 		$propPatch->handle($supportedProperties, function($mutations) use ($calendarId) {
 			$newValues = [];
 			foreach ($mutations as $propertyName => $propertyValue) {
@@ -1152,7 +1158,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 				$requirePostFilter = false;
 			}
 			// There was a time-range filter
-			if ($componentType == 'VEVENT' && isset($filters['comp-filters'][0]['time-range'])) {
+			if ($componentType === 'VEVENT' && isset($filters['comp-filters'][0]['time-range'])) {
 				$timeRange = $filters['comp-filters'][0]['time-range'];
 
 				// If start time OR the end time is not specified, we can do a
@@ -1618,6 +1624,9 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 		$supportedProperties = array_keys($this->subscriptionPropertyMap);
 		$supportedProperties[] = '{http://calendarserver.org/ns/}source';
 
+		/**
+		 * @suppress SqlInjectionChecker
+		 */
 		$propPatch->handle($supportedProperties, function($mutations) use ($subscriptionId) {
 
 			$newValues = [];
@@ -1925,7 +1934,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	public function setPublishStatus($value, $calendar) {
 		$query = $this->db->getQueryBuilder();
 		if ($value) {
-			$publicUri = $this->random->generate(16, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
+			$publicUri = $this->random->generate(16, ISecureRandom::CHAR_HUMAN_READABLE);
 			$query->insert('dav_shares')
 				->values([
 					'principaluri' => $query->createNamedParameter($calendar->getPrincipalURI()),
@@ -2096,7 +2105,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 
 	private function convertPrincipal($principalUri, $toV2) {
 		if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
-			list(, $name) = URLUtil::splitPath($principalUri);
+			list(, $name) = Uri\split($principalUri);
 			if ($toV2 === true) {
 				return "principals/users/$name";
 			}

apps/dav/lib/CalDAV/Plugin.php

@@ -31,7 +31,7 @@ class Plugin extends \Sabre\CalDAV\Plugin {
 	function getCalendarHomeForPrincipal($principalUrl) {
 
 		if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
-			list(, $principalId) = URLUtil::splitPath($principalUrl);
+			list(, $principalId) = \Sabre\Uri\split($principalUrl);
 			return self::CALENDAR_ROOT .'/' . $principalId;
 		}
 

apps/dav/lib/CalDAV/Search/SearchPlugin.php

@@ -134,7 +134,7 @@ class SearchPlugin extends ServerPlugin {
 
 		// If we're dealing with the calendar home, the calendar home itself is
 		// responsible for the calendar-query
-		if ($node instanceof CalendarHome && $depth == 2) {
+		if ($node instanceof CalendarHome && $depth === 2) {
 
 			$nodePaths = $node->calendarSearch($report->filters, $report->limit, $report->offset);
 

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -196,7 +196,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 				}
 			}
 
-			list(, $name) = URLUtil::splitPath($row['principaluri']);
+			list(, $name) = \Sabre\Uri\split($row['principaluri']);
 			$uri = $row['uri'] . '_shared_by_' . $name;
 			$displayName = $row['displayname'] . ' (' . $this->getUserDisplayName($name) . ')';
 
@@ -348,6 +348,9 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 			'{' . Plugin::NS_CARDDAV . '}addressbook-description',
 		];
 
+		/**
+		 * @suppress SqlInjectionChecker
+		 */
 		$propPatch->handle($supportedProperties, function($mutations) use ($addressBookId) {
 
 			$updates = [];
@@ -1016,7 +1019,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 			}
 			$preferred = 0;
 			foreach($property->parameters as $parameter) {
-				if ($parameter->name == 'TYPE' && strtoupper($parameter->getValue()) == 'PREF') {
+				if ($parameter->name === 'TYPE' && strtoupper($parameter->getValue()) === 'PREF') {
 					$preferred = 1;
 					break;
 				}
@@ -1088,7 +1091,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 
 	private function convertPrincipal($principalUri, $toV2) {
 		if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
-			list(, $name) = URLUtil::splitPath($principalUri);
+			list(, $name) = \Sabre\Uri\split($principalUri);
 			if ($toV2 === true) {
 				return "principals/users/$name";
 			}

apps/dav/lib/CardDAV/Plugin.php

@@ -44,15 +44,15 @@ class Plugin extends \Sabre\CardDAV\Plugin {
 	protected function getAddressbookHomeForPrincipal($principal) {
 
 		if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
-			list(, $principalId) = URLUtil::splitPath($principal);
+			list(, $principalId) = \Sabre\Uri\split($principal);
 			return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
 		}
 		if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
-			list(, $principalId) = URLUtil::splitPath($principal);
+			list(, $principalId) = \Sabre\Uri\split($principal);
 			return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
 		}
 		if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
-			list(, $principalId) = URLUtil::splitPath($principal);
+			list(, $principalId) = \Sabre\Uri\split($principal);
 			return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
 		}
 

apps/dav/lib/Connector/LegacyDAVACL.php

@@ -51,7 +51,7 @@ class LegacyDAVACL extends DavAclPlugin {
 	}
 
 	private function convertPrincipal($principal, $toV2) {
-		list(, $name) = URLUtil::splitPath($principal);
+		list(, $name) = \Sabre\Uri\split($principal);
 		if ($toV2) {
 			return "principals/users/$name";
 		}

apps/dav/lib/Connector/Sabre/Directory.php

@@ -225,7 +225,7 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node
 			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
 		}
 
-		if ($info['mimetype'] == 'httpd/unix-directory') {
+		if ($info['mimetype'] === 'httpd/unix-directory') {
 			$node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree, $this->shareManager);
 		} else {
 			$node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info, $this->shareManager);
@@ -387,7 +387,7 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node
 			throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory ' . $sourceNode->getName() . ', target exists');
 		}
 
-		list($sourceDir,) = \Sabre\HTTP\URLUtil::splitPath($sourceNode->getPath());
+		list($sourceDir,) = \Sabre\Uri\split($sourceNode->getPath());
 		$destinationDir = $this->getPath();
 
 		$sourcePath = $sourceNode->getPath();

apps/dav/lib/Connector/Sabre/File.php

@@ -146,8 +146,8 @@ class File extends Node implements IFile {
 			// double check if the file was fully received
 			// compare expected and actual size
 			if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
-				$expected = $_SERVER['CONTENT_LENGTH'];
+				$expected = (int) $_SERVER['CONTENT_LENGTH'];
-				if ($count != $expected) {
+				if ($count !== $expected) {
 					throw new BadRequest('expected filesize ' . $expected . ' got ' . $count);
 				}
 			}
@@ -396,7 +396,7 @@ class File extends Node implements IFile {
 	 * @throws ServiceUnavailable
 	 */
 	private function createFileChunked($data) {
-		list($path, $name) = \Sabre\HTTP\URLUtil::splitPath($this->path);
+		list($path, $name) = \Sabre\Uri\split($this->path);
 
 		$info = \OC_FileChunking::decodeName($name);
 		if (empty($info)) {
@@ -409,8 +409,8 @@ class File extends Node implements IFile {
 		//detect aborted upload
 		if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
 			if (isset($_SERVER['CONTENT_LENGTH'])) {
-				$expected = $_SERVER['CONTENT_LENGTH'];
+				$expected = (int) $_SERVER['CONTENT_LENGTH'];
-				if ($bytesWritten != $expected) {
+				if ($bytesWritten !== $expected) {
 					$chunk_handler->remove($info['index']);
 					throw new BadRequest(
 						'expected filesize ' . $expected . ' got ' . $bytesWritten);

apps/dav/lib/Connector/Sabre/FilesPlugin.php

@@ -196,12 +196,12 @@ class FilesPlugin extends ServerPlugin {
 		if (!$sourceNode instanceof Node) {
 			return;
 		}
-		list($sourceDir,) = \Sabre\HTTP\URLUtil::splitPath($source);
+		list($sourceDir,) = \Sabre\Uri\split($source);
-		list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destination);
+		list($destinationDir,) = \Sabre\Uri\split($destination);
 
 		if ($sourceDir !== $destinationDir) {
 			$sourceNodeFileInfo = $sourceNode->getFileInfo();
-			if (is_null($sourceNodeFileInfo)) {
+			if ($sourceNodeFileInfo === null) {
 				throw new NotFound($source . ' does not exist');
  			}
 
@@ -434,7 +434,7 @@ class FilesPlugin extends ServerPlugin {
 	public function sendFileIdHeader($filePath, \Sabre\DAV\INode $node = null) {
 		// chunked upload handling
 		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			list($path, $name) = \Sabre\HTTP\URLUtil::splitPath($filePath);
+			list($path, $name) = \Sabre\Uri\split($filePath);
 			$info = \OC_FileChunking::decodeName($name);
 			if (!empty($info)) {
 				$filePath = $path . '/' . $info['name'];

apps/dav/lib/Connector/Sabre/Node.php

@@ -126,8 +126,8 @@ abstract class Node implements \Sabre\DAV\INode {
 			throw new \Sabre\DAV\Exception\Forbidden();
 		}
 
-		list($parentPath,) = \Sabre\HTTP\URLUtil::splitPath($this->path);
+		list($parentPath,) = \Sabre\Uri\split($this->path);
-		list(, $newName) = \Sabre\HTTP\URLUtil::splitPath($name);
+		list(, $newName) = \Sabre\Uri\split($name);
 
 		// verify path of the target
 		$this->verifyPath();

apps/dav/lib/Connector/Sabre/ObjectTree.php

@@ -80,8 +80,8 @@ class ObjectTree extends \Sabre\DAV\Tree {
 	private function resolveChunkFile($path) {
 		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
 			// resolve to real file name to find the proper node
-			list($dir, $name) = \Sabre\HTTP\URLUtil::splitPath($path);
+			list($dir, $name) = \Sabre\Uri\split($path);
-			if ($dir == '/' || $dir == '.') {
+			if ($dir === '/' || $dir === '.') {
 				$dir = '';
 			}
 
@@ -221,7 +221,7 @@ class ObjectTree extends \Sabre\DAV\Tree {
 		// this will trigger existence check
 		$this->getNodeForPath($source);
 
-		list($destinationDir, $destinationName) = \Sabre\HTTP\URLUtil::splitPath($destination);
+		list($destinationDir, $destinationName) = \Sabre\Uri\split($destination);
 		try {
 			$this->fileView->verifyPath($destinationDir, $destinationName);
 		} catch (\OCP\Files\InvalidPathException $ex) {
@@ -238,7 +238,7 @@ class ObjectTree extends \Sabre\DAV\Tree {
 			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
 		}
 
-		list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destination);
+		list($destinationDir,) = \Sabre\Uri\split($destination);
 		$this->markDirty($destinationDir);
 	}
 }

apps/dav/lib/Connector/Sabre/Principal.php

@@ -100,7 +100,7 @@ class Principal implements BackendInterface {
 	 * @return array
 	 */
 	public function getPrincipalByPath($path) {
-		list($prefix, $name) = URLUtil::splitPath($path);
+		list($prefix, $name) = \Sabre\Uri\split($path);
 
 		if ($prefix === $this->principalPrefix) {
 			$user = $this->userManager->get($name);
@@ -138,7 +138,7 @@ class Principal implements BackendInterface {
 	 * @throws Exception
 	 */
 	public function getGroupMembership($principal, $needGroups = false) {
-		list($prefix, $name) = URLUtil::splitPath($principal);
+		list($prefix, $name) = \Sabre\Uri\split($principal);
 
 		if ($prefix === $this->principalPrefix) {
 			$user = $this->userManager->get($name);

apps/dav/lib/Connector/Sabre/QuotaPlugin.php

@@ -91,7 +91,7 @@ class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
 			if (substr($uri, 0, 1) !== '/') {
 				$uri = '/' . $uri;
 			}
-			list($parentUri, $newName) = URLUtil::splitPath($uri);
+			list($parentUri, $newName) = \Sabre\Uri\split($uri);
 			if(is_null($parentUri)) {
 				$parentUri = '';
 			}

apps/dav/lib/DAV/Sharing/Backend.php

@@ -170,7 +170,7 @@ class Backend {
 				'href' => "principal:${row['principaluri']}",
 				'commonName' => isset($p['{DAV:}displayname']) ? $p['{DAV:}displayname'] : '',
 				'status' => 1,
-				'readOnly' => ($row['access'] == self::ACCESS_READ),
+				'readOnly' => ((int) $row['access'] === self::ACCESS_READ),
 				'{http://owncloud.org/ns}principal' => $row['principaluri'],
 				'{http://owncloud.org/ns}group-share' => is_null($p)
 			];

apps/dav/lib/DAV/SystemPrincipalBackend.php

@@ -163,7 +163,7 @@ class SystemPrincipalBackend extends AbstractBackend {
 	 * @return array
 	 */
 	function getGroupMembership($principal) {
-		list($prefix, $name) = URLUtil::splitPath($principal);
+		list($prefix, $name) = \Sabre\Uri\split($principal);
 
 		if ($prefix === 'principals/system') {
 			$principal = $this->getPrincipalByPath($principal);

apps/dav/lib/Files/FilesHome.php

@@ -53,7 +53,7 @@ class FilesHome extends Directory {
 	}
 
 	function getName() {
-		list(,$name) = URLUtil::splitPath($this->principalInfo['uri']);
+		list(,$name) = \Sabre\Uri\split($this->principalInfo['uri']);
 		return $name;
 	}
 

apps/dav/lib/Files/RootCollection.php

@@ -39,7 +39,7 @@ class RootCollection extends AbstractPrincipalCollection {
 	 * @return INode
 	 */
 	function getChildForPrincipal(array $principalInfo) {
-		list(,$name) = URLUtil::splitPath($principalInfo['uri']);
+		list(,$name) = \Sabre\Uri\split($principalInfo['uri']);
 		$user = \OC::$server->getUserSession()->getUser();
 		if (is_null($user) || $name !== $user->getUID()) {
 			// a user is only allowed to see their own home contents, so in case another collection

apps/dav/lib/Upload/AssemblyStream.php

@@ -20,6 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OCA\DAV\Upload;
 
 use Sabre\DAV\IFile;
@@ -44,15 +45,15 @@ class AssemblyStream implements \Icewind\Streams\File {
 	/** @var int */
 	private $pos = 0;
 
-	/** @var array */
-	private $sortedNodes;
-
 	/** @var int */
-	private $size;
+	private $size = 0;
 
 	/** @var resource */
 	private $currentStream = null;
 
+	/** @var int */
+	private $currentNode = 0;
+
 	/**
 	 * @param string $path
 	 * @param string $mode
@@ -63,24 +64,18 @@ class AssemblyStream implements \Icewind\Streams\File {
 	public function stream_open($path, $mode, $options, &$opened_path) {
 		$this->loadContext('assembly');
 
-		// sort the nodes
 		$nodes = $this->nodes;
 		// http://stackoverflow.com/a/10985500
-		@usort($nodes, function(IFile $a, IFile $b) {
+		@usort($nodes, function (IFile $a, IFile $b) {
 			return strnatcmp($a->getName(), $b->getName());
 		});
-		$this->nodes = $nodes;
+		$this->nodes = array_values($nodes);
-
+		if (count($this->nodes) > 0) {
-		// build additional information
+			$this->currentStream = $this->getStream($this->nodes[0]);
-		$this->sortedNodes = [];
-		$start = 0;
-		foreach($this->nodes as $node) {
-			$size = $node->getSize();
-			$name = $node->getName();
-			$this->sortedNodes[$name] = ['node' => $node, 'start' => $start, 'end' => $start + $size];
-			$start += $size;
-			$this->size = $start;
 		}
+		$this->size = array_reduce($this->nodes, function ($size, IFile $file) {
+			return $size + $file->getSize();
+		}, 0);
 		return true;
 	}
 
@@ -105,36 +100,27 @@ class AssemblyStream implements \Icewind\Streams\File {
 	 * @return string
 	 */
 	public function stream_read($count) {
-		do {
+		if (is_null($this->currentStream)) {
-			if ($this->currentStream === null) {
-				list($node, $posInNode) = $this->getNodeForPosition($this->pos);
-				if (is_null($node)) {
-					// reached last node, no more data
 			return '';
 		}
-				$this->currentStream = $this->getStream($node);
-				fseek($this->currentStream, $posInNode);
-			}
 
+		do {
 			$data = fread($this->currentStream, $count);
-			// isset is faster than strlen
-			if (isset($data[$count - 1])) {
-				// we read the full count
-				$read = $count;
-			} else {
-				// reaching end of stream, which happens less often so strlen is ok
 			$read = strlen($data);
-			}
 
 			if (feof($this->currentStream)) {
 				fclose($this->currentStream);
-				$this->currentNode = null;
+				$this->currentNode++;
+				if ($this->currentNode < count($this->nodes)) {
+					$this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
+				} else {
 					$this->currentStream = null;
 				}
+			}
 			// if no data read, try again with the next node because
 			// returning empty data can make the caller think there is no more
 			// data left to read
-		} while ($read === 0);
+		} while ($read === 0 && !is_null($this->currentStream));
 
 		// update position
 		$this->pos += $read;
@@ -235,9 +221,10 @@ class AssemblyStream implements \Icewind\Streams\File {
 	public static function wrap(array $nodes) {
 		$context = stream_context_create([
 			'assembly' => [
-				'nodes' => $nodes]
+				'nodes' => $nodes
+			]
 		]);
-		stream_wrapper_register('assembly', '\OCA\DAV\Upload\AssemblyStream');
+		stream_wrapper_register('assembly', self::class);
 		try {
 			$wrapped = fopen('assembly://', 'r', null, $context);
 		} catch (\BadMethodCallException $e) {
@@ -248,19 +235,6 @@ class AssemblyStream implements \Icewind\Streams\File {
 		return $wrapped;
 	}
 
-	/**
-	 * @param $pos
-	 * @return IFile | null
-	 */
-	private function getNodeForPosition($pos) {
-		foreach($this->sortedNodes as $node) {
-			if ($pos >= $node['start'] && $pos < $node['end']) {
-				return [$node['node'], $pos - $node['start']];
-			}
-		}
-		return null;
-	}
-
 	/**
 	 * @param IFile $node
 	 * @return resource
@@ -269,9 +243,11 @@ class AssemblyStream implements \Icewind\Streams\File {
 		$data = $node->get();
 		if (is_resource($data)) {
 			return $data;
+		} else {
+			$tmp = fopen('php://temp', 'w+');
+			fwrite($tmp, $data);
+			rewind($tmp);
+			return $tmp;
 		}
-
-		return fopen('data://text/plain,' . $data,'r');
 	}
-
 }

apps/encryption/l10n/el.js

@@ -3,7 +3,7 @@ OC.L10N.register(
     {
     "Missing recovery key password" : "Λείπει το κλειδί επαναφοράς κωδικού",
     "Please repeat the recovery key password" : "Παρακαλώ επαναλάβετε το κλειδί επαναφοράς κωδικού",
-    "Repeated recovery key password does not match the provided recovery key password" : "Η επανάληψη του κλειδιού επαναφοράς κωδικού δεν ταιριάζει με το δοσμένο κλειδί επαναφοράς κωδικού",
+    "Repeated recovery key password does not match the provided recovery key password" : "Ο επαναλαμβανόμενος κωδικός πρόσβασης ανάκτησης δεν ταιριάζει με τον παρεχόμενο κωδικό πρόσβασης κλειδιού ανάκτησης",
     "Recovery key successfully enabled" : "Επιτυχής ενεργοποίηση κλειδιού ανάκτησης",
     "Could not enable recovery key. Please check your recovery key password!" : "Αποτυχία ενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
     "Recovery key successfully disabled" : "Επιτυχής απενεργοποίηση κλειδιού ανάκτησης",
@@ -23,6 +23,8 @@ OC.L10N.register(
     "Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
     "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" : "Ελλιπής υπογραφή",

apps/encryption/l10n/el.json

@@ -1,7 +1,7 @@
 { "translations": {
     "Missing recovery key password" : "Λείπει το κλειδί επαναφοράς κωδικού",
     "Please repeat the recovery key password" : "Παρακαλώ επαναλάβετε το κλειδί επαναφοράς κωδικού",
-    "Repeated recovery key password does not match the provided recovery key password" : "Η επανάληψη του κλειδιού επαναφοράς κωδικού δεν ταιριάζει με το δοσμένο κλειδί επαναφοράς κωδικού",
+    "Repeated recovery key password does not match the provided recovery key password" : "Ο επαναλαμβανόμενος κωδικός πρόσβασης ανάκτησης δεν ταιριάζει με τον παρεχόμενο κωδικό πρόσβασης κλειδιού ανάκτησης",
     "Recovery key successfully enabled" : "Επιτυχής ενεργοποίηση κλειδιού ανάκτησης",
     "Could not enable recovery key. Please check your recovery key password!" : "Αποτυχία ενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
     "Recovery key successfully disabled" : "Επιτυχής απενεργοποίηση κλειδιού ανάκτησης",
@@ -21,6 +21,8 @@
     "Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
     "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" : "Ελλιπής υπογραφή",

apps/encryption/l10n/es_MX.js

@@ -30,7 +30,7 @@ OC.L10N.register(
     "Missing Signature" : "Firma faltante",
     "one-time password for server-side-encryption" : "Contraseña de una-sola-vez para la encripción del lado del servidor",
     "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.",
+    "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 compartido. 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. 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.",

apps/encryption/l10n/es_MX.json

@@ -28,7 +28,7 @@
     "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. 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.",
+    "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 compartido. 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. 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.",

apps/encryption/l10n/it.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" : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova. Esegui 'occ encryption:migrate' o contatta il tuo amministratore",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati.",
     "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate. Disconnettiti ed effettua nuovamente l'accesso.",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Abilita la cifratura lato server nelle impostazioni di amministrazione per utilizzare il modulo di cifratura.",
     "Encryption app is enabled and ready" : "L'applicazione Cifratura è abilitata e pronta",
     "Bad Signature" : "Firma non valida",
     "Missing Signature" : "Firma mancante",

apps/encryption/l10n/it.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" : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova. Esegui 'occ encryption:migrate' o contatta il tuo amministratore",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati.",
     "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate. Disconnettiti ed effettua nuovamente l'accesso.",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Abilita la cifratura lato server nelle impostazioni di amministrazione per utilizzare il modulo di cifratura.",
     "Encryption app is enabled and ready" : "L'applicazione Cifratura è abilitata e pronta",
     "Bad Signature" : "Firma non valida",
     "Missing Signature" : "Firma mancante",

apps/encryption/l10n/ja.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" : "署名が存在しません",
@@ -31,7 +32,7 @@ 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." : "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを読み取ることができません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
     "Default encryption module" : "デフォルトの暗号化モジュール",
-    "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" : "こんにちは、\n\n管理者がサーバーサイド暗号化を有効にしました。'%s'というパスワードであなたのファイルが暗号化されました。\n\nWeb画面からログインして、個人設定画面の'基本暗号化モジュール' セクションにいき、暗号化パスワードの更新をお願いします。 '旧ログインパスワード'部分に上記パスワードを入力し、現在のログインパスワードで更新します。\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" : "こんにちは\n\n管理者がサーバーサイド暗号化を有効にしました。'%s'というパスワードであなたのファイルが暗号化されました。\n\nWeb画面からログインして、個人設定画面の'基本暗号化モジュール' セクションにいき、暗号化パスワードの更新をお願いします。 '旧ログインパスワード'部分に上記パスワードを入力し、現在のログインパスワードで更新します。\n",
     "The share will expire on %s." : "共有は %s で有効期限が切れます。",
     "Cheers!" : "それでは！",
     "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "こんにちは、<br><br>管理者がサーバーサイド暗号化を有効にしました。<strong>%s</strong>というパスワードであなたのファイルが暗号化されました。<br><br>Web画面からログインして、個人設定画面の\"基本暗号化モジュール\"のセクションにいき、暗号化パスワードの更新をお願いします。 \"旧ログインパスワード”部分に上記パスワードを入力し、現在のログインパスワードで更新します。<br><br>",

apps/encryption/l10n/ja.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" : "署名が存在しません",
@@ -29,7 +30,7 @@
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを読み取ることができません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
     "Default encryption module" : "デフォルトの暗号化モジュール",
-    "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" : "こんにちは、\n\n管理者がサーバーサイド暗号化を有効にしました。'%s'というパスワードであなたのファイルが暗号化されました。\n\nWeb画面からログインして、個人設定画面の'基本暗号化モジュール' セクションにいき、暗号化パスワードの更新をお願いします。 '旧ログインパスワード'部分に上記パスワードを入力し、現在のログインパスワードで更新します。\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" : "こんにちは\n\n管理者がサーバーサイド暗号化を有効にしました。'%s'というパスワードであなたのファイルが暗号化されました。\n\nWeb画面からログインして、個人設定画面の'基本暗号化モジュール' セクションにいき、暗号化パスワードの更新をお願いします。 '旧ログインパスワード'部分に上記パスワードを入力し、現在のログインパスワードで更新します。\n",
     "The share will expire on %s." : "共有は %s で有効期限が切れます。",
     "Cheers!" : "それでは！",
     "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "こんにちは、<br><br>管理者がサーバーサイド暗号化を有効にしました。<strong>%s</strong>というパスワードであなたのファイルが暗号化されました。<br><br>Web画面からログインして、個人設定画面の\"基本暗号化モジュール\"のセクションにいき、暗号化パスワードの更新をお願いします。 \"旧ログインパスワード”部分に上記パスワードを入力し、現在のログインパスワードで更新します。<br><br>",

apps/encryption/l10n/lt_LT.js

@@ -1,54 +1,63 @@
 OC.L10N.register(
     "encryption",
     {
-    "Missing recovery key password" : "Trūksta atkūrimo rakto slaptažodžio",
+    "Missing recovery key password" : "Atkūrimo raktui apsaugoti reikalingas slaptažodis",
-    "Please repeat the recovery key password" : "Prašome pakartoti atkūrimo rakto slaptažodį",
+    "Please repeat the recovery key password" : "Prašome pakartoti slaptažodį atkūrimo raktui apsaugoti",
     "Repeated recovery key password does not match the provided recovery key password" : "Pakartotas atstatymo rakto slaptažodis nesutampa su atstatymo rakto slaptažodžiu",
-    "Recovery key successfully enabled" : "Atkūrimo raktas sėkmingai įjungtas",
+    "Recovery key successfully enabled" : "Atkūrimo raktas pradėtas naudoti",
-    "Could not enable recovery key. Please check your recovery key password!" : "Nepavyko įjungti atkūrimo rakto. Prašome patikrinti savo atkūrimo rakto slaptažodį!",
+    "Could not enable recovery key. Please check your recovery key password!" : "Nepavyko panaudoti atkūrimo rakto. Prašome patikrinti savo atkūrimo rakto slaptažodį!",
-    "Recovery key successfully disabled" : "Atkūrimo raktas sėkmingai išjungtas",
+    "Recovery key successfully disabled" : "Atkūrimo raktas nebenaudojamas",
-    "Could not disable recovery key. Please check your recovery key password!" : "Nepavyko išjungti atkūrimo rakto. Prašome patikrinti savo atkūrimo rakto slaptažodį!",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nepavyko atjungti atkūrimo rakto. Prašome patikrinti savo atkūrimo rakto slaptažodį!",
     "Missing parameters" : "Trūksta parametrų",
-    "Please provide the old recovery password" : "Įveskite seną atstatymo slaptažodį",
+    "Please provide the old recovery password" : "Įveskite seną atkūrimo rakto slaptažodį",
-    "Please provide a new recovery password" : "Prašome pateikti naują atkūrimo slaptažodį",
+    "Please provide a new recovery password" : "Prašome pateikti naują atkūrimo rakto slaptažodį",
-    "Please repeat the new recovery password" : "Pakartokite naują atstatymo slaptažodį",
+    "Please repeat the new recovery password" : "Pakartokite naują atkūrimo rakto slaptažodį",
     "Password successfully changed." : "Slaptažodis sėkmingai pakeistas.",
     "Could not change the password. Maybe the old password was not correct." : "Nepavyko pakeisti slaptažodžio. Galbūt, buvo neteisingai įvestas senas slaptažodis.",
-    "Recovery Key disabled" : "Atkūrimo raktas išjungtas",
+    "Recovery Key disabled" : "Atkūrimo raktas nenaudojamas",
-    "Recovery Key enabled" : "Atstatymo raktas įjungtas",
+    "Recovery Key enabled" : "Atkūrimo raktas naudojamas",
-    "Could not enable the recovery key, please try again or contact your administrator" : "Nepavyko įjungti atkūrimo rakto, prašome bandyti dar kartą arba susisiekti su savo administratoriumi",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Nepavyksta pradėti naudoti atkūrimo rakto, prašome bandyti dar kartą arba susisiekti su sistemos administratoriumi",
-    "Could not update the private key password." : "Nepavyko atnaujinti privačiojo rakto slaptažodžio.",
+    "Could not update the private key password." : "Nepavyko atnaujinti slaptažodžio privačiam raktui.",
     "The old password was not correct, please try again." : "Neteisingas senas slaptažodis, prašome bandyti dar kartą.",
     "The current log-in password was not correct, please try again." : "Esamas prisijungimo slaptažodis buvo neteisingas, prašome bandyti dar kartą.",
-    "Private key password successfully updated." : "Privačiojo rakto slaptažodis sėkmingai atnaujintas.",
+    "Private key password successfully updated." : "Privataus rakto slaptažodis sėkmingai atnaujintas.",
-    "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" : "Jūs turite perkelti savo šifravimo raktus iš senojo šifravimo (ownCloud <= 8.0) į naująjį. Prašome vykdyti \"occ encryption:migrate\" arba susisiekti su savo administratoriumi",
+    "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" : "Jūs turite atlikti šifravimo raktų migraciją iš senojo (ownCloud <= 8.0) į naująjį. Prašome terminale įvykdyti \"occ encryption:migrate\" arba susisiekti su sistemos administratoriumi",
+    "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Šifravimo įskiepis neatpažįsta privataus rakto. Atnaujinkite slaptažodį skirtą privačiam raktui naudoti, kurį rasite asmeninių nustatymų skiltyje, skirtoje atstatyti prieigą prie šifruotų failų.",
+    "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Šifravimo įskiepis veikia, tačiau privatus ir atkūrimo raktas nebuvo panaudotas. Pabandykite prisijungti iš naujo.",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Administratoriaus nustatymuose įgalinkite šifravimą, jei norite naudoti šifravimo modulį.",
+    "Encryption app is enabled and ready" : "Šifravimo įskiepis yra paruoštas ir veikia",
     "Bad Signature" : "Blogas parašas",
     "Missing Signature" : "Trūksta parašo",
-    "one-time password for server-side-encryption" : "Vienkartinis slaptažodis šifravimui serverio pusėje",
+    "one-time password for server-side-encryption" : "vienkartinis slaptažodis skirtas šifravimui",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nepavyksta iššifruoti šio failo, tikriausiai, tai yra bendrinamas failas. Paprašykite failo savininko iš naujo pradėti bendrinti su jumis šį failą.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nepavyksta perskaityti šio failo, tikriausiai, tai yra bendrinamas failas. Paprašykite failo savininko iš naujo pradėti bendrinti su jumis šį failą.",
     "Default encryption module" : "Numatytasis šifravimo modulis",
+    "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" : "Sveiki,\n\nAdministratorius įjungė šifravimą sistemoje. Jūsų failai buvo užšifruoti naudojantis šiuo slaptažodžiu: \"%s\".\n\nPrisijunkite prie sistemos, atidarykite nustatymus, pasirinkite skiltį \"Šifravimo įskiepis\" ir atnaujinkite savo šifravimui skirtą slaptažodį pasinaudodami šiuo ir savo prisijungimo slaptažodžiu.\n\n",
     "The share will expire on %s." : "Bendrinimo laikas pasibaigs %s.",
     "Cheers!" : "Sveikinimai!",
-    "Encrypt the home storage" : "Šifruoti namų saugyklą",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Sveiki, <br><br>Administratorius įjungė šifravimą sistemoje. Jūsų failai buvo užšifruoti naudojantis šiuo slaptažodžiu: <strong>%s</strong>.<br><br> Prisijunkite prie sistemos, atidarykite nustatymus, pasirinkite skiltį \"Šifravimo įskiepis\" ir atnaujinkite savo šifravimui skirtą slaptažodį pasinaudodami šiuo ir savo prisijungimo slaptažodžiu.<br><br>",
-    "Enable recovery key" : "Įjungti atstatymo raktą",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo įskiepis veikia, tačiau privatus ir atkūrimo raktas nebuvo panaudotas. Pabandykite prisijungti iš naujo",
-    "Disable recovery key" : "Išjungti atstatymo raktą",
+    "Encrypt the home storage" : "Šifruoti visą saugyklą",
-    "Recovery key password" : "Atkūrimo rakto slaptažodis",
+    "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ši parinktis užšifruos visus duomenis, esančius visoje saugykloje. Jei pasirinkimas šioje skiltyje liks išjungtas, tada duomenys, esantys išorinėje saugykloje bus užšifruoti.",
-    "Repeat recovery key password" : "Pakartokite atstatymo rakto slaptažodį",
+    "Enable recovery key" : "Naudoti atstatymo raktą",
-    "Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
+    "Disable recovery key" : "Nenaudoti atstatymo rakto",
+    "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Atkūrimo raktas yra papildoma saugumo priemonė skirta duomenų šifravimui. Atkūrimo raktas leidžia asmens duomenų atstatymą, kai asmuo pamiršta slaptažodį.",
+    "Recovery key password" : "Slaptažodis atkūrimo raktui",
+    "Repeat recovery key password" : "Pakartokite slaptažodį atkūrimo raktui ",
+    "Change recovery key password:" : "Pakeisti slaptažodį atkūrimo raktui:",
     "Old recovery key password" : "Senas atstatymo rakto slaptažodis",
-    "New recovery key password" : "Naujas atstatymo rakto slaptažodis",
+    "New recovery key password" : "Naujas slaptažodis atkūrimo raktui",
-    "Repeat new recovery key password" : "Pakartokite naują atstatymo rakto slaptažodį",
+    "Repeat new recovery key password" : "Pakartokite naują slaptažodį atkūrimo raktui",
     "Change Password" : "Pakeisti slaptažodį",
     "Basic encryption module" : "Pagrindinis šifravimo modulis",
-    "Your private key password no longer matches your log-in password." : "Jūsų privačiojo rakto slaptažodis daugiau nebesutampa su jūsų prisijungimo slaptažodžiu.",
+    "Your private key password no longer matches your log-in password." : "Jūsų privataus rakto slaptažodis nesutampa su jūsų prisijungimo slaptažodžiu.",
-    "Set your old private key password to your current log-in password:" : "Nustatyti Jūsų privataus rakto slaptažodį į Jūsų dabartinį slaptažodį.",
+    "Set your old private key password to your current log-in password:" : "Naudoti privataus rakto slaptažodį kaip prisijungimo slaptažodį:",
-    " If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti sistemos administratoriaus atkurti jūsų duomenis.",
     "Old log-in password" : "Senas prisijungimo slaptažodis",
     "Current log-in password" : "Dabartinis prisijungimo slaptažodis",
-    "Update Private Key Password" : "Atnaujinti privačiojo rakto slaptažodį",
+    "Update Private Key Password" : "Atnaujinti privataus rakto slaptažodį",
     "Enable password recovery:" : "Įjungti slaptažodžio atkūrimą:",
-    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Šios parinkties įjungimas leis jums iš naujo gauti prieigą prie savo užšifruotų failų tuo atveju, jei prarasite slaptažodį",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Šios parinkties įjungimas leis jums iš naujo gauti prieigą prie savo užšifruotų duomenų tuo atveju, jei prarasite slaptažodį",
     "Enabled" : "Įjungta",
     "Disabled" : "Išjungta",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programėlė yra įjungta, tačiau jūsų raktai nėra inicijuoti. Prašome atsijungti ir vėl prisijungti"

apps/encryption/l10n/lt_LT.json

@@ -1,52 +1,61 @@
 { "translations": {
-    "Missing recovery key password" : "Trūksta atkūrimo rakto slaptažodžio",
+    "Missing recovery key password" : "Atkūrimo raktui apsaugoti reikalingas slaptažodis",
-    "Please repeat the recovery key password" : "Prašome pakartoti atkūrimo rakto slaptažodį",
+    "Please repeat the recovery key password" : "Prašome pakartoti slaptažodį atkūrimo raktui apsaugoti",
     "Repeated recovery key password does not match the provided recovery key password" : "Pakartotas atstatymo rakto slaptažodis nesutampa su atstatymo rakto slaptažodžiu",
-    "Recovery key successfully enabled" : "Atkūrimo raktas sėkmingai įjungtas",
+    "Recovery key successfully enabled" : "Atkūrimo raktas pradėtas naudoti",
-    "Could not enable recovery key. Please check your recovery key password!" : "Nepavyko įjungti atkūrimo rakto. Prašome patikrinti savo atkūrimo rakto slaptažodį!",
+    "Could not enable recovery key. Please check your recovery key password!" : "Nepavyko panaudoti atkūrimo rakto. Prašome patikrinti savo atkūrimo rakto slaptažodį!",
-    "Recovery key successfully disabled" : "Atkūrimo raktas sėkmingai išjungtas",
+    "Recovery key successfully disabled" : "Atkūrimo raktas nebenaudojamas",
-    "Could not disable recovery key. Please check your recovery key password!" : "Nepavyko išjungti atkūrimo rakto. Prašome patikrinti savo atkūrimo rakto slaptažodį!",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nepavyko atjungti atkūrimo rakto. Prašome patikrinti savo atkūrimo rakto slaptažodį!",
     "Missing parameters" : "Trūksta parametrų",
-    "Please provide the old recovery password" : "Įveskite seną atstatymo slaptažodį",
+    "Please provide the old recovery password" : "Įveskite seną atkūrimo rakto slaptažodį",
-    "Please provide a new recovery password" : "Prašome pateikti naują atkūrimo slaptažodį",
+    "Please provide a new recovery password" : "Prašome pateikti naują atkūrimo rakto slaptažodį",
-    "Please repeat the new recovery password" : "Pakartokite naują atstatymo slaptažodį",
+    "Please repeat the new recovery password" : "Pakartokite naują atkūrimo rakto slaptažodį",
     "Password successfully changed." : "Slaptažodis sėkmingai pakeistas.",
     "Could not change the password. Maybe the old password was not correct." : "Nepavyko pakeisti slaptažodžio. Galbūt, buvo neteisingai įvestas senas slaptažodis.",
-    "Recovery Key disabled" : "Atkūrimo raktas išjungtas",
+    "Recovery Key disabled" : "Atkūrimo raktas nenaudojamas",
-    "Recovery Key enabled" : "Atstatymo raktas įjungtas",
+    "Recovery Key enabled" : "Atkūrimo raktas naudojamas",
-    "Could not enable the recovery key, please try again or contact your administrator" : "Nepavyko įjungti atkūrimo rakto, prašome bandyti dar kartą arba susisiekti su savo administratoriumi",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Nepavyksta pradėti naudoti atkūrimo rakto, prašome bandyti dar kartą arba susisiekti su sistemos administratoriumi",
-    "Could not update the private key password." : "Nepavyko atnaujinti privačiojo rakto slaptažodžio.",
+    "Could not update the private key password." : "Nepavyko atnaujinti slaptažodžio privačiam raktui.",
     "The old password was not correct, please try again." : "Neteisingas senas slaptažodis, prašome bandyti dar kartą.",
     "The current log-in password was not correct, please try again." : "Esamas prisijungimo slaptažodis buvo neteisingas, prašome bandyti dar kartą.",
-    "Private key password successfully updated." : "Privačiojo rakto slaptažodis sėkmingai atnaujintas.",
+    "Private key password successfully updated." : "Privataus rakto slaptažodis sėkmingai atnaujintas.",
-    "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" : "Jūs turite perkelti savo šifravimo raktus iš senojo šifravimo (ownCloud <= 8.0) į naująjį. Prašome vykdyti \"occ encryption:migrate\" arba susisiekti su savo administratoriumi",
+    "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" : "Jūs turite atlikti šifravimo raktų migraciją iš senojo (ownCloud <= 8.0) į naująjį. Prašome terminale įvykdyti \"occ encryption:migrate\" arba susisiekti su sistemos administratoriumi",
+    "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Šifravimo įskiepis neatpažįsta privataus rakto. Atnaujinkite slaptažodį skirtą privačiam raktui naudoti, kurį rasite asmeninių nustatymų skiltyje, skirtoje atstatyti prieigą prie šifruotų failų.",
+    "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Šifravimo įskiepis veikia, tačiau privatus ir atkūrimo raktas nebuvo panaudotas. Pabandykite prisijungti iš naujo.",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Administratoriaus nustatymuose įgalinkite šifravimą, jei norite naudoti šifravimo modulį.",
+    "Encryption app is enabled and ready" : "Šifravimo įskiepis yra paruoštas ir veikia",
     "Bad Signature" : "Blogas parašas",
     "Missing Signature" : "Trūksta parašo",
-    "one-time password for server-side-encryption" : "Vienkartinis slaptažodis šifravimui serverio pusėje",
+    "one-time password for server-side-encryption" : "vienkartinis slaptažodis skirtas šifravimui",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nepavyksta iššifruoti šio failo, tikriausiai, tai yra bendrinamas failas. Paprašykite failo savininko iš naujo pradėti bendrinti su jumis šį failą.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nepavyksta perskaityti šio failo, tikriausiai, tai yra bendrinamas failas. Paprašykite failo savininko iš naujo pradėti bendrinti su jumis šį failą.",
     "Default encryption module" : "Numatytasis šifravimo modulis",
+    "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" : "Sveiki,\n\nAdministratorius įjungė šifravimą sistemoje. Jūsų failai buvo užšifruoti naudojantis šiuo slaptažodžiu: \"%s\".\n\nPrisijunkite prie sistemos, atidarykite nustatymus, pasirinkite skiltį \"Šifravimo įskiepis\" ir atnaujinkite savo šifravimui skirtą slaptažodį pasinaudodami šiuo ir savo prisijungimo slaptažodžiu.\n\n",
     "The share will expire on %s." : "Bendrinimo laikas pasibaigs %s.",
     "Cheers!" : "Sveikinimai!",
-    "Encrypt the home storage" : "Šifruoti namų saugyklą",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Sveiki, <br><br>Administratorius įjungė šifravimą sistemoje. Jūsų failai buvo užšifruoti naudojantis šiuo slaptažodžiu: <strong>%s</strong>.<br><br> Prisijunkite prie sistemos, atidarykite nustatymus, pasirinkite skiltį \"Šifravimo įskiepis\" ir atnaujinkite savo šifravimui skirtą slaptažodį pasinaudodami šiuo ir savo prisijungimo slaptažodžiu.<br><br>",
-    "Enable recovery key" : "Įjungti atstatymo raktą",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo įskiepis veikia, tačiau privatus ir atkūrimo raktas nebuvo panaudotas. Pabandykite prisijungti iš naujo",
-    "Disable recovery key" : "Išjungti atstatymo raktą",
+    "Encrypt the home storage" : "Šifruoti visą saugyklą",
-    "Recovery key password" : "Atkūrimo rakto slaptažodis",
+    "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ši parinktis užšifruos visus duomenis, esančius visoje saugykloje. Jei pasirinkimas šioje skiltyje liks išjungtas, tada duomenys, esantys išorinėje saugykloje bus užšifruoti.",
-    "Repeat recovery key password" : "Pakartokite atstatymo rakto slaptažodį",
+    "Enable recovery key" : "Naudoti atstatymo raktą",
-    "Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
+    "Disable recovery key" : "Nenaudoti atstatymo rakto",
+    "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Atkūrimo raktas yra papildoma saugumo priemonė skirta duomenų šifravimui. Atkūrimo raktas leidžia asmens duomenų atstatymą, kai asmuo pamiršta slaptažodį.",
+    "Recovery key password" : "Slaptažodis atkūrimo raktui",
+    "Repeat recovery key password" : "Pakartokite slaptažodį atkūrimo raktui ",
+    "Change recovery key password:" : "Pakeisti slaptažodį atkūrimo raktui:",
     "Old recovery key password" : "Senas atstatymo rakto slaptažodis",
-    "New recovery key password" : "Naujas atstatymo rakto slaptažodis",
+    "New recovery key password" : "Naujas slaptažodis atkūrimo raktui",
-    "Repeat new recovery key password" : "Pakartokite naują atstatymo rakto slaptažodį",
+    "Repeat new recovery key password" : "Pakartokite naują slaptažodį atkūrimo raktui",
     "Change Password" : "Pakeisti slaptažodį",
     "Basic encryption module" : "Pagrindinis šifravimo modulis",
-    "Your private key password no longer matches your log-in password." : "Jūsų privačiojo rakto slaptažodis daugiau nebesutampa su jūsų prisijungimo slaptažodžiu.",
+    "Your private key password no longer matches your log-in password." : "Jūsų privataus rakto slaptažodis nesutampa su jūsų prisijungimo slaptažodžiu.",
-    "Set your old private key password to your current log-in password:" : "Nustatyti Jūsų privataus rakto slaptažodį į Jūsų dabartinį slaptažodį.",
+    "Set your old private key password to your current log-in password:" : "Naudoti privataus rakto slaptažodį kaip prisijungimo slaptažodį:",
-    " If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti sistemos administratoriaus atkurti jūsų duomenis.",
     "Old log-in password" : "Senas prisijungimo slaptažodis",
     "Current log-in password" : "Dabartinis prisijungimo slaptažodis",
-    "Update Private Key Password" : "Atnaujinti privačiojo rakto slaptažodį",
+    "Update Private Key Password" : "Atnaujinti privataus rakto slaptažodį",
     "Enable password recovery:" : "Įjungti slaptažodžio atkūrimą:",
-    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Šios parinkties įjungimas leis jums iš naujo gauti prieigą prie savo užšifruotų failų tuo atveju, jei prarasite slaptažodį",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Šios parinkties įjungimas leis jums iš naujo gauti prieigą prie savo užšifruotų duomenų tuo atveju, jei prarasite slaptažodį",
     "Enabled" : "Įjungta",
     "Disabled" : "Išjungta",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programėlė yra įjungta, tačiau jūsų raktai nėra inicijuoti. Prašome atsijungti ir vėl prisijungti"

apps/encryption/l10n/sq.js

@@ -1,7 +1,7 @@
 OC.L10N.register(
     "encryption",
     {
-    "Missing recovery key password" : "Mungon fjalëkalim kyçi rimarrjesh",
+    "Missing recovery key password" : "Mungon fjalëkalimi kyç i rigjenerimit ",
     "Please repeat the recovery key password" : "Ju lutemi, rijepni fjalëkalimin për kyç rimarrjesh",
     "Repeated recovery key password does not match the provided recovery key password" : "Fjalëkalimi i ridhënë për kyç rimarrjesh s’përputhet me fjalëkalimin e dhënë për kyç rimarrjesh",
     "Recovery key successfully enabled" : "Kyçi i rimarrjeve u aktivizua me sukses",
@@ -23,6 +23,8 @@ OC.L10N.register(
     "Private key password successfully updated." : "Fjalëkalimi për kyçin privat u përditësua me sukses.",
     "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" : "Lypset të kaloni kyçet tuaj të fshehtëzimeve nga versioni i vjetër i fshehtëzimeve (ownCloud <= 8.0) te i riu. Ju lutemi, ekzekutoni run 'occ encryption:migrate' ose lidhuni me përgjegjësin tuaj",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kyç privat i pavlefshëm për aplikacionin e fshehtëzimeve. Ju lutemi, përditësoni fjalëkalimin tuaj të kyçit privat te rregullimet tuaja personale që të rimerrni hyrje te kartelat tuaja të fshehtëzuara.",
+    "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Aplikacioni i Enkriptimit është i aktivizuar, por kyçet tuaj s’janë vënë në punë, ju lutemi, dilni dhe rihyni përsëri",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Ju lutem aktivizoni ekriptimin në anën e serverit në konfigurimet e administratorit në mënyrë që të përdorni modulin e enkriptimit.",
     "Encryption app is enabled and ready" : "Aplikacioni i Fshehtëzimeve u aktivizua dhe është gati",
     "Bad Signature" : "Nënshkrim i Keq",
     "Missing Signature" : "Mungon Nënshkrimi",

apps/encryption/l10n/sq.json

@@ -1,5 +1,5 @@
 { "translations": {
-    "Missing recovery key password" : "Mungon fjalëkalim kyçi rimarrjesh",
+    "Missing recovery key password" : "Mungon fjalëkalimi kyç i rigjenerimit ",
     "Please repeat the recovery key password" : "Ju lutemi, rijepni fjalëkalimin për kyç rimarrjesh",
     "Repeated recovery key password does not match the provided recovery key password" : "Fjalëkalimi i ridhënë për kyç rimarrjesh s’përputhet me fjalëkalimin e dhënë për kyç rimarrjesh",
     "Recovery key successfully enabled" : "Kyçi i rimarrjeve u aktivizua me sukses",
@@ -21,6 +21,8 @@
     "Private key password successfully updated." : "Fjalëkalimi për kyçin privat u përditësua me sukses.",
     "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" : "Lypset të kaloni kyçet tuaj të fshehtëzimeve nga versioni i vjetër i fshehtëzimeve (ownCloud <= 8.0) te i riu. Ju lutemi, ekzekutoni run 'occ encryption:migrate' ose lidhuni me përgjegjësin tuaj",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kyç privat i pavlefshëm për aplikacionin e fshehtëzimeve. Ju lutemi, përditësoni fjalëkalimin tuaj të kyçit privat te rregullimet tuaja personale që të rimerrni hyrje te kartelat tuaja të fshehtëzuara.",
+    "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Aplikacioni i Enkriptimit është i aktivizuar, por kyçet tuaj s’janë vënë në punë, ju lutemi, dilni dhe rihyni përsëri",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Ju lutem aktivizoni ekriptimin në anën e serverit në konfigurimet e administratorit në mënyrë që të përdorni modulin e enkriptimit.",
     "Encryption app is enabled and ready" : "Aplikacioni i Fshehtëzimeve u aktivizua dhe është gati",
     "Bad Signature" : "Nënshkrim i Keq",
     "Missing Signature" : "Mungon Nënshkrimi",

apps/encryption/lib/Crypto/Crypt.php

@@ -605,7 +605,7 @@ class Crypt {
 
 			$element = array_shift($exploded);
 
-			while ($element != self::HEADER_END) {
+			while ($element !== self::HEADER_END) {
 				$result[$element] = array_shift($exploded);
 				$element = array_shift($exploded);
 			}

apps/encryption/lib/Crypto/Encryption.php

@@ -60,6 +60,9 @@ class Encryption implements IEncryptionModule {
 	/** @var string */
 	private $user;
 
+	/** @var  array */
+	private $owner;
+
 	/** @var string */
 	private $fileKey;
 
@@ -136,6 +139,7 @@ class Encryption implements IEncryptionModule {
 		$this->decryptAll = $decryptAll;
 		$this->logger = $logger;
 		$this->l = $il10n;
+		$this->owner = [];
 		$this->useMasterPassword = $util->isMasterKeyEnabled();
 	}
 
@@ -280,13 +284,15 @@ class Encryption implements IEncryptionModule {
 				}
 			}
 
-			$publicKeys = $this->keyManager->addSystemKeys($this->accessList, $publicKeys, $this->user);
+			$publicKeys = $this->keyManager->addSystemKeys($this->accessList, $publicKeys, $this->getOwner($path));
 			$encryptedKeyfiles = $this->crypt->multiKeyEncrypt($this->fileKey, $publicKeys);
 			$this->keyManager->setAllFileKeys($this->path, $encryptedKeyfiles);
 		}
 		return $result;
 	}
 
+
+
 	/**
 	 * encrypt data
 	 *
@@ -407,7 +413,7 @@ class Encryption implements IEncryptionModule {
 				}
 			}
 
-			$publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $uid);
+			$publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $this->getOwner($path));
 
 			$encryptedFileKey = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
 
@@ -443,13 +449,13 @@ class Encryption implements IEncryptionModule {
 			return false;
 		}
 
-		if ($parts[2] == 'files') {
+		if ($parts[2] === 'files') {
 			return true;
 		}
-		if ($parts[2] == 'files_versions') {
+		if ($parts[2] === 'files_versions') {
 			return true;
 		}
-		if ($parts[2] == 'files_trashbin') {
+		if ($parts[2] === 'files_trashbin') {
 			return true;
 		}
 
@@ -556,6 +562,19 @@ class Encryption implements IEncryptionModule {
 		return $path;
 	}
 
+	/**
+	 * get owner of a file
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	protected function getOwner($path) {
+		if (!isset($this->owner[$path])) {
+			$this->owner[$path] = $this->util->getOwner($path);
+		}
+		return $this->owner[$path];
+	}
+
 	/**
 	 * Check if the module is ready to be used by that specific user.
 	 * In case a module is not ready - because e.g. key pairs have not been generated

apps/federatedfilesharing/l10n/cs.js

@@ -16,13 +16,13 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Sdílení ze serveru na server není na tomto serveru povoleno",
     "Couldn't establish a federated share." : "Nepodařilo se ustavit spojené sdílení.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Nepodařilo se ustavit propojené sdílení, heslo může být nesprávné.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Požadavek na spojené sdílení uspěl, obdržíte pozvánku. Zkontrolujte vaše upozornění.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Požadavek na spojené sdílení byl odeslán, obdržíte pozvánku. Zkontrolujte vaše upozornění.",
     "The mountpoint name contains invalid characters." : "Jméno přípojného bodu obsahuje neplatné znaky.",
     "Not allowed to create a federated share with the owner." : "ONení povoleno s autorem vytvořit propojené sdílení.",
     "Invalid or untrusted SSL certificate" : "Neplatný nebo nedůvěryhodný SSL certifikát",
     "Could not authenticate to remote share, password might be wrong" : "Autentizace ke vzdálenému sdílení selhala, heslo může být nesprávné",
     "Storage not valid" : "Úložiště není platné",
-    "Federated Share successfully added" : "Propojené sdílení úspěšně přidáno",
+    "Federated share added" : "Propojené sdílení bylo přidáno",
     "Couldn't add remote share" : "Nepodařilo se přidat propojené sdílení",
     "Sharing %s failed, because this item is already shared with %s" : "Sdílení položky %s selhalo, protože položka již je s uživatelem %s sdílena",
     "Not allowed to create a federated share with the same user" : "Není povoleno vytvořit propojené sdílení s tím samým uživatelem",

apps/federatedfilesharing/l10n/cs.json

@@ -14,13 +14,13 @@
     "Server to server sharing is not enabled on this server" : "Sdílení ze serveru na server není na tomto serveru povoleno",
     "Couldn't establish a federated share." : "Nepodařilo se ustavit spojené sdílení.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Nepodařilo se ustavit propojené sdílení, heslo může být nesprávné.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Požadavek na spojené sdílení uspěl, obdržíte pozvánku. Zkontrolujte vaše upozornění.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Požadavek na spojené sdílení byl odeslán, obdržíte pozvánku. Zkontrolujte vaše upozornění.",
     "The mountpoint name contains invalid characters." : "Jméno přípojného bodu obsahuje neplatné znaky.",
     "Not allowed to create a federated share with the owner." : "ONení povoleno s autorem vytvořit propojené sdílení.",
     "Invalid or untrusted SSL certificate" : "Neplatný nebo nedůvěryhodný SSL certifikát",
     "Could not authenticate to remote share, password might be wrong" : "Autentizace ke vzdálenému sdílení selhala, heslo může být nesprávné",
     "Storage not valid" : "Úložiště není platné",
-    "Federated Share successfully added" : "Propojené sdílení úspěšně přidáno",
+    "Federated share added" : "Propojené sdílení bylo přidáno",
     "Couldn't add remote share" : "Nepodařilo se přidat propojené sdílení",
     "Sharing %s failed, because this item is already shared with %s" : "Sdílení položky %s selhalo, protože položka již je s uživatelem %s sdílena",
     "Not allowed to create a federated share with the same user" : "Není povoleno vytvořit propojené sdílení s tím samým uživatelem",

apps/federatedfilesharing/l10n/de.js

@@ -16,13 +16,13 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert",
     "Couldn't establish a federated share." : "Federated-Share konnte nicht aufgebaut werden",
     "Couldn't establish a federated share, maybe the password was wrong." : "Federated-Share konnte nicht aufgebaut werden, da eventuell das Passwort falsch ist.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Du erhälst eine Einladung. Bitte prüfe deine Benachrichtigungen.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Du erhälst eine Einladung. Bitte prüfe deine Benachrichtigungen. ",
     "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
     "Not allowed to create a federated share with the owner." : "Das Erstellen einer Federated Cloud Freigabe mit dem Benutzer ist nicht erlaubt.",
     "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
     "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
     "Storage not valid" : "Speicher ungültig",
-    "Federated Share successfully added" : "Federated-Share erfolgreich hinzugefügt",
+    "Federated share added" : "Federated-Share hinzugefügt ",
     "Couldn't add remote share" : "Remotefreigabe konnte nicht hinzu gefügt werden",
     "Sharing %s failed, because this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
     "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt",

apps/federatedfilesharing/l10n/de.json

@@ -14,13 +14,13 @@
     "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert",
     "Couldn't establish a federated share." : "Federated-Share konnte nicht aufgebaut werden",
     "Couldn't establish a federated share, maybe the password was wrong." : "Federated-Share konnte nicht aufgebaut werden, da eventuell das Passwort falsch ist.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Du erhälst eine Einladung. Bitte prüfe deine Benachrichtigungen.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Du erhälst eine Einladung. Bitte prüfe deine Benachrichtigungen. ",
     "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
     "Not allowed to create a federated share with the owner." : "Das Erstellen einer Federated Cloud Freigabe mit dem Benutzer ist nicht erlaubt.",
     "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
     "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
     "Storage not valid" : "Speicher ungültig",
-    "Federated Share successfully added" : "Federated-Share erfolgreich hinzugefügt",
+    "Federated share added" : "Federated-Share hinzugefügt ",
     "Couldn't add remote share" : "Remotefreigabe konnte nicht hinzu gefügt werden",
     "Sharing %s failed, because this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
     "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt",

apps/federatedfilesharing/l10n/de_DE.js

@@ -16,13 +16,13 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert",
     "Couldn't establish a federated share." : "Federated-Share konnte nicht aufgebaut werden",
     "Couldn't establish a federated share, maybe the password was wrong." : "Federated-Share konnte nicht aufgebaut werden, da eventuell das Passwort falsch ist.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Sie erhalten eine Einladung. Bitte prüfen Sie Ihre Benachrichtigungen.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Sie erhalten eine Einladung. Bitte prüfen Sie Ihre Benachrichtigungen. ",
     "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
     "Not allowed to create a federated share with the owner." : "Das Erstellen einer Federated Cloud Freigabe mit dem Benutzer ist nicht erlaubt.",
     "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
     "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
     "Storage not valid" : "Speicher ungültig",
-    "Federated Share successfully added" : "Federated-Share erfolgreich hinzugefügt",
+    "Federated share added" : "Federated-Share hinzugefügt ",
     "Couldn't add remote share" : "Remotefreigabe konnte nicht hinzu gefügt werden",
     "Sharing %s failed, because this item is already shared with %s" : "Die Freigabe von %s ist fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
     "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt",

apps/federatedfilesharing/l10n/de_DE.json

@@ -14,13 +14,13 @@
     "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert",
     "Couldn't establish a federated share." : "Federated-Share konnte nicht aufgebaut werden",
     "Couldn't establish a federated share, maybe the password was wrong." : "Federated-Share konnte nicht aufgebaut werden, da eventuell das Passwort falsch ist.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Sie erhalten eine Einladung. Bitte prüfen Sie Ihre Benachrichtigungen.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Sie erhalten eine Einladung. Bitte prüfen Sie Ihre Benachrichtigungen. ",
     "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
     "Not allowed to create a federated share with the owner." : "Das Erstellen einer Federated Cloud Freigabe mit dem Benutzer ist nicht erlaubt.",
     "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
     "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
     "Storage not valid" : "Speicher ungültig",
-    "Federated Share successfully added" : "Federated-Share erfolgreich hinzugefügt",
+    "Federated share added" : "Federated-Share hinzugefügt ",
     "Couldn't add remote share" : "Remotefreigabe konnte nicht hinzu gefügt werden",
     "Sharing %s failed, because this item is already shared with %s" : "Die Freigabe von %s ist fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
     "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt",

apps/federatedfilesharing/l10n/el.js

@@ -1,22 +1,55 @@
 OC.L10N.register(
     "federatedfilesharing",
     {
+    "Federated sharing" : "Ομόσποσνδος διαμοιρασμός",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Θέλετε να προσθέσουμε τον απομακρυσμένο κοινόχρηστο φάκελο {name} από {owner}@{remote}?",
+    "Remote share" : "Απομακρυσμένος κοινόχρηστος φάκελος",
+    "Remote share password" : "Συνθηματικό απομακρυσμένου κοινόχρηστου φακέλου",
+    "Cancel" : "Άκυρο",
+    "Add remote share" : "Προσθήκη απομακρυσμένου κοινόχρηστου φακέλου",
+    "Copy" : "Αντιγραφή",
+    "Copied!" : "Αντιγράφτηκε!",
+    "Not supported!" : "Δεν υποστηρίζεται!",
+    "Press ⌘-C to copy." : "Για αντιγραφή πατήστε ⌘-C.",
+    "Press Ctrl-C to copy." : "Για αντιγραφή πατήστε Ctrl-C.",
     "Invalid Federated Cloud ID" : "Μη έγκυρο Federated Cloud ID",
+    "Server to server sharing is not enabled on this server" : "Ο διαμοιρασμός μεταξύ διακομιστών δεν έχει ενεργοποιηθεί σε αυτόν το διακομιστή",
+    "Couldn't establish a federated share." : "Αδυναμία επίτευξης ομόσπονδου κοινόχρηστου φακέλου",
+    "Couldn't establish a federated share, maybe the password was wrong." : "Δεν μπόρεσε να γίνει ένας federated διαμοιρασμός, μπορεί να ήταν λάθος το συνθηματικό",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Το αίτημα για Federate διαμοιρασμό εστάλη, θα λάβεις μια πρόσκληση. Έλεγξε τις ειδοποιήσεις.",
+    "The mountpoint name contains invalid characters." : "Το σημείο προσάρτησης περιέχει μη έγκυρους χαρακτήρες.",
+    "Not allowed to create a federated share with the owner." : "Δεν επιτρέπεται η δημιουργία federated διαμοιρασμού με τον ιδιοκτήτη",
+    "Invalid or untrusted SSL certificate" : "Μη έγκυρο ή μη έμπιστο πιστοποιητικό SSL",
+    "Could not authenticate to remote share, password might be wrong" : "Αδυναμία πιστοποίησης απομακρυσμένου κοινόχρηστου, το συνθηματικό μπορεί να είναι εσφαλμένο",
+    "Storage not valid" : "Μη έγκυρος αποθηκευτικός χώρος",
+    "Federated share added" : "O Federated διαμοιρασμός προστέθηκε",
+    "Couldn't add remote share" : "Αδυναμία προσθήκης απομακρυσμένου κοινόχρηστου φακέλου",
     "Sharing %s failed, because this item is already shared with %s" : "Ο διαμοιρασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοιρασμένο ήδη με τον χρήστη %s",
-    "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Αποτυχία διαμοιρασμού %s, δεν βρέθηκε το %s, μπορεί ο διακομιστής να είναι προσωρινά απροσπέλαστος.",
+    "Not allowed to create a federated share with the same user" : "Δεν επιτρέπεται η δημιουργία federated διαμοιρασμού με τον ίδιο χρήστη",
+    "File is already shared with %s" : "Το αρχείο είναι ήδη κοινόχρηστο με %s",
+    "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Η κοινή χρήση του %s απέτυχε, δεν ήταν δυνατή η εύρεση του %s, ίσως ο διακομιστής δεν είναι προσβάσιμος αυτήν τη στιγμή ή χρησιμοποιεί πιστοποιητικό που έχει υπογράψει αυτόματα.",
+    "Could not find share" : "Αδυναμία εύρεσης κοινόχρηστου",
     "Accept" : "Αποδοχή",
     "Decline" : "Απόρριψη",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #Nextcloud Federated Cloud ID μου, δείτε %s",
     "Share with me through my #Nextcloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #Nextcloud Federated Cloud ID μου",
-    "Federated Cloud Sharing" : "Διαμοιρασμός σε ομόσπονδα σύννεφα ",
+    "Sharing" : "Διαμοιρασμός",
-    "Open documentation" : "Ανοιχτή τεκμηρίωση.",
+    "Federated file sharing" : "Federated διαμοιρασμός αρχείου",
+    "Federated Cloud Sharing" : "Διαμοιρασμός Federated Cloud",
+    "Open documentation" : "Άνοιγμα τεκμηρίωσης",
+    "Adjust how people can share between servers." : "Προσαρμόστε το πως τα άτομα θα διαμοιράζονται μεταξύ των διακομιστών",
     "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές",
     "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές",
-    "Federated Cloud" : "Federated σύννεφο",
+    "Search global and public address book for users" : "Αναζήτηση σε γενικό και δημόσιο βιβλίο διευθύνσεων για χρήστες",
+    "Allow users to publish their data to a global and public address book" : "Επιτρέψτε στους χρήστες να δημοσιεύουν τα δεδομένα τους σε ένα γενικό και δημόσιο βιβλίο διευθύνσεων",
+    "Federated Cloud" : "Federated Cloud",
+    "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Μπορείτε να διαμοιράζεστε με οποιονδήποτε χρησιμοποιεί Nextcloud, ownCloud η Pydio! Απλά προσθέστε το Federated Cloud ID στο πλαίσιο διαλόγου διαμοιρασμού. Θα μοιάζει με person@cloud.example.com",
     "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:",
-    "Share it:" : "Μοιραστείτε το:",
+    "Share it so your friends can share files with you:" : "Διαμοιραστείτε το ώστε οι φίλοι σας να μπορούν να διαμοιράζονται αρχεία με εσάς:",
     "Add to your website" : "Προσθήκη στην ιστοσελίδα σας",
-    "Share with me via Nextcloud" : "Διαμοιρασμός με εμένα μέσω του ",
+    "Share with me via Nextcloud" : "Διαμοιραστείτε με εμένα μέσω του Nextcloud",
-    "HTML Code:" : "Κώδικας HTML:"
+    "HTML Code:" : "Κώδικας HTML:",
+    "Search global and public address book for users and let local users publish their data" : "Αναζήτηση σε γενικό και δημόσιο βιβλίο διευθύνσεων για χρήστες και επιτρέψτε τους τοπικούς χρήστες να δημοσιεύουν τα δεδομένα τους",
+    "Share it:" : "Μοιραστείτε το:"
 },
 "nplurals=2; plural=(n != 1);");

apps/federatedfilesharing/l10n/el.json

@@ -1,20 +1,53 @@
 { "translations": {
+    "Federated sharing" : "Ομόσποσνδος διαμοιρασμός",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Θέλετε να προσθέσουμε τον απομακρυσμένο κοινόχρηστο φάκελο {name} από {owner}@{remote}?",
+    "Remote share" : "Απομακρυσμένος κοινόχρηστος φάκελος",
+    "Remote share password" : "Συνθηματικό απομακρυσμένου κοινόχρηστου φακέλου",
+    "Cancel" : "Άκυρο",
+    "Add remote share" : "Προσθήκη απομακρυσμένου κοινόχρηστου φακέλου",
+    "Copy" : "Αντιγραφή",
+    "Copied!" : "Αντιγράφτηκε!",
+    "Not supported!" : "Δεν υποστηρίζεται!",
+    "Press ⌘-C to copy." : "Για αντιγραφή πατήστε ⌘-C.",
+    "Press Ctrl-C to copy." : "Για αντιγραφή πατήστε Ctrl-C.",
     "Invalid Federated Cloud ID" : "Μη έγκυρο Federated Cloud ID",
+    "Server to server sharing is not enabled on this server" : "Ο διαμοιρασμός μεταξύ διακομιστών δεν έχει ενεργοποιηθεί σε αυτόν το διακομιστή",
+    "Couldn't establish a federated share." : "Αδυναμία επίτευξης ομόσπονδου κοινόχρηστου φακέλου",
+    "Couldn't establish a federated share, maybe the password was wrong." : "Δεν μπόρεσε να γίνει ένας federated διαμοιρασμός, μπορεί να ήταν λάθος το συνθηματικό",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Το αίτημα για Federate διαμοιρασμό εστάλη, θα λάβεις μια πρόσκληση. Έλεγξε τις ειδοποιήσεις.",
+    "The mountpoint name contains invalid characters." : "Το σημείο προσάρτησης περιέχει μη έγκυρους χαρακτήρες.",
+    "Not allowed to create a federated share with the owner." : "Δεν επιτρέπεται η δημιουργία federated διαμοιρασμού με τον ιδιοκτήτη",
+    "Invalid or untrusted SSL certificate" : "Μη έγκυρο ή μη έμπιστο πιστοποιητικό SSL",
+    "Could not authenticate to remote share, password might be wrong" : "Αδυναμία πιστοποίησης απομακρυσμένου κοινόχρηστου, το συνθηματικό μπορεί να είναι εσφαλμένο",
+    "Storage not valid" : "Μη έγκυρος αποθηκευτικός χώρος",
+    "Federated share added" : "O Federated διαμοιρασμός προστέθηκε",
+    "Couldn't add remote share" : "Αδυναμία προσθήκης απομακρυσμένου κοινόχρηστου φακέλου",
     "Sharing %s failed, because this item is already shared with %s" : "Ο διαμοιρασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοιρασμένο ήδη με τον χρήστη %s",
-    "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Αποτυχία διαμοιρασμού %s, δεν βρέθηκε το %s, μπορεί ο διακομιστής να είναι προσωρινά απροσπέλαστος.",
+    "Not allowed to create a federated share with the same user" : "Δεν επιτρέπεται η δημιουργία federated διαμοιρασμού με τον ίδιο χρήστη",
+    "File is already shared with %s" : "Το αρχείο είναι ήδη κοινόχρηστο με %s",
+    "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Η κοινή χρήση του %s απέτυχε, δεν ήταν δυνατή η εύρεση του %s, ίσως ο διακομιστής δεν είναι προσβάσιμος αυτήν τη στιγμή ή χρησιμοποιεί πιστοποιητικό που έχει υπογράψει αυτόματα.",
+    "Could not find share" : "Αδυναμία εύρεσης κοινόχρηστου",
     "Accept" : "Αποδοχή",
     "Decline" : "Απόρριψη",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #Nextcloud Federated Cloud ID μου, δείτε %s",
     "Share with me through my #Nextcloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #Nextcloud Federated Cloud ID μου",
-    "Federated Cloud Sharing" : "Διαμοιρασμός σε ομόσπονδα σύννεφα ",
+    "Sharing" : "Διαμοιρασμός",
-    "Open documentation" : "Ανοιχτή τεκμηρίωση.",
+    "Federated file sharing" : "Federated διαμοιρασμός αρχείου",
+    "Federated Cloud Sharing" : "Διαμοιρασμός Federated Cloud",
+    "Open documentation" : "Άνοιγμα τεκμηρίωσης",
+    "Adjust how people can share between servers." : "Προσαρμόστε το πως τα άτομα θα διαμοιράζονται μεταξύ των διακομιστών",
     "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές",
     "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές",
-    "Federated Cloud" : "Federated σύννεφο",
+    "Search global and public address book for users" : "Αναζήτηση σε γενικό και δημόσιο βιβλίο διευθύνσεων για χρήστες",
+    "Allow users to publish their data to a global and public address book" : "Επιτρέψτε στους χρήστες να δημοσιεύουν τα δεδομένα τους σε ένα γενικό και δημόσιο βιβλίο διευθύνσεων",
+    "Federated Cloud" : "Federated Cloud",
+    "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Μπορείτε να διαμοιράζεστε με οποιονδήποτε χρησιμοποιεί Nextcloud, ownCloud η Pydio! Απλά προσθέστε το Federated Cloud ID στο πλαίσιο διαλόγου διαμοιρασμού. Θα μοιάζει με person@cloud.example.com",
     "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:",
-    "Share it:" : "Μοιραστείτε το:",
+    "Share it so your friends can share files with you:" : "Διαμοιραστείτε το ώστε οι φίλοι σας να μπορούν να διαμοιράζονται αρχεία με εσάς:",
     "Add to your website" : "Προσθήκη στην ιστοσελίδα σας",
-    "Share with me via Nextcloud" : "Διαμοιρασμός με εμένα μέσω του ",
+    "Share with me via Nextcloud" : "Διαμοιραστείτε με εμένα μέσω του Nextcloud",
-    "HTML Code:" : "Κώδικας HTML:"
+    "HTML Code:" : "Κώδικας HTML:",
+    "Search global and public address book for users and let local users publish their data" : "Αναζήτηση σε γενικό και δημόσιο βιβλίο διευθύνσεων για χρήστες και επιτρέψτε τους τοπικούς χρήστες να δημοσιεύουν τα δεδομένα τους",
+    "Share it:" : "Μοιραστείτε το:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/federatedfilesharing/l10n/en_GB.js

@@ -16,13 +16,13 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Server to server sharing is not enabled on this server",
     "Couldn't establish a federated share." : "Couldn't establish a federated share.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Couldn't establish a federated share, maybe the password was wrong.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Federated Share request was successful, you will receive a invitation. Check your notifications.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Federated Share request sent, you will receive an invitation. Check your notifications.",
     "The mountpoint name contains invalid characters." : "The mountpoint name contains invalid characters.",
     "Not allowed to create a federated share with the owner." : "Not allowed to create a federated share with the owner.",
     "Invalid or untrusted SSL certificate" : "Invalid or untrusted SSL certificate",
     "Could not authenticate to remote share, password might be wrong" : "Could not authenticate to remote share, password might be wrong",
     "Storage not valid" : "Storage not valid",
-    "Federated Share successfully added" : "Federated Share successfully added",
+    "Federated share added" : "Federated share added",
     "Couldn't add remote share" : "Couldn't add remote share",
     "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s",
     "Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user",

apps/federatedfilesharing/l10n/en_GB.json

@@ -14,13 +14,13 @@
     "Server to server sharing is not enabled on this server" : "Server to server sharing is not enabled on this server",
     "Couldn't establish a federated share." : "Couldn't establish a federated share.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Couldn't establish a federated share, maybe the password was wrong.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Federated Share request was successful, you will receive a invitation. Check your notifications.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Federated Share request sent, you will receive an invitation. Check your notifications.",
     "The mountpoint name contains invalid characters." : "The mountpoint name contains invalid characters.",
     "Not allowed to create a federated share with the owner." : "Not allowed to create a federated share with the owner.",
     "Invalid or untrusted SSL certificate" : "Invalid or untrusted SSL certificate",
     "Could not authenticate to remote share, password might be wrong" : "Could not authenticate to remote share, password might be wrong",
     "Storage not valid" : "Storage not valid",
-    "Federated Share successfully added" : "Federated Share successfully added",
+    "Federated share added" : "Federated share added",
     "Couldn't add remote share" : "Couldn't add remote share",
     "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s",
     "Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user",

apps/federatedfilesharing/l10n/es.js

@@ -12,17 +12,17 @@ OC.L10N.register(
     "Not supported!" : "¡No se puede!",
     "Press ⌘-C to copy." : "Presiona ⌘-C para copiar.",
     "Press Ctrl-C to copy." : "Presiona Ctrl-C para copiar.",
-    "Invalid Federated Cloud ID" : "ID Nube federada inválida",
+    "Invalid Federated Cloud ID" : "ID de Nube Federada inválida",
     "Server to server sharing is not enabled on this server" : "Compartir entre servidores no está habilitado en este servidor",
     "Couldn't establish a federated share." : "No se puede añadir un compartido remoto",
     "Couldn't establish a federated share, maybe the password was wrong." : "No se pudo establecer un compartido remoto, puede que la contraseña fuera incorrecta.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "La petición de crear un compartido remoto fue aceptada, usted recibirá una notificación. Comprueba sus notificaciones.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Petición de recurso compartido federado enviada, recibirás una invitación. Comprueba tus notificaciones.",
     "The mountpoint name contains invalid characters." : "El punto de montaje contiene caracteres inválidos.",
     "Not allowed to create a federated share with the owner." : "No se permite crear un recurso compartido federado con el propietario",
     "Invalid or untrusted SSL certificate" : "Certificado SSL inválido o no confiable",
     "Could not authenticate to remote share, password might be wrong" : "No se ha podido autenticar para compartir remotamente, quizás esté mal la contraseña",
     "Storage not valid" : "Almacenamiento inválido",
-    "Federated Share successfully added" : "Compartido remoto federado añadido con éxito",
+    "Federated share added" : "Recurso compartido federado añadido",
     "Couldn't add remote share" : "No se puede añadir un compartido remoto",
     "Sharing %s failed, because this item is already shared with %s" : "Se falló al compartir %s, ya que este elemento ya está compartido con %s",
     "Not allowed to create a federated share with the same user" : "No se permite crear un recurso compartido federado con el mismo usuario",
@@ -35,8 +35,8 @@ OC.L10N.register(
     "You received {share} as a remote share from {user}" : "Ha recibido {share} como un compartido remoto de {user}",
     "Accept" : "Aceptar",
     "Decline" : "Denegar",
-    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #Nextcloud, ver %s",
+    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID de Nube Federada #Nextcloud, ver %s",
-    "Share with me through my #Nextcloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #Nextcloud",
+    "Share with me through my #Nextcloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID de Nube Federada #Nextcloud",
     "Sharing" : "Compartiendo",
     "Federated file sharing" : "Compartición de archivos federada",
     "Federated Cloud Sharing" : "Compartido en Cloud Federado",
@@ -47,8 +47,8 @@ OC.L10N.register(
     "Search global and public address book for users" : "Buscar libretas de contactos globales y públicas para usuarios",
     "Allow users to publish their data to a global and public address book" : "Permitir a los usuarios publicar su información en la libreta de direcciones global y pública",
     "Federated Cloud" : "Nube Federada",
-    "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "¡Puedes compartir con cualquiera que use Nextcloud, ownCloud o Pydio! Simplemente, pon su ID de nube federada en el diálogo de compartir. Es algo como person@cloud.example.com",
+    "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "¡Puedes compartir con cualquiera que use Nextcloud, ownCloud o Pydio! Simplemente, pon su ID de Nube Federada en el diálogo de compartir. Algo como person@cloud.example.com",
-    "Your Federated Cloud ID:" : "Su ID Nube Federada:",
+    "Your Federated Cloud ID:" : "Tu ID de Nube Federada:",
     "Share it so your friends can share files with you:" : "Compártelo para que tus amigos puedan compartir archivos contigo:",
     "Add to your website" : "Añadir a su sitio web",
     "Share with me via Nextcloud" : "Compartirlo conmigo vía Nextcloud",

apps/federatedfilesharing/l10n/es.json

@@ -10,17 +10,17 @@
     "Not supported!" : "¡No se puede!",
     "Press ⌘-C to copy." : "Presiona ⌘-C para copiar.",
     "Press Ctrl-C to copy." : "Presiona Ctrl-C para copiar.",
-    "Invalid Federated Cloud ID" : "ID Nube federada inválida",
+    "Invalid Federated Cloud ID" : "ID de Nube Federada inválida",
     "Server to server sharing is not enabled on this server" : "Compartir entre servidores no está habilitado en este servidor",
     "Couldn't establish a federated share." : "No se puede añadir un compartido remoto",
     "Couldn't establish a federated share, maybe the password was wrong." : "No se pudo establecer un compartido remoto, puede que la contraseña fuera incorrecta.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "La petición de crear un compartido remoto fue aceptada, usted recibirá una notificación. Comprueba sus notificaciones.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Petición de recurso compartido federado enviada, recibirás una invitación. Comprueba tus notificaciones.",
     "The mountpoint name contains invalid characters." : "El punto de montaje contiene caracteres inválidos.",
     "Not allowed to create a federated share with the owner." : "No se permite crear un recurso compartido federado con el propietario",
     "Invalid or untrusted SSL certificate" : "Certificado SSL inválido o no confiable",
     "Could not authenticate to remote share, password might be wrong" : "No se ha podido autenticar para compartir remotamente, quizás esté mal la contraseña",
     "Storage not valid" : "Almacenamiento inválido",
-    "Federated Share successfully added" : "Compartido remoto federado añadido con éxito",
+    "Federated share added" : "Recurso compartido federado añadido",
     "Couldn't add remote share" : "No se puede añadir un compartido remoto",
     "Sharing %s failed, because this item is already shared with %s" : "Se falló al compartir %s, ya que este elemento ya está compartido con %s",
     "Not allowed to create a federated share with the same user" : "No se permite crear un recurso compartido federado con el mismo usuario",
@@ -33,8 +33,8 @@
     "You received {share} as a remote share from {user}" : "Ha recibido {share} como un compartido remoto de {user}",
     "Accept" : "Aceptar",
     "Decline" : "Denegar",
-    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #Nextcloud, ver %s",
+    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID de Nube Federada #Nextcloud, ver %s",
-    "Share with me through my #Nextcloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #Nextcloud",
+    "Share with me through my #Nextcloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID de Nube Federada #Nextcloud",
     "Sharing" : "Compartiendo",
     "Federated file sharing" : "Compartición de archivos federada",
     "Federated Cloud Sharing" : "Compartido en Cloud Federado",
@@ -45,8 +45,8 @@
     "Search global and public address book for users" : "Buscar libretas de contactos globales y públicas para usuarios",
     "Allow users to publish their data to a global and public address book" : "Permitir a los usuarios publicar su información en la libreta de direcciones global y pública",
     "Federated Cloud" : "Nube Federada",
-    "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "¡Puedes compartir con cualquiera que use Nextcloud, ownCloud o Pydio! Simplemente, pon su ID de nube federada en el diálogo de compartir. Es algo como person@cloud.example.com",
+    "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "¡Puedes compartir con cualquiera que use Nextcloud, ownCloud o Pydio! Simplemente, pon su ID de Nube Federada en el diálogo de compartir. Algo como person@cloud.example.com",
-    "Your Federated Cloud ID:" : "Su ID Nube Federada:",
+    "Your Federated Cloud ID:" : "Tu ID de Nube Federada:",
     "Share it so your friends can share files with you:" : "Compártelo para que tus amigos puedan compartir archivos contigo:",
     "Add to your website" : "Añadir a su sitio web",
     "Share with me via Nextcloud" : "Compartirlo conmigo vía Nextcloud",

apps/federatedfilesharing/l10n/es_AR.js

@@ -16,13 +16,11 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Compartir de servidor a servidor no está habilitado en este servidor",
     "Couldn't establish a federated share." : "No fue posible establecer el elemento compartido federado. ",
     "Couldn't establish a federated share, maybe the password was wrong." : "No fue posible establecer el elemento compartido federado, tal vez la contraseña sea incorrecta. ",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "La solicitud del elemento compatido federado fue exitosa, recibirá una invitación. Verifique sus notificaciones. ",
     "The mountpoint name contains invalid characters." : "El nombre del punto de montaje contiene caracteres inválidos.",
     "Not allowed to create a federated share with the owner." : "No está permitido crear un elemento compartido federado con el dueño. ",
     "Invalid or untrusted SSL certificate" : "Certificado SSL inválido o no confiable",
     "Could not authenticate to remote share, password might be wrong" : "No fue posible autenticarse ante el elemento compartido remoto, la contraseña puede estar mal",
     "Storage not valid" : "Almacenamiento inválido",
-    "Federated Share successfully added" : "El Elemento Compartido Federado fue agregado exitosamente",
     "Couldn't add remote share" : "No fue posible agregar el elemento compartido remoto",
     "Sharing %s failed, because this item is already shared with %s" : "Se presentó una falla al compartir %s, porque este elemento ya se encuentra compartido con  %s",
     "Not allowed to create a federated share with the same user" : "No está permitido crear un elelmento compartido federado con el mismo usuario",

apps/federatedfilesharing/l10n/es_AR.json

@@ -14,13 +14,11 @@
     "Server to server sharing is not enabled on this server" : "Compartir de servidor a servidor no está habilitado en este servidor",
     "Couldn't establish a federated share." : "No fue posible establecer el elemento compartido federado. ",
     "Couldn't establish a federated share, maybe the password was wrong." : "No fue posible establecer el elemento compartido federado, tal vez la contraseña sea incorrecta. ",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "La solicitud del elemento compatido federado fue exitosa, recibirá una invitación. Verifique sus notificaciones. ",
     "The mountpoint name contains invalid characters." : "El nombre del punto de montaje contiene caracteres inválidos.",
     "Not allowed to create a federated share with the owner." : "No está permitido crear un elemento compartido federado con el dueño. ",
     "Invalid or untrusted SSL certificate" : "Certificado SSL inválido o no confiable",
     "Could not authenticate to remote share, password might be wrong" : "No fue posible autenticarse ante el elemento compartido remoto, la contraseña puede estar mal",
     "Storage not valid" : "Almacenamiento inválido",
-    "Federated Share successfully added" : "El Elemento Compartido Federado fue agregado exitosamente",
     "Couldn't add remote share" : "No fue posible agregar el elemento compartido remoto",
     "Sharing %s failed, because this item is already shared with %s" : "Se presentó una falla al compartir %s, porque este elemento ya se encuentra compartido con  %s",
     "Not allowed to create a federated share with the same user" : "No está permitido crear un elelmento compartido federado con el mismo usuario",

apps/federatedfilesharing/l10n/es_MX.js

@@ -16,13 +16,13 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Compartir de servidor a servidor no está habilitado en este servidor",
     "Couldn't establish a federated share." : "No fue posible establecer el elemento compartido federado. ",
     "Couldn't establish a federated share, maybe the password was wrong." : "No fue posible establecer el elemento compartido federado, tal vez la contraseña sea incorrecta. ",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "La solicitud del elemento compatido federado fue exitosa, recibirás una invitación. Verifica tus notificaciones. ",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Solicitud de elemento compartido Federado enviada, recibiras una invitación. Verifica tus notificaciones.",
     "The mountpoint name contains invalid characters." : "El nombre del punto de montaje contiene caracteres inválidos.",
     "Not allowed to create a federated share with the owner." : "No está permitido crear un elemento compartido federado con el dueño. ",
     "Invalid or untrusted SSL certificate" : "Certificado SSL inválido o no confiable",
     "Could not authenticate to remote share, password might be wrong" : "No fue posible autenticarse ante el elemento compartido remoto, la contraseña puede estar incorrecta",
     "Storage not valid" : "Almacenamiento inválido",
-    "Federated Share successfully added" : "El Elemento Compartido Federado fue agregado exitosamente",
+    "Federated share added" : "Elemento compartido Federado agregado",
     "Couldn't add remote share" : "No fue posible agregar el elemento compartido remoto",
     "Sharing %s failed, because this item is already shared with %s" : "Se presentó una falla al compartir %s, porque este elemento ya se encuentra compartido con  %s",
     "Not allowed to create a federated share with the same user" : "No está permitido crear un elelmento compartido federado con el mismo usuario",

apps/federatedfilesharing/l10n/es_MX.json

@@ -14,13 +14,13 @@
     "Server to server sharing is not enabled on this server" : "Compartir de servidor a servidor no está habilitado en este servidor",
     "Couldn't establish a federated share." : "No fue posible establecer el elemento compartido federado. ",
     "Couldn't establish a federated share, maybe the password was wrong." : "No fue posible establecer el elemento compartido federado, tal vez la contraseña sea incorrecta. ",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "La solicitud del elemento compatido federado fue exitosa, recibirás una invitación. Verifica tus notificaciones. ",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Solicitud de elemento compartido Federado enviada, recibiras una invitación. Verifica tus notificaciones.",
     "The mountpoint name contains invalid characters." : "El nombre del punto de montaje contiene caracteres inválidos.",
     "Not allowed to create a federated share with the owner." : "No está permitido crear un elemento compartido federado con el dueño. ",
     "Invalid or untrusted SSL certificate" : "Certificado SSL inválido o no confiable",
     "Could not authenticate to remote share, password might be wrong" : "No fue posible autenticarse ante el elemento compartido remoto, la contraseña puede estar incorrecta",
     "Storage not valid" : "Almacenamiento inválido",
-    "Federated Share successfully added" : "El Elemento Compartido Federado fue agregado exitosamente",
+    "Federated share added" : "Elemento compartido Federado agregado",
     "Couldn't add remote share" : "No fue posible agregar el elemento compartido remoto",
     "Sharing %s failed, because this item is already shared with %s" : "Se presentó una falla al compartir %s, porque este elemento ya se encuentra compartido con  %s",
     "Not allowed to create a federated share with the same user" : "No está permitido crear un elelmento compartido federado con el mismo usuario",

apps/federatedfilesharing/l10n/fi.js

@@ -16,13 +16,11 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Palvelimien kesken jakaminen ei ole käytössä tällä palvelimella",
     "Couldn't establish a federated share." : "Ei voinut muodostaa federoitua jakoa.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Ei voinut muodostaa federoitua jakoa. Ehkä salasana oli väärin.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Federoidun jaon pyyntö onnistui. Tulet saamaan kutsun. Tarkista ilmoituksesi.",
     "The mountpoint name contains invalid characters." : "Liitospisteen nimi sisältää virheellisiä merkkejä.",
     "Not allowed to create a federated share with the owner." : "Omistajan kanssa ei ole sallittua luoda federoitua jakoa.",
     "Invalid or untrusted SSL certificate" : "Virheellinen tai ei-luotettu SSL-varmenne",
     "Could not authenticate to remote share, password might be wrong" : "Tunnistautuminen etäjakoa kohtaan epäonnistui. Salasana saattaa olla väärä",
     "Storage not valid" : "Tallennustila ei ole kelvollinen",
-    "Federated Share successfully added" : "Federoitu jako lisätty onnistuneesti",
     "Couldn't add remote share" : "Etäjaon liittäminen epäonnistui",
     "Sharing %s failed, because this item is already shared with %s" : "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjälle %s",
     "Not allowed to create a federated share with the same user" : "Saman käyttäjän kanssa ei ole sallittua luoda federoitua jakoa",

apps/federatedfilesharing/l10n/fi.json

@@ -14,13 +14,11 @@
     "Server to server sharing is not enabled on this server" : "Palvelimien kesken jakaminen ei ole käytössä tällä palvelimella",
     "Couldn't establish a federated share." : "Ei voinut muodostaa federoitua jakoa.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Ei voinut muodostaa federoitua jakoa. Ehkä salasana oli väärin.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Federoidun jaon pyyntö onnistui. Tulet saamaan kutsun. Tarkista ilmoituksesi.",
     "The mountpoint name contains invalid characters." : "Liitospisteen nimi sisältää virheellisiä merkkejä.",
     "Not allowed to create a federated share with the owner." : "Omistajan kanssa ei ole sallittua luoda federoitua jakoa.",
     "Invalid or untrusted SSL certificate" : "Virheellinen tai ei-luotettu SSL-varmenne",
     "Could not authenticate to remote share, password might be wrong" : "Tunnistautuminen etäjakoa kohtaan epäonnistui. Salasana saattaa olla väärä",
     "Storage not valid" : "Tallennustila ei ole kelvollinen",
-    "Federated Share successfully added" : "Federoitu jako lisätty onnistuneesti",
     "Couldn't add remote share" : "Etäjaon liittäminen epäonnistui",
     "Sharing %s failed, because this item is already shared with %s" : "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjälle %s",
     "Not allowed to create a federated share with the same user" : "Saman käyttäjän kanssa ei ole sallittua luoda federoitua jakoa",

apps/federatedfilesharing/l10n/fr.js

@@ -16,13 +16,13 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Le partage de serveur à serveur n'est pas activé sur ce serveur",
     "Couldn't establish a federated share." : "Impossible d'établir un partage fédéré.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Impossible d'établir un partage fédéré, peut-être que le mot de passe est incorrect.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "La demande de partage fédéré est réussie, vous allez recevoir une invitation. Vérifiez vos notifications.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Demande de partage fédéré envoyée, vous allez recevoir une invitation. Vérifiez vos notifications.",
     "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères invalides.",
     "Not allowed to create a federated share with the owner." : "Vous n'êtes pas autorisé à créer un partage fédéré avec le propriétaire.",
     "Invalid or untrusted SSL certificate" : "Certificat SSL invalide ou non approuvé",
     "Could not authenticate to remote share, password might be wrong" : "Impossible de se connecter au partage distant, le mot de passe peut-être incorrect",
     "Storage not valid" : "Support de stockage non valide",
-    "Federated Share successfully added" : "Partage fédéré ajouté avec succès",
+    "Federated share added" : "Partage fédéré ajouté",
     "Couldn't add remote share" : "Impossible d'ajouter le partage distant",
     "Sharing %s failed, because this item is already shared with %s" : "Le partage de %s a échoué car cet élément est déjà partagé avec %s",
     "Not allowed to create a federated share with the same user" : "Non autorisé à créer un partage fédéré avec le même utilisateur",

apps/federatedfilesharing/l10n/fr.json

@@ -14,13 +14,13 @@
     "Server to server sharing is not enabled on this server" : "Le partage de serveur à serveur n'est pas activé sur ce serveur",
     "Couldn't establish a federated share." : "Impossible d'établir un partage fédéré.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Impossible d'établir un partage fédéré, peut-être que le mot de passe est incorrect.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "La demande de partage fédéré est réussie, vous allez recevoir une invitation. Vérifiez vos notifications.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Demande de partage fédéré envoyée, vous allez recevoir une invitation. Vérifiez vos notifications.",
     "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères invalides.",
     "Not allowed to create a federated share with the owner." : "Vous n'êtes pas autorisé à créer un partage fédéré avec le propriétaire.",
     "Invalid or untrusted SSL certificate" : "Certificat SSL invalide ou non approuvé",
     "Could not authenticate to remote share, password might be wrong" : "Impossible de se connecter au partage distant, le mot de passe peut-être incorrect",
     "Storage not valid" : "Support de stockage non valide",
-    "Federated Share successfully added" : "Partage fédéré ajouté avec succès",
+    "Federated share added" : "Partage fédéré ajouté",
     "Couldn't add remote share" : "Impossible d'ajouter le partage distant",
     "Sharing %s failed, because this item is already shared with %s" : "Le partage de %s a échoué car cet élément est déjà partagé avec %s",
     "Not allowed to create a federated share with the same user" : "Non autorisé à créer un partage fédéré avec le même utilisateur",

apps/federatedfilesharing/l10n/hu.js

@@ -16,13 +16,11 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "A kiszolgálók közötti megosztás nincs engedélyezve ezen a kiszolgálón",
     "Couldn't establish a federated share." : "Egy egyesített megosztás nem hozható létre.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Egy egyesített megosztás nem hozható létre, lehet hogy nem megfelelő a jelszó.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Az egyesített megosztási kérés sikeres volt, kapni fogsz egy értesítést. Ellenőrizd az értesítéseidet.",
     "The mountpoint name contains invalid characters." : "A csatolási pont neve érvénytelen karaktereket tartalmaz ",
     "Not allowed to create a federated share with the owner." : "A tulajdonossal nem lehet egyesített megosztást létrehozni.",
     "Invalid or untrusted SSL certificate" : "Érvénytelen vagy nem megbízható az SSL tanúsítvány",
     "Could not authenticate to remote share, password might be wrong" : "Nem sikerült az azonosítás a távoli megosztáshoz. Lehet, hogy rossz a jelszó.",
     "Storage not valid" : "A tároló nem érvényes",
-    "Federated Share successfully added" : "Egyesített megosztás sikeresen hozzáadva",
     "Couldn't add remote share" : "Távoli megosztás nem adható hozzá",
     "Sharing %s failed, because this item is already shared with %s" : "%s megosztása nem sikerült, mert ez már meg van osztva vele: %s",
     "Not allowed to create a federated share with the same user" : "Azonos felhasználóval nem lehet létrehozni egyesített megosztást",

apps/federatedfilesharing/l10n/hu.json

@@ -14,13 +14,11 @@
     "Server to server sharing is not enabled on this server" : "A kiszolgálók közötti megosztás nincs engedélyezve ezen a kiszolgálón",
     "Couldn't establish a federated share." : "Egy egyesített megosztás nem hozható létre.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Egy egyesített megosztás nem hozható létre, lehet hogy nem megfelelő a jelszó.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Az egyesített megosztási kérés sikeres volt, kapni fogsz egy értesítést. Ellenőrizd az értesítéseidet.",
     "The mountpoint name contains invalid characters." : "A csatolási pont neve érvénytelen karaktereket tartalmaz ",
     "Not allowed to create a federated share with the owner." : "A tulajdonossal nem lehet egyesített megosztást létrehozni.",
     "Invalid or untrusted SSL certificate" : "Érvénytelen vagy nem megbízható az SSL tanúsítvány",
     "Could not authenticate to remote share, password might be wrong" : "Nem sikerült az azonosítás a távoli megosztáshoz. Lehet, hogy rossz a jelszó.",
     "Storage not valid" : "A tároló nem érvényes",
-    "Federated Share successfully added" : "Egyesített megosztás sikeresen hozzáadva",
     "Couldn't add remote share" : "Távoli megosztás nem adható hozzá",
     "Sharing %s failed, because this item is already shared with %s" : "%s megosztása nem sikerült, mert ez már meg van osztva vele: %s",
     "Not allowed to create a federated share with the same user" : "Azonos felhasználóval nem lehet létrehozni egyesített megosztást",

apps/federatedfilesharing/l10n/ia.js

@@ -16,13 +16,11 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Le Compartir de Servitor a Servitor non es activate in iste servitor",
     "Couldn't establish a federated share." : "Impossibile establir le Compartir Federate.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Impossibile establir le Compartir Federate, possibilemente le contrasigno esseva incorrecte.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Le demanda pro un Compartir Federate ha successo, tu recipera un invitation. Verifica tu notificationes.",
     "The mountpoint name contains invalid characters." : "Le nomine pro le puncto de montage contine characteres non valide.",
     "Not allowed to create a federated share with the owner." : "Il non es permittite crear le Compartir Federate con le proprietario.",
     "Invalid or untrusted SSL certificate" : "Certificato SSL non valide o non fiduciari",
     "Could not authenticate to remote share, password might be wrong" : "Impossibile authenticar al Compartir Remote, le contrasigno debe esser incorrecte",
     "Storage not valid" : "Immagazinage non valide",
-    "Federated Share successfully added" : "Le Compartir Federate addite con successo",
     "Couldn't add remote share" : "Impossibile adder le Compartir Remote",
     "Sharing %s failed, because this item is already shared with %s" : "Compartir %s falleva, proque iste elemento ja es compartite con %s",
     "Not allowed to create a federated share with the same user" : "Il non es permittite crear le Compartir Federate con le mesme usator.",

apps/federatedfilesharing/l10n/ia.json

@@ -14,13 +14,11 @@
     "Server to server sharing is not enabled on this server" : "Le Compartir de Servitor a Servitor non es activate in iste servitor",
     "Couldn't establish a federated share." : "Impossibile establir le Compartir Federate.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Impossibile establir le Compartir Federate, possibilemente le contrasigno esseva incorrecte.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Le demanda pro un Compartir Federate ha successo, tu recipera un invitation. Verifica tu notificationes.",
     "The mountpoint name contains invalid characters." : "Le nomine pro le puncto de montage contine characteres non valide.",
     "Not allowed to create a federated share with the owner." : "Il non es permittite crear le Compartir Federate con le proprietario.",
     "Invalid or untrusted SSL certificate" : "Certificato SSL non valide o non fiduciari",
     "Could not authenticate to remote share, password might be wrong" : "Impossibile authenticar al Compartir Remote, le contrasigno debe esser incorrecte",
     "Storage not valid" : "Immagazinage non valide",
-    "Federated Share successfully added" : "Le Compartir Federate addite con successo",
     "Couldn't add remote share" : "Impossibile adder le Compartir Remote",
     "Sharing %s failed, because this item is already shared with %s" : "Compartir %s falleva, proque iste elemento ja es compartite con %s",
     "Not allowed to create a federated share with the same user" : "Il non es permittite crear le Compartir Federate con le mesme usator.",

apps/federatedfilesharing/l10n/id.js

@@ -16,13 +16,11 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Berbagi server ke server tidak diaktifkan pada server ini",
     "Couldn't establish a federated share." : "Tidak dapat mendirikan pembagian terfederasi",
     "Couldn't establish a federated share, maybe the password was wrong." : "Tidak dapat mendirikan pembagian terfederasi, mungkin sandi salah.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Permintaan pembagian terfederasi sukses, Anda akan mendapatkan undangan. Cek pemberitahuan Anda.",
     "The mountpoint name contains invalid characters." : "Nama mount point berisi karakter yang tidak sah.",
     "Not allowed to create a federated share with the owner." : "Tidak diizinkan membuat pembagian terfederasi dengan pemilik.",
     "Invalid or untrusted SSL certificate" : "Sertifikat SSL tidak sah atau tidak terpercaya",
     "Could not authenticate to remote share, password might be wrong" : "Tidak dapat mengautentikasi berbagi remote, kata sandi mungkin salah",
     "Storage not valid" : "Penyimpanan tidak sah",
-    "Federated Share successfully added" : "Pembagian terfederasi sukses ditambahkan",
     "Couldn't add remote share" : "Tidak dapat menambahkan berbagi remote",
     "Sharing %s failed, because this item is already shared with %s" : "Gagal membagkan %s, karena item ini sudah dibagikan dengan %s",
     "Not allowed to create a federated share with the same user" : "Tidak diizinkan membuat pembagian terfederasi dengan pengguna yang sama",

apps/federatedfilesharing/l10n/id.json

@@ -14,13 +14,11 @@
     "Server to server sharing is not enabled on this server" : "Berbagi server ke server tidak diaktifkan pada server ini",
     "Couldn't establish a federated share." : "Tidak dapat mendirikan pembagian terfederasi",
     "Couldn't establish a federated share, maybe the password was wrong." : "Tidak dapat mendirikan pembagian terfederasi, mungkin sandi salah.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Permintaan pembagian terfederasi sukses, Anda akan mendapatkan undangan. Cek pemberitahuan Anda.",
     "The mountpoint name contains invalid characters." : "Nama mount point berisi karakter yang tidak sah.",
     "Not allowed to create a federated share with the owner." : "Tidak diizinkan membuat pembagian terfederasi dengan pemilik.",
     "Invalid or untrusted SSL certificate" : "Sertifikat SSL tidak sah atau tidak terpercaya",
     "Could not authenticate to remote share, password might be wrong" : "Tidak dapat mengautentikasi berbagi remote, kata sandi mungkin salah",
     "Storage not valid" : "Penyimpanan tidak sah",
-    "Federated Share successfully added" : "Pembagian terfederasi sukses ditambahkan",
     "Couldn't add remote share" : "Tidak dapat menambahkan berbagi remote",
     "Sharing %s failed, because this item is already shared with %s" : "Gagal membagkan %s, karena item ini sudah dibagikan dengan %s",
     "Not allowed to create a federated share with the same user" : "Tidak diizinkan membuat pembagian terfederasi dengan pengguna yang sama",

apps/federatedfilesharing/l10n/is.js

@@ -16,13 +16,13 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Deiling frá þjóni til þjóns er ekki virk á þessum þjóni",
     "Couldn't establish a federated share." : "Gat ekki bætt við skýjasambandssameign.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Gat ekki bætt við skýjasambandssameign, hugsanlega var lykilorðið ekki rétt.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Beiðni um skýjasambandssameign tókst, þú munt fá boðskort. Athugaður skilaboð til þín.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Sendi beiðni um skýjasambandssameign, þú munt fá boðskort. Athugaðu skilaboð til þín.",
     "The mountpoint name contains invalid characters." : "Heiti tengipunktsins inniheldur ógilda stafi.",
     "Not allowed to create a federated share with the owner." : "Ekki er heimilt að búa til skýjasambandssameign með eigandanum.",
     "Invalid or untrusted SSL certificate" : "Ógilt eða vantreyst SSL-skilríki",
     "Could not authenticate to remote share, password might be wrong" : "Gat ekki auðkennt á fjartengdri sameign, lykilorð gæti verið rangt",
     "Storage not valid" : "Geymslan er ekki gild",
-    "Federated Share successfully added" : "Tókst að bæta við skýjasambandssameign",
+    "Federated share added" : "Bætti við skýjasambandssameign",
     "Couldn't add remote share" : "Gat ekki bætt við fjartengdri sameign",
     "Sharing %s failed, because this item is already shared with %s" : "Deiling %s mistókst, því þessu atriði er þegar deilt með %s",
     "Not allowed to create a federated share with the same user" : "Ekki er heimilt að búa til skýjasambandssameign með sama notanda",

apps/federatedfilesharing/l10n/is.json

@@ -14,13 +14,13 @@
     "Server to server sharing is not enabled on this server" : "Deiling frá þjóni til þjóns er ekki virk á þessum þjóni",
     "Couldn't establish a federated share." : "Gat ekki bætt við skýjasambandssameign.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Gat ekki bætt við skýjasambandssameign, hugsanlega var lykilorðið ekki rétt.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Beiðni um skýjasambandssameign tókst, þú munt fá boðskort. Athugaður skilaboð til þín.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Sendi beiðni um skýjasambandssameign, þú munt fá boðskort. Athugaðu skilaboð til þín.",
     "The mountpoint name contains invalid characters." : "Heiti tengipunktsins inniheldur ógilda stafi.",
     "Not allowed to create a federated share with the owner." : "Ekki er heimilt að búa til skýjasambandssameign með eigandanum.",
     "Invalid or untrusted SSL certificate" : "Ógilt eða vantreyst SSL-skilríki",
     "Could not authenticate to remote share, password might be wrong" : "Gat ekki auðkennt á fjartengdri sameign, lykilorð gæti verið rangt",
     "Storage not valid" : "Geymslan er ekki gild",
-    "Federated Share successfully added" : "Tókst að bæta við skýjasambandssameign",
+    "Federated share added" : "Bætti við skýjasambandssameign",
     "Couldn't add remote share" : "Gat ekki bætt við fjartengdri sameign",
     "Sharing %s failed, because this item is already shared with %s" : "Deiling %s mistókst, því þessu atriði er þegar deilt með %s",
     "Not allowed to create a federated share with the same user" : "Ekki er heimilt að búa til skýjasambandssameign með sama notanda",

apps/federatedfilesharing/l10n/it.js

@@ -16,13 +16,11 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "La condivisione tra server non è abilitata su questo server",
     "Couldn't establish a federated share." : "Impossibile stabilire una condivisione federata.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Impossibile stabilire una condivisione federata, forse la password non è corretta.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "La richiesta della condivisione federata è stata eseguita con successo, riceverai un invito. Controlla le tue notifiche.",
     "The mountpoint name contains invalid characters." : "Il nome del punto di mount contiene caratteri non validi.",
     "Not allowed to create a federated share with the owner." : "Non è consentito creare una condivisione federata con il proprietario.",
     "Invalid or untrusted SSL certificate" : "Certificato SSL non valido o non attendibile",
     "Could not authenticate to remote share, password might be wrong" : "Impossibile autenticarsi sulla condivisione remota, la password potrebbe essere errata",
     "Storage not valid" : "Archiviazione non valida",
-    "Federated Share successfully added" : "Condivisione federata aggiunta con successo",
     "Couldn't add remote share" : "Impossibile aggiungere la condivisione remota",
     "Sharing %s failed, because this item is already shared with %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con %s",
     "Not allowed to create a federated share with the same user" : "Non è consentito creare una condivisione federata con lo stesso utente",
@@ -37,6 +35,7 @@ OC.L10N.register(
     "Decline" : "Rifiuta",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #Nextcloud, vedi %s",
     "Share with me through my #Nextcloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #Nextcloud",
+    "Sharing" : "Condivisione",
     "Federated file sharing" : "Condivisione file federata",
     "Federated Cloud Sharing" : "Condivisione cloud federata",
     "Open documentation" : "Apri la documentazione",

apps/federatedfilesharing/l10n/it.json

@@ -14,13 +14,11 @@
     "Server to server sharing is not enabled on this server" : "La condivisione tra server non è abilitata su questo server",
     "Couldn't establish a federated share." : "Impossibile stabilire una condivisione federata.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Impossibile stabilire una condivisione federata, forse la password non è corretta.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "La richiesta della condivisione federata è stata eseguita con successo, riceverai un invito. Controlla le tue notifiche.",
     "The mountpoint name contains invalid characters." : "Il nome del punto di mount contiene caratteri non validi.",
     "Not allowed to create a federated share with the owner." : "Non è consentito creare una condivisione federata con il proprietario.",
     "Invalid or untrusted SSL certificate" : "Certificato SSL non valido o non attendibile",
     "Could not authenticate to remote share, password might be wrong" : "Impossibile autenticarsi sulla condivisione remota, la password potrebbe essere errata",
     "Storage not valid" : "Archiviazione non valida",
-    "Federated Share successfully added" : "Condivisione federata aggiunta con successo",
     "Couldn't add remote share" : "Impossibile aggiungere la condivisione remota",
     "Sharing %s failed, because this item is already shared with %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con %s",
     "Not allowed to create a federated share with the same user" : "Non è consentito creare una condivisione federata con lo stesso utente",
@@ -35,6 +33,7 @@
     "Decline" : "Rifiuta",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #Nextcloud, vedi %s",
     "Share with me through my #Nextcloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #Nextcloud",
+    "Sharing" : "Condivisione",
     "Federated file sharing" : "Condivisione file federata",
     "Federated Cloud Sharing" : "Condivisione cloud federata",
     "Open documentation" : "Apri la documentazione",

apps/federatedfilesharing/l10n/ko.js

@@ -16,13 +16,11 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "이 서버에서 서버간 공유를 사용할 수 없음",
     "Couldn't establish a federated share." : "연합 공유를 설정할 수 없습니다.",
     "Couldn't establish a federated share, maybe the password was wrong." : "연합 공유를 설정할 수 없습니다. 암호가 잘못되었을 수도 있습니다.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "연합 공유 요청이 성공했으며 초대장을 받을 것입니다. 알림을 확인하십시오.",
     "The mountpoint name contains invalid characters." : "마운트 지점 이름에 잘못된 글자가 포함되어 있습니다.",
     "Not allowed to create a federated share with the owner." : "소유자와 연합 공유를 만들 수 없음",
     "Invalid or untrusted SSL certificate" : "유효하지 않거나 신뢰할 수없는 SSL 인증서",
     "Could not authenticate to remote share, password might be wrong" : "원격 공유에 인증할 수 없습니다. 암호가 잘못되었을 수도 있습니다",
     "Storage not valid" : "유효하지 않은 저장소",
-    "Federated Share successfully added" : "연합 공유를 성공적으로 추가함",
     "Couldn't add remote share" : "원격 공유를 추가할 수 없음",
     "Sharing %s failed, because this item is already shared with %s" : "%s을(를) 공유할 수 없습니다. 이미 %s 님과 공유되어 있습니다",
     "Not allowed to create a federated share with the same user" : "같은 사용자와 연합 공유를 만들 수 없음",

apps/federatedfilesharing/l10n/ko.json

@@ -14,13 +14,11 @@
     "Server to server sharing is not enabled on this server" : "이 서버에서 서버간 공유를 사용할 수 없음",
     "Couldn't establish a federated share." : "연합 공유를 설정할 수 없습니다.",
     "Couldn't establish a federated share, maybe the password was wrong." : "연합 공유를 설정할 수 없습니다. 암호가 잘못되었을 수도 있습니다.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "연합 공유 요청이 성공했으며 초대장을 받을 것입니다. 알림을 확인하십시오.",
     "The mountpoint name contains invalid characters." : "마운트 지점 이름에 잘못된 글자가 포함되어 있습니다.",
     "Not allowed to create a federated share with the owner." : "소유자와 연합 공유를 만들 수 없음",
     "Invalid or untrusted SSL certificate" : "유효하지 않거나 신뢰할 수없는 SSL 인증서",
     "Could not authenticate to remote share, password might be wrong" : "원격 공유에 인증할 수 없습니다. 암호가 잘못되었을 수도 있습니다",
     "Storage not valid" : "유효하지 않은 저장소",
-    "Federated Share successfully added" : "연합 공유를 성공적으로 추가함",
     "Couldn't add remote share" : "원격 공유를 추가할 수 없음",
     "Sharing %s failed, because this item is already shared with %s" : "%s을(를) 공유할 수 없습니다. 이미 %s 님과 공유되어 있습니다",
     "Not allowed to create a federated share with the same user" : "같은 사용자와 연합 공유를 만들 수 없음",

apps/federatedfilesharing/l10n/lt_LT.js

@@ -1,19 +1,59 @@
 OC.L10N.register(
     "federatedfilesharing",
     {
+    "Federated sharing" : "Dalinimasis kitame serveryje",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Ar norite peržiūrėti {name} nuo {owner}@{remote}?",
+    "Remote share" : "Kitame serveryje pasidalinti duomenys",
+    "Remote share password" : "Kitame serveryje pasidalintų duomenų slaptažodis",
+    "Cancel" : "Atsisakyti",
+    "Add remote share" : "Pasidalinti duomenimis kitame serveryje",
+    "Copy" : "Kopijuoti",
+    "Copied!" : "Nukopijuota!",
+    "Not supported!" : "Nepalaikoma!",
+    "Press ⌘-C to copy." : "Norėdami nukopijuoti, paspauskite ⌘-C.",
+    "Press Ctrl-C to copy." : "Paspauskite Ctrl-C, kad nukopijuotumėte.",
+    "Invalid Federated Cloud ID" : "Neteisingas Centralizuoto Serverio ID",
+    "Server to server sharing is not enabled on this server" : "Dalinimasis tarp serverių yra neleidžiamas šiame serveryje",
+    "Couldn't establish a federated share." : "Neįmanoma pradėti dalintis kitame serveryje.",
+    "Couldn't establish a federated share, maybe the password was wrong." : "Neįmanoma pradėti dalintis kitame serveryje. Gal jūsų slaptažodis blogas?",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Dalinimosi kitame serveryje užklausa išsiųsta. Jūs būsite informuoti, jei pasidalinimas bus sėkmingas. ",
+    "The mountpoint name contains invalid characters." : "Prijungimo taškas turi netinkamų naudoti simbolių.",
+    "Not allowed to create a federated share with the owner." : "Savininkas neleidžia dalintis duomenimis su kitu serveriu.",
+    "Invalid or untrusted SSL certificate" : "Neteisingas arba nepatikimas SSL liudijimas",
+    "Could not authenticate to remote share, password might be wrong" : "Neįmanoma pradėti dalintis kitame serveryje. Gal jūsų slaptažodis blogas?",
+    "Storage not valid" : "Saugykla netinkama naudotis",
+    "Federated share added" : "Pasidalinta per kitą serverį",
+    "Couldn't add remote share" : "Nepavyko peržiūrėti kitame serveryje pasidalintų duomenų",
+    "Sharing %s failed, because this item is already shared with %s" : "%s bendrinimas nepavyko, kadangi šis elementas jau yra bendrinamas su %s",
+    "Not allowed to create a federated share with the same user" : "Negalima dalintis su identišku naudotoju kitame serveryje",
+    "File is already shared with %s" : "Failas jau yra bendrinamas su %s",
+    "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "\"%s\" pasidalinimas nepavyko, neįmanoma rasti %s, tikėtina, kad serveris šiuo metu nepasiekiamas arba naudoja nepatikimą sertifikatą.",
+    "Could not find share" : "Nepavyko rasti bendrinamų duomenų",
+    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Gavote galimybę peržiūrėti duomenis \"%3$s\", kuriuos pasidalino %1$s (%2$s vardu) esantis kitame serveryje",
+    "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Gavote galimybę peržiūrėti duomenis \"{share}\", kuriuos pasidalino {user} ({behalf} vardu) esantis kitame serveryje",
+    "You received \"%3$s\" as a remote share from %1$s" : "Gavote galimybę peržiūrėti duomenis \"%3$s\", kuriuos pasidalino %1$s",
+    "You received {share} as a remote share from {user}" : "Gavote galimybę peržiūrėti duomenis \"{share}\", kuriuos pasidalino {user}",
     "Accept" : "Priimti",
     "Decline" : "Atmesti",
-    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Pasidalink su manimi per #Nextcloud padebesius, plačiau %s",
+    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Pasidalinti su manimi per #Nextcloud Centralizuoto Serverio ID, toliau %s",
-    "Share with me through my #Nextcloud Federated Cloud ID" : "Pasidalink su manimi per #Nextcloud padebesius",
+    "Share with me through my #Nextcloud Federated Cloud ID" : "Pasidalinti su manimi per #Nextcloud Centralizuoto Serverio ID",
-    "Federated Cloud Sharing" : "Viešas dalijimasis padebesiu",
+    "Sharing" : "Dalinamasis",
-    "Open documentation" : "Atidaryti dokumentą",
+    "Federated file sharing" : "Dalinimasis centralizuotame serveryje",
-    "Allow users on this server to send shares to other servers" : "Leisti vartotojams šiame serveryje dalintis su kitais serveriais",
+    "Federated Cloud Sharing" : "Centralizuotas Dalinimasis Serveriuose",
-    "Allow users on this server to receive shares from other servers" : "Leisti vartotojams šiame serveryje priimti dalijimusis iš kitų serverių",
+    "Open documentation" : "Atverti dokumentaciją",
-    "Federated Cloud" : "Viešas debesis",
+    "Adjust how people can share between servers." : "Nustatyti taisykles, kaip naudotojai gali dalintis duomenimis tarp serverių.",
-    "Your Federated Cloud ID:" : "Tavo debesies ID:",
+    "Allow users on this server to send shares to other servers" : "Leisti šio serverio naudotojams dalintis duomenimis su kitais serveriais",
-    "Share it:" : "Pasidalink:",
+    "Allow users on this server to receive shares from other servers" : "Leisti šio serverio naudotojams priimti kituose serveriuose dalinamus duomenis",
-    "Add to your website" : "Pridėti tavo puslapį",
+    "Search global and public address book for users" : "Ieškoti vartotojų globaliose ir viešose adresų knygose",
-    "Share with me via Nextcloud" : "Pasidalink su manimi per Nextcloud",
+    "Allow users to publish their data to a global and public address book" : "Leisti naudotojams viešinti savo duomenis globaliose ar viešose adresų knygose",
-    "HTML Code:" : "HTML kodas:"
+    "Federated Cloud" : "Centralizuotas Serveris",
+    "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Galite dalintis su visais, kas naudojasi NextCloud, ownCloud ar Pydio! Tiesiog dalinimosi dialoge įrašykite jų Centralizuoto Serverio ID. Pavyzdys: person@cloud.example.com",
+    "Your Federated Cloud ID:" : "Jūsų Centralizuoto Serverio ID:",
+    "Share it so your friends can share files with you:" : "Pasidalinkite tam, kad jūsų draugai galėtų dalintis duomenimis su jumis:",
+    "Add to your website" : "Pridėti jūsų puslapį",
+    "Share with me via Nextcloud" : "Pasidalinti su manimi per NextCloud",
+    "HTML Code:" : "HTML kodas:",
+    "Search global and public address book for users and let local users publish their data" : "Rasti globalias ar viešas adresų knygas ir leisti naudotojams viešinti savo duomenis",
+    "Share it:" : "Pasidalinti:"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");

apps/federatedfilesharing/l10n/lt_LT.json

@@ -1,17 +1,57 @@
 { "translations": {
+    "Federated sharing" : "Dalinimasis kitame serveryje",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Ar norite peržiūrėti {name} nuo {owner}@{remote}?",
+    "Remote share" : "Kitame serveryje pasidalinti duomenys",
+    "Remote share password" : "Kitame serveryje pasidalintų duomenų slaptažodis",
+    "Cancel" : "Atsisakyti",
+    "Add remote share" : "Pasidalinti duomenimis kitame serveryje",
+    "Copy" : "Kopijuoti",
+    "Copied!" : "Nukopijuota!",
+    "Not supported!" : "Nepalaikoma!",
+    "Press ⌘-C to copy." : "Norėdami nukopijuoti, paspauskite ⌘-C.",
+    "Press Ctrl-C to copy." : "Paspauskite Ctrl-C, kad nukopijuotumėte.",
+    "Invalid Federated Cloud ID" : "Neteisingas Centralizuoto Serverio ID",
+    "Server to server sharing is not enabled on this server" : "Dalinimasis tarp serverių yra neleidžiamas šiame serveryje",
+    "Couldn't establish a federated share." : "Neįmanoma pradėti dalintis kitame serveryje.",
+    "Couldn't establish a federated share, maybe the password was wrong." : "Neįmanoma pradėti dalintis kitame serveryje. Gal jūsų slaptažodis blogas?",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Dalinimosi kitame serveryje užklausa išsiųsta. Jūs būsite informuoti, jei pasidalinimas bus sėkmingas. ",
+    "The mountpoint name contains invalid characters." : "Prijungimo taškas turi netinkamų naudoti simbolių.",
+    "Not allowed to create a federated share with the owner." : "Savininkas neleidžia dalintis duomenimis su kitu serveriu.",
+    "Invalid or untrusted SSL certificate" : "Neteisingas arba nepatikimas SSL liudijimas",
+    "Could not authenticate to remote share, password might be wrong" : "Neįmanoma pradėti dalintis kitame serveryje. Gal jūsų slaptažodis blogas?",
+    "Storage not valid" : "Saugykla netinkama naudotis",
+    "Federated share added" : "Pasidalinta per kitą serverį",
+    "Couldn't add remote share" : "Nepavyko peržiūrėti kitame serveryje pasidalintų duomenų",
+    "Sharing %s failed, because this item is already shared with %s" : "%s bendrinimas nepavyko, kadangi šis elementas jau yra bendrinamas su %s",
+    "Not allowed to create a federated share with the same user" : "Negalima dalintis su identišku naudotoju kitame serveryje",
+    "File is already shared with %s" : "Failas jau yra bendrinamas su %s",
+    "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "\"%s\" pasidalinimas nepavyko, neįmanoma rasti %s, tikėtina, kad serveris šiuo metu nepasiekiamas arba naudoja nepatikimą sertifikatą.",
+    "Could not find share" : "Nepavyko rasti bendrinamų duomenų",
+    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Gavote galimybę peržiūrėti duomenis \"%3$s\", kuriuos pasidalino %1$s (%2$s vardu) esantis kitame serveryje",
+    "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Gavote galimybę peržiūrėti duomenis \"{share}\", kuriuos pasidalino {user} ({behalf} vardu) esantis kitame serveryje",
+    "You received \"%3$s\" as a remote share from %1$s" : "Gavote galimybę peržiūrėti duomenis \"%3$s\", kuriuos pasidalino %1$s",
+    "You received {share} as a remote share from {user}" : "Gavote galimybę peržiūrėti duomenis \"{share}\", kuriuos pasidalino {user}",
     "Accept" : "Priimti",
     "Decline" : "Atmesti",
-    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Pasidalink su manimi per #Nextcloud padebesius, plačiau %s",
+    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Pasidalinti su manimi per #Nextcloud Centralizuoto Serverio ID, toliau %s",
-    "Share with me through my #Nextcloud Federated Cloud ID" : "Pasidalink su manimi per #Nextcloud padebesius",
+    "Share with me through my #Nextcloud Federated Cloud ID" : "Pasidalinti su manimi per #Nextcloud Centralizuoto Serverio ID",
-    "Federated Cloud Sharing" : "Viešas dalijimasis padebesiu",
+    "Sharing" : "Dalinamasis",
-    "Open documentation" : "Atidaryti dokumentą",
+    "Federated file sharing" : "Dalinimasis centralizuotame serveryje",
-    "Allow users on this server to send shares to other servers" : "Leisti vartotojams šiame serveryje dalintis su kitais serveriais",
+    "Federated Cloud Sharing" : "Centralizuotas Dalinimasis Serveriuose",
-    "Allow users on this server to receive shares from other servers" : "Leisti vartotojams šiame serveryje priimti dalijimusis iš kitų serverių",
+    "Open documentation" : "Atverti dokumentaciją",
-    "Federated Cloud" : "Viešas debesis",
+    "Adjust how people can share between servers." : "Nustatyti taisykles, kaip naudotojai gali dalintis duomenimis tarp serverių.",
-    "Your Federated Cloud ID:" : "Tavo debesies ID:",
+    "Allow users on this server to send shares to other servers" : "Leisti šio serverio naudotojams dalintis duomenimis su kitais serveriais",
-    "Share it:" : "Pasidalink:",
+    "Allow users on this server to receive shares from other servers" : "Leisti šio serverio naudotojams priimti kituose serveriuose dalinamus duomenis",
-    "Add to your website" : "Pridėti tavo puslapį",
+    "Search global and public address book for users" : "Ieškoti vartotojų globaliose ir viešose adresų knygose",
-    "Share with me via Nextcloud" : "Pasidalink su manimi per Nextcloud",
+    "Allow users to publish their data to a global and public address book" : "Leisti naudotojams viešinti savo duomenis globaliose ar viešose adresų knygose",
-    "HTML Code:" : "HTML kodas:"
+    "Federated Cloud" : "Centralizuotas Serveris",
+    "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Galite dalintis su visais, kas naudojasi NextCloud, ownCloud ar Pydio! Tiesiog dalinimosi dialoge įrašykite jų Centralizuoto Serverio ID. Pavyzdys: person@cloud.example.com",
+    "Your Federated Cloud ID:" : "Jūsų Centralizuoto Serverio ID:",
+    "Share it so your friends can share files with you:" : "Pasidalinkite tam, kad jūsų draugai galėtų dalintis duomenimis su jumis:",
+    "Add to your website" : "Pridėti jūsų puslapį",
+    "Share with me via Nextcloud" : "Pasidalinti su manimi per NextCloud",
+    "HTML Code:" : "HTML kodas:",
+    "Search global and public address book for users and let local users publish their data" : "Rasti globalias ar viešas adresų knygas ir leisti naudotojams viešinti savo duomenis",
+    "Share it:" : "Pasidalinti:"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }

apps/federatedfilesharing/l10n/nb.js

@@ -16,13 +16,13 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Tjener til tjener deling er ikke aktivert på denne tjeneren",
     "Couldn't establish a federated share." : "Kunne ikke etablere en sammenknyttet ressurs",
     "Couldn't establish a federated share, maybe the password was wrong." : "Kunne ikke etablere en sammenknyttet ressurs, kanskje passordet var feil.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Sammenknyttet ressurs forespurt, du vil motta en invitasjon. Sjekk varslene dine.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Sammenknyttet ressurs forespurt, du vil motta en invitasjon. Sjekk varslene dine.",
     "The mountpoint name contains invalid characters." : "Navnet på oppkoblingspunktet inneholder ugyldige tegn.",
     "Not allowed to create a federated share with the owner." : "Ikke tillatt å opprette en sammenknyttet ressurs med eieren.",
     "Invalid or untrusted SSL certificate" : "Ugyldig eller ikke-klarert SSL-sertifikat",
     "Could not authenticate to remote share, password might be wrong" : "Kunne ikke autentisere mot ekstern ressurs, passordet var kanskje feil.",
     "Storage not valid" : "Lagringsplass ikke gyldig",
-    "Federated Share successfully added" : "Sammenknyttet ressurs ble lagt til",
+    "Federated share added" : "Sammenknyttet ressurs lagt til",
     "Couldn't add remote share" : "Kunne ikke legge til ekstern ressurs",
     "Sharing %s failed, because this item is already shared with %s" : "Deling av %s mislyktes, fordi dette elementet allerede er delt med %s",
     "Not allowed to create a federated share with the same user" : "Ikke tillatt å opprette en sammenknyttet skydeling med den samme brukeren",

apps/federatedfilesharing/l10n/nb.json

@@ -14,13 +14,13 @@
     "Server to server sharing is not enabled on this server" : "Tjener til tjener deling er ikke aktivert på denne tjeneren",
     "Couldn't establish a federated share." : "Kunne ikke etablere en sammenknyttet ressurs",
     "Couldn't establish a federated share, maybe the password was wrong." : "Kunne ikke etablere en sammenknyttet ressurs, kanskje passordet var feil.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Sammenknyttet ressurs forespurt, du vil motta en invitasjon. Sjekk varslene dine.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Sammenknyttet ressurs forespurt, du vil motta en invitasjon. Sjekk varslene dine.",
     "The mountpoint name contains invalid characters." : "Navnet på oppkoblingspunktet inneholder ugyldige tegn.",
     "Not allowed to create a federated share with the owner." : "Ikke tillatt å opprette en sammenknyttet ressurs med eieren.",
     "Invalid or untrusted SSL certificate" : "Ugyldig eller ikke-klarert SSL-sertifikat",
     "Could not authenticate to remote share, password might be wrong" : "Kunne ikke autentisere mot ekstern ressurs, passordet var kanskje feil.",
     "Storage not valid" : "Lagringsplass ikke gyldig",
-    "Federated Share successfully added" : "Sammenknyttet ressurs ble lagt til",
+    "Federated share added" : "Sammenknyttet ressurs lagt til",
     "Couldn't add remote share" : "Kunne ikke legge til ekstern ressurs",
     "Sharing %s failed, because this item is already shared with %s" : "Deling av %s mislyktes, fordi dette elementet allerede er delt med %s",
     "Not allowed to create a federated share with the same user" : "Ikke tillatt å opprette en sammenknyttet skydeling med den samme brukeren",

apps/federatedfilesharing/l10n/nl.js

@@ -1,7 +1,7 @@
 OC.L10N.register(
     "federatedfilesharing",
     {
-    "Federated sharing" : "Gefedereerd delen",
+    "Federated sharing" : "Gefedereerd delens",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Wil je de externe share {name} van {owner}@{remote} toevoegen?",
     "Remote share" : "Externe share",
     "Remote share password" : "Wachtwoord externe share",
@@ -16,13 +16,13 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Server met server delen is op deze server niet ingeschakeld",
     "Couldn't establish a federated share." : "Kon geen gefedereerde share tot stand brengen",
     "Couldn't establish a federated share, maybe the password was wrong." : "Kon geen gefedereerde share tot stand brengen, misschien was het wachtwoord onjuist.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "De gefedereerde share aanvraag is geslaagd, je ontvangt een uitnodiging. Controleer je meldingen.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "De gefedereerde share aanvraag is verzonden, je ontvangt een uitnodiging. Controleer je meldingen.",
     "The mountpoint name contains invalid characters." : "De naam van het mountpoint bevat ongeldige karakters.",
     "Not allowed to create a federated share with the owner." : "Het is niet toegestaan om met de eigenaar een gefedereerde share te maken.",
     "Invalid or untrusted SSL certificate" : "Ongeldig of onvertrouwd SSL-certificaat",
     "Could not authenticate to remote share, password might be wrong" : "Kon niet authenticeren bij externe share, misschien verkeerd wachtwoord",
     "Storage not valid" : "Opslag ongeldig",
-    "Federated Share successfully added" : "Gefedereerde share succesvol toegevoegd",
+    "Federated share added" : "Gefedereerd share is toegevoegd",
     "Couldn't add remote share" : "Kon geen externe share toevoegen",
     "Sharing %s failed, because this item is already shared with %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s",
     "Not allowed to create a federated share with the same user" : "Het is niet toegestaan om een gefedereerde share met dezelfde gebruikersserver te maken",
@@ -32,7 +32,7 @@ OC.L10N.register(
     "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Je ontving \"%3$s\" als een extern deel verzoek van %1$s (namens %2$s)",
     "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Je ontving {share} als een extern deel verzoek van {user} (namens {behalf})",
     "You received \"%3$s\" as a remote share from %1$s" : "Je ontving \"%3$s\" als een extern deel verzoek van %1$s",
-    "You received {share} as a remote share from {user}" : "Je ontving {share} als een extren deel verzoek van {user}",
+    "You received {share} as a remote share from {user}" : "Je ontving {share} als een extren share verzoek van {user}",
     "Accept" : "Accepteren",
     "Decline" : "Afwijzen",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Deel met mij via mijn #Nextcloud gefedereerde Cloud ID, zie %s",

apps/federatedfilesharing/l10n/nl.json

@@ -1,5 +1,5 @@
 { "translations": {
-    "Federated sharing" : "Gefedereerd delen",
+    "Federated sharing" : "Gefedereerd delens",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Wil je de externe share {name} van {owner}@{remote} toevoegen?",
     "Remote share" : "Externe share",
     "Remote share password" : "Wachtwoord externe share",
@@ -14,13 +14,13 @@
     "Server to server sharing is not enabled on this server" : "Server met server delen is op deze server niet ingeschakeld",
     "Couldn't establish a federated share." : "Kon geen gefedereerde share tot stand brengen",
     "Couldn't establish a federated share, maybe the password was wrong." : "Kon geen gefedereerde share tot stand brengen, misschien was het wachtwoord onjuist.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "De gefedereerde share aanvraag is geslaagd, je ontvangt een uitnodiging. Controleer je meldingen.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "De gefedereerde share aanvraag is verzonden, je ontvangt een uitnodiging. Controleer je meldingen.",
     "The mountpoint name contains invalid characters." : "De naam van het mountpoint bevat ongeldige karakters.",
     "Not allowed to create a federated share with the owner." : "Het is niet toegestaan om met de eigenaar een gefedereerde share te maken.",
     "Invalid or untrusted SSL certificate" : "Ongeldig of onvertrouwd SSL-certificaat",
     "Could not authenticate to remote share, password might be wrong" : "Kon niet authenticeren bij externe share, misschien verkeerd wachtwoord",
     "Storage not valid" : "Opslag ongeldig",
-    "Federated Share successfully added" : "Gefedereerde share succesvol toegevoegd",
+    "Federated share added" : "Gefedereerd share is toegevoegd",
     "Couldn't add remote share" : "Kon geen externe share toevoegen",
     "Sharing %s failed, because this item is already shared with %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s",
     "Not allowed to create a federated share with the same user" : "Het is niet toegestaan om een gefedereerde share met dezelfde gebruikersserver te maken",
@@ -30,7 +30,7 @@
     "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Je ontving \"%3$s\" als een extern deel verzoek van %1$s (namens %2$s)",
     "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Je ontving {share} als een extern deel verzoek van {user} (namens {behalf})",
     "You received \"%3$s\" as a remote share from %1$s" : "Je ontving \"%3$s\" als een extern deel verzoek van %1$s",
-    "You received {share} as a remote share from {user}" : "Je ontving {share} als een extren deel verzoek van {user}",
+    "You received {share} as a remote share from {user}" : "Je ontving {share} als een extren share verzoek van {user}",
     "Accept" : "Accepteren",
     "Decline" : "Afwijzen",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Deel met mij via mijn #Nextcloud gefedereerde Cloud ID, zie %s",

apps/federatedfilesharing/l10n/pl.js

@@ -16,13 +16,11 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Serwer do udostępniania serwera nie jest włączony na tym serwerze",
     "Couldn't establish a federated share." : "Nie udało się ustalić Stowarzyszonego udostępnienia.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Nie udało się ustalić Stowarzyszonego udostępnienia, może być błędne hasło.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Żądanie podzielenia się ze Stowarzyszeniem powiedzie się, gdy otrzymasz zaproszenie. Sprawdź swoje powiadomienia.",
     "The mountpoint name contains invalid characters." : "Nazwa zamontowanego zasobu zawiera niedozwolone znaki.",
     "Not allowed to create a federated share with the owner." : "Nie można tworzyć stowarzyszonego udziału ze sobą.",
     "Invalid or untrusted SSL certificate" : "Niewłaściwy lub niezaufany certyfikat SSL",
     "Could not authenticate to remote share, password might be wrong" : "Nie udało się uwierzytelnić udziału zdalnego, może być błędne hasło",
     "Storage not valid" : "Magazyn nie jest prawidłowy",
-    "Federated Share successfully added" : "Udane udostępnienie ze Stowarzyszeniem ",
     "Couldn't add remote share" : "Nie można dodać zdalnego zasobu",
     "Sharing %s failed, because this item is already shared with %s" : "Współdzielenie %s nie powiodło się, ponieważ element jest już współdzielony z %s",
     "Not allowed to create a federated share with the same user" : "Nie można tworzyć stowarzyszonego udziału z tym samym użytkownikiem",

apps/federatedfilesharing/l10n/pl.json

@@ -14,13 +14,11 @@
     "Server to server sharing is not enabled on this server" : "Serwer do udostępniania serwera nie jest włączony na tym serwerze",
     "Couldn't establish a federated share." : "Nie udało się ustalić Stowarzyszonego udostępnienia.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Nie udało się ustalić Stowarzyszonego udostępnienia, może być błędne hasło.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Żądanie podzielenia się ze Stowarzyszeniem powiedzie się, gdy otrzymasz zaproszenie. Sprawdź swoje powiadomienia.",
     "The mountpoint name contains invalid characters." : "Nazwa zamontowanego zasobu zawiera niedozwolone znaki.",
     "Not allowed to create a federated share with the owner." : "Nie można tworzyć stowarzyszonego udziału ze sobą.",
     "Invalid or untrusted SSL certificate" : "Niewłaściwy lub niezaufany certyfikat SSL",
     "Could not authenticate to remote share, password might be wrong" : "Nie udało się uwierzytelnić udziału zdalnego, może być błędne hasło",
     "Storage not valid" : "Magazyn nie jest prawidłowy",
-    "Federated Share successfully added" : "Udane udostępnienie ze Stowarzyszeniem ",
     "Couldn't add remote share" : "Nie można dodać zdalnego zasobu",
     "Sharing %s failed, because this item is already shared with %s" : "Współdzielenie %s nie powiodło się, ponieważ element jest już współdzielony z %s",
     "Not allowed to create a federated share with the same user" : "Nie można tworzyć stowarzyszonego udziału z tym samym użytkownikiem",

apps/federatedfilesharing/l10n/pt_BR.js

@@ -16,13 +16,13 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Servidor para compartilhamento de servidor não está ativo neste servidor",
     "Couldn't establish a federated share." : "Não foi possível estabelecer um compartilhamento federado.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Não foi possível estabelecer um compartilhamento federado, talvez a senha esteja incorreta.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Solicitação de compartilhamento federado concluída. Você receberá um convite que pode ser visto nas suas notificações.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Solicitação de Compartilhamento Federado enviada, você receberá um convite. Verifique suas notificações.",
     "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém caracteres inválidos.",
     "Not allowed to create a federated share with the owner." : "Não é permitido criar um compartilhamento federado com o proprietário.",
     "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
     "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar-se ao compartilhamento remoto. A senha pode estar incorreta",
     "Storage not valid" : "Armazenamento inválido",
-    "Federated Share successfully added" : "Compartilhamento federado adicionado com sucesso",
+    "Federated share added" : "Compartilhamento Federado adicionado",
     "Couldn't add remote share" : "Não foi possível adicionar o compartilhamento remoto",
     "Sharing %s failed, because this item is already shared with %s" : "Compartilhamento %s falhou porque este item já está compartilhado com %s",
     "Not allowed to create a federated share with the same user" : "Não é permitido criar um compartilhamento federado com o mesmo usuário",

apps/federatedfilesharing/l10n/pt_BR.json

@@ -14,13 +14,13 @@
     "Server to server sharing is not enabled on this server" : "Servidor para compartilhamento de servidor não está ativo neste servidor",
     "Couldn't establish a federated share." : "Não foi possível estabelecer um compartilhamento federado.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Não foi possível estabelecer um compartilhamento federado, talvez a senha esteja incorreta.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Solicitação de compartilhamento federado concluída. Você receberá um convite que pode ser visto nas suas notificações.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Solicitação de Compartilhamento Federado enviada, você receberá um convite. Verifique suas notificações.",
     "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém caracteres inválidos.",
     "Not allowed to create a federated share with the owner." : "Não é permitido criar um compartilhamento federado com o proprietário.",
     "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
     "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar-se ao compartilhamento remoto. A senha pode estar incorreta",
     "Storage not valid" : "Armazenamento inválido",
-    "Federated Share successfully added" : "Compartilhamento federado adicionado com sucesso",
+    "Federated share added" : "Compartilhamento Federado adicionado",
     "Couldn't add remote share" : "Não foi possível adicionar o compartilhamento remoto",
     "Sharing %s failed, because this item is already shared with %s" : "Compartilhamento %s falhou porque este item já está compartilhado com %s",
     "Not allowed to create a federated share with the same user" : "Não é permitido criar um compartilhamento federado com o mesmo usuário",

apps/federatedfilesharing/l10n/ru.js

@@ -16,13 +16,13 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "На данном сервере выключено межсерверное предоставление общего доступа",
     "Couldn't establish a federated share." : "Не удаётся установить федеративный общий доступ.",
     "Couldn't establish a federated share, maybe the password was wrong." : "Не удаётся установить федеративный общий доступ, возможно неверный пароль.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Запрос на федеративный общий ресурс прошёл успешно, вы получите приглашение. Проверьте ваши уведомления.",
+    "Federated Share request sent, you will receive an invitation. Check your notifications." : "Был отправлен запрос общего федеративного доступа, Вы получите приглашение. Проверьте свои уведомления.",
     "The mountpoint name contains invalid characters." : "Имя точки монтирования содержит недопустимые символы.",
     "Not allowed to create a federated share with the owner." : "Не допускается создание федеративного общего ресурса с владельцем.",
     "Invalid or untrusted SSL certificate" : "Недействительный или недоверенный сертификат SSL",
     "Could not authenticate to remote share, password might be wrong" : "Не удалось провести проверку подлинности для доступа к удалённому хранилищу, возможно неправильно указан пароль",
     "Storage not valid" : "Хранилище недоступно",
-    "Federated Share successfully added" : "Федеративный общий ресурс успешно добавлен",
+    "Federated share added" : "Добавлен общий федеративный ресурс",
     "Couldn't add remote share" : "Невозможно добавить удалённый общий ресурс",
     "Sharing %s failed, because this item is already shared with %s" : "Не удалось поделиться «%s», пользователю%s уже  предоставлен доступ к этому элементу",
     "Not allowed to create a federated share with the same user" : "Не допускается создание федеративного общего ресурса с тем же пользователем",