summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/dav/lib/carddav/addressbook.php7
-rw-r--r--apps/dav/lib/carddav/carddavbackend.php20
-rw-r--r--apps/dav/lib/carddav/plugin.php32
-rw-r--r--apps/dav/lib/carddav/xml/groups.php45
-rw-r--r--apps/dav/tests/unit/carddav/carddavbackendtest.php17
-rw-r--r--apps/encryption/l10n/fr.js2
-rw-r--r--apps/encryption/l10n/fr.json2
-rw-r--r--apps/files_external/l10n/sq.js4
-rw-r--r--apps/files_external/l10n/sq.json4
-rw-r--r--apps/files_external/lib/smb.php19
-rw-r--r--apps/files_external/service/dbconfigservice.php36
-rw-r--r--apps/files_external/tests/service/dbconfigservicetest.php2
-rw-r--r--apps/files_external/tests/service/storagesservicetest.php2
-rw-r--r--apps/files_sharing/js/share.js4
-rw-r--r--apps/files_sharing/l10n/ar.js2
-rw-r--r--apps/files_sharing/l10n/ar.json2
-rw-r--r--apps/files_sharing/l10n/ast.js2
-rw-r--r--apps/files_sharing/l10n/ast.json2
-rw-r--r--apps/files_sharing/l10n/az.js2
-rw-r--r--apps/files_sharing/l10n/az.json2
-rw-r--r--apps/files_sharing/l10n/bg_BG.js2
-rw-r--r--apps/files_sharing/l10n/bg_BG.json2
-rw-r--r--apps/files_sharing/l10n/bn_BD.js2
-rw-r--r--apps/files_sharing/l10n/bn_BD.json2
-rw-r--r--apps/files_sharing/l10n/bn_IN.js2
-rw-r--r--apps/files_sharing/l10n/bn_IN.json2
-rw-r--r--apps/files_sharing/l10n/ca.js2
-rw-r--r--apps/files_sharing/l10n/ca.json2
-rw-r--r--apps/files_sharing/l10n/cs_CZ.js8
-rw-r--r--apps/files_sharing/l10n/cs_CZ.json8
-rw-r--r--apps/files_sharing/l10n/da.js8
-rw-r--r--apps/files_sharing/l10n/da.json8
-rw-r--r--apps/files_sharing/l10n/de.js8
-rw-r--r--apps/files_sharing/l10n/de.json8
-rw-r--r--apps/files_sharing/l10n/de_AT.js2
-rw-r--r--apps/files_sharing/l10n/de_AT.json2
-rw-r--r--apps/files_sharing/l10n/de_DE.js6
-rw-r--r--apps/files_sharing/l10n/de_DE.json6
-rw-r--r--apps/files_sharing/l10n/el.js8
-rw-r--r--apps/files_sharing/l10n/el.json8
-rw-r--r--apps/files_sharing/l10n/en_GB.js2
-rw-r--r--apps/files_sharing/l10n/en_GB.json2
-rw-r--r--apps/files_sharing/l10n/eo.js2
-rw-r--r--apps/files_sharing/l10n/eo.json2
-rw-r--r--apps/files_sharing/l10n/es.js8
-rw-r--r--apps/files_sharing/l10n/es.json8
-rw-r--r--apps/files_sharing/l10n/es_AR.js2
-rw-r--r--apps/files_sharing/l10n/es_AR.json2
-rw-r--r--apps/files_sharing/l10n/es_CL.js2
-rw-r--r--apps/files_sharing/l10n/es_CL.json2
-rw-r--r--apps/files_sharing/l10n/et_EE.js2
-rw-r--r--apps/files_sharing/l10n/et_EE.json2
-rw-r--r--apps/files_sharing/l10n/eu.js2
-rw-r--r--apps/files_sharing/l10n/eu.json2
-rw-r--r--apps/files_sharing/l10n/fa.js2
-rw-r--r--apps/files_sharing/l10n/fa.json2
-rw-r--r--apps/files_sharing/l10n/fi_FI.js15
-rw-r--r--apps/files_sharing/l10n/fi_FI.json15
-rw-r--r--apps/files_sharing/l10n/fr.js27
-rw-r--r--apps/files_sharing/l10n/fr.json27
-rw-r--r--apps/files_sharing/l10n/gl.js2
-rw-r--r--apps/files_sharing/l10n/gl.json2
-rw-r--r--apps/files_sharing/l10n/he.js27
-rw-r--r--apps/files_sharing/l10n/he.json27
-rw-r--r--apps/files_sharing/l10n/hr.js2
-rw-r--r--apps/files_sharing/l10n/hr.json2
-rw-r--r--apps/files_sharing/l10n/hu_HU.js8
-rw-r--r--apps/files_sharing/l10n/hu_HU.json8
-rw-r--r--apps/files_sharing/l10n/ia.js2
-rw-r--r--apps/files_sharing/l10n/ia.json2
-rw-r--r--apps/files_sharing/l10n/id.js8
-rw-r--r--apps/files_sharing/l10n/id.json8
-rw-r--r--apps/files_sharing/l10n/it.js27
-rw-r--r--apps/files_sharing/l10n/it.json27
-rw-r--r--apps/files_sharing/l10n/ja.js13
-rw-r--r--apps/files_sharing/l10n/ja.json13
-rw-r--r--apps/files_sharing/l10n/km.js2
-rw-r--r--apps/files_sharing/l10n/km.json2
-rw-r--r--apps/files_sharing/l10n/ko.js8
-rw-r--r--apps/files_sharing/l10n/ko.json8
-rw-r--r--apps/files_sharing/l10n/lt_LT.js8
-rw-r--r--apps/files_sharing/l10n/lt_LT.json8
-rw-r--r--apps/files_sharing/l10n/lv.js2
-rw-r--r--apps/files_sharing/l10n/lv.json2
-rw-r--r--apps/files_sharing/l10n/mk.js4
-rw-r--r--apps/files_sharing/l10n/mk.json4
-rw-r--r--apps/files_sharing/l10n/ml_IN.js2
-rw-r--r--apps/files_sharing/l10n/ml_IN.json2
-rw-r--r--apps/files_sharing/l10n/mn.js2
-rw-r--r--apps/files_sharing/l10n/mn.json2
-rw-r--r--apps/files_sharing/l10n/ms_MY.js2
-rw-r--r--apps/files_sharing/l10n/ms_MY.json2
-rw-r--r--apps/files_sharing/l10n/nb_NO.js8
-rw-r--r--apps/files_sharing/l10n/nb_NO.json8
-rw-r--r--apps/files_sharing/l10n/nl.js8
-rw-r--r--apps/files_sharing/l10n/nl.json8
-rw-r--r--apps/files_sharing/l10n/nn_NO.js2
-rw-r--r--apps/files_sharing/l10n/nn_NO.json2
-rw-r--r--apps/files_sharing/l10n/oc.js8
-rw-r--r--apps/files_sharing/l10n/oc.json8
-rw-r--r--apps/files_sharing/l10n/pl.js2
-rw-r--r--apps/files_sharing/l10n/pl.json2
-rw-r--r--apps/files_sharing/l10n/pt_BR.js10
-rw-r--r--apps/files_sharing/l10n/pt_BR.json10
-rw-r--r--apps/files_sharing/l10n/pt_PT.js27
-rw-r--r--apps/files_sharing/l10n/pt_PT.json27
-rw-r--r--apps/files_sharing/l10n/ro.js2
-rw-r--r--apps/files_sharing/l10n/ro.json2
-rw-r--r--apps/files_sharing/l10n/ru.js10
-rw-r--r--apps/files_sharing/l10n/ru.json10
-rw-r--r--apps/files_sharing/l10n/sk_SK.js8
-rw-r--r--apps/files_sharing/l10n/sk_SK.json8
-rw-r--r--apps/files_sharing/l10n/sl.js2
-rw-r--r--apps/files_sharing/l10n/sl.json2
-rw-r--r--apps/files_sharing/l10n/sq.js27
-rw-r--r--apps/files_sharing/l10n/sq.json27
-rw-r--r--apps/files_sharing/l10n/sr.js2
-rw-r--r--apps/files_sharing/l10n/sr.json2
-rw-r--r--apps/files_sharing/l10n/sr@latin.js2
-rw-r--r--apps/files_sharing/l10n/sr@latin.json2
-rw-r--r--apps/files_sharing/l10n/sv.js2
-rw-r--r--apps/files_sharing/l10n/sv.json2
-rw-r--r--apps/files_sharing/l10n/ta_IN.js2
-rw-r--r--apps/files_sharing/l10n/ta_IN.json2
-rw-r--r--apps/files_sharing/l10n/th_TH.js8
-rw-r--r--apps/files_sharing/l10n/th_TH.json8
-rw-r--r--apps/files_sharing/l10n/tr.js8
-rw-r--r--apps/files_sharing/l10n/tr.json8
-rw-r--r--apps/files_sharing/l10n/uk.js2
-rw-r--r--apps/files_sharing/l10n/uk.json2
-rw-r--r--apps/files_sharing/l10n/zh_CN.js2
-rw-r--r--apps/files_sharing/l10n/zh_CN.json2
-rw-r--r--apps/files_sharing/l10n/zh_TW.js8
-rw-r--r--apps/files_sharing/l10n/zh_TW.json8
-rw-r--r--apps/files_sharing/lib/migration.php68
-rw-r--r--apps/files_sharing/tests/api.php120
-rw-r--r--apps/files_sharing/tests/migrationtest.php27
-rw-r--r--apps/updatenotification/appinfo/app.php3
-rw-r--r--apps/user_ldap/l10n/he.js12
-rw-r--r--apps/user_ldap/l10n/he.json12
-rwxr-xr-xautotest.sh10
-rw-r--r--core/css/icons.css7
-rw-r--r--core/img/actions/comment.pngbin169 -> 323 bytes
-rw-r--r--core/img/actions/comment.svg4
-rw-r--r--core/img/actions/delete-white.pngbin0 -> 236 bytes
-rw-r--r--core/img/actions/delete-white.svg4
-rw-r--r--core/js/share.js24
-rw-r--r--core/js/sharedialogview.js30
-rw-r--r--core/l10n/fr.js1
-rw-r--r--core/l10n/fr.json1
-rw-r--r--core/shipped.json2
-rw-r--r--lib/l10n/ast.js1
-rw-r--r--lib/l10n/ast.json1
-rw-r--r--lib/l10n/bg_BG.js1
-rw-r--r--lib/l10n/bg_BG.json1
-rw-r--r--lib/l10n/bn_BD.js1
-rw-r--r--lib/l10n/bn_BD.json1
-rw-r--r--lib/l10n/ca.js1
-rw-r--r--lib/l10n/ca.json1
-rw-r--r--lib/l10n/cs_CZ.js1
-rw-r--r--lib/l10n/cs_CZ.json1
-rw-r--r--lib/l10n/da.js1
-rw-r--r--lib/l10n/da.json1
-rw-r--r--lib/l10n/de.js1
-rw-r--r--lib/l10n/de.json1
-rw-r--r--lib/l10n/de_DE.js1
-rw-r--r--lib/l10n/de_DE.json1
-rw-r--r--lib/l10n/el.js1
-rw-r--r--lib/l10n/el.json1
-rw-r--r--lib/l10n/en_GB.js1
-rw-r--r--lib/l10n/en_GB.json1
-rw-r--r--lib/l10n/es.js1
-rw-r--r--lib/l10n/es.json1
-rw-r--r--lib/l10n/es_AR.js1
-rw-r--r--lib/l10n/es_AR.json1
-rw-r--r--lib/l10n/es_MX.js1
-rw-r--r--lib/l10n/es_MX.json1
-rw-r--r--lib/l10n/et_EE.js1
-rw-r--r--lib/l10n/et_EE.json1
-rw-r--r--lib/l10n/eu.js1
-rw-r--r--lib/l10n/eu.json1
-rw-r--r--lib/l10n/fi_FI.js3
-rw-r--r--lib/l10n/fi_FI.json3
-rw-r--r--lib/l10n/fr.js2
-rw-r--r--lib/l10n/fr.json2
-rw-r--r--lib/l10n/gl.js1
-rw-r--r--lib/l10n/gl.json1
-rw-r--r--lib/l10n/hr.js1
-rw-r--r--lib/l10n/hr.json1
-rw-r--r--lib/l10n/hu_HU.js1
-rw-r--r--lib/l10n/hu_HU.json1
-rw-r--r--lib/l10n/id.js1
-rw-r--r--lib/l10n/id.json1
-rw-r--r--lib/l10n/it.js2
-rw-r--r--lib/l10n/it.json2
-rw-r--r--lib/l10n/ja.js1
-rw-r--r--lib/l10n/ja.json1
-rw-r--r--lib/l10n/ko.js1
-rw-r--r--lib/l10n/ko.json1
-rw-r--r--lib/l10n/lt_LT.js1
-rw-r--r--lib/l10n/lt_LT.json1
-rw-r--r--lib/l10n/nb_NO.js1
-rw-r--r--lib/l10n/nb_NO.json1
-rw-r--r--lib/l10n/nl.js1
-rw-r--r--lib/l10n/nl.json1
-rw-r--r--lib/l10n/oc.js1
-rw-r--r--lib/l10n/oc.json1
-rw-r--r--lib/l10n/pl.js1
-rw-r--r--lib/l10n/pl.json1
-rw-r--r--lib/l10n/pt_BR.js1
-rw-r--r--lib/l10n/pt_BR.json1
-rw-r--r--lib/l10n/pt_PT.js2
-rw-r--r--lib/l10n/pt_PT.json2
-rw-r--r--lib/l10n/ru.js1
-rw-r--r--lib/l10n/ru.json1
-rw-r--r--lib/l10n/sk_SK.js1
-rw-r--r--lib/l10n/sk_SK.json1
-rw-r--r--lib/l10n/sl.js1
-rw-r--r--lib/l10n/sl.json1
-rw-r--r--lib/l10n/sq.js2
-rw-r--r--lib/l10n/sq.json2
-rw-r--r--lib/l10n/sr.js1
-rw-r--r--lib/l10n/sr.json1
-rw-r--r--lib/l10n/sv.js1
-rw-r--r--lib/l10n/sv.json1
-rw-r--r--lib/l10n/th_TH.js1
-rw-r--r--lib/l10n/th_TH.json1
-rw-r--r--lib/l10n/tr.js1
-rw-r--r--lib/l10n/tr.json1
-rw-r--r--lib/l10n/uk.js1
-rw-r--r--lib/l10n/uk.json1
-rw-r--r--lib/l10n/zh_CN.js1
-rw-r--r--lib/l10n/zh_CN.json1
-rw-r--r--lib/l10n/zh_TW.js7
-rw-r--r--lib/l10n/zh_TW.json7
-rw-r--r--lib/private/share20/defaultshareprovider.php4
-rw-r--r--lib/private/share20/manager.php27
-rw-r--r--lib/private/user/user.php25
-rw-r--r--tests/docker/mariadb/oc.cnf5
-rw-r--r--tests/lib/share20/managertest.php18
240 files changed, 1030 insertions, 452 deletions
diff --git a/apps/dav/lib/carddav/addressbook.php b/apps/dav/lib/carddav/addressbook.php
index ca3f5ba0ef6..be57a2d90a1 100644
--- a/apps/dav/lib/carddav/addressbook.php
+++ b/apps/dav/lib/carddav/addressbook.php
@@ -161,4 +161,11 @@ class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable {
}
parent::delete();
}
+
+ public function getContactsGroups() {
+ /** @var CardDavBackend $cardDavBackend */
+ $cardDavBackend = $this->carddavBackend;
+
+ return $cardDavBackend->collectCardProperties($this->getResourceId(), 'CATEGORIES');
+ }
}
diff --git a/apps/dav/lib/carddav/carddavbackend.php b/apps/dav/lib/carddav/carddavbackend.php
index c4f29b39d0d..aa2490ab11a 100644
--- a/apps/dav/lib/carddav/carddavbackend.php
+++ b/apps/dav/lib/carddav/carddavbackend.php
@@ -29,6 +29,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
use OCA\DAV\DAV\Sharing\Backend;
use OCA\DAV\DAV\Sharing\IShareable;
use OCP\IDBConnection;
+use PDO;
use Sabre\CardDAV\Backend\BackendInterface;
use Sabre\CardDAV\Backend\SyncSupport;
use Sabre\CardDAV\Plugin;
@@ -762,6 +763,25 @@ class CardDavBackend implements BackendInterface, SyncSupport {
}
/**
+ * @param int $bookId
+ * @param string $name
+ * @return array
+ */
+ public function collectCardProperties($bookId, $name) {
+ $query = $this->db->getQueryBuilder();
+ $result = $query->selectDistinct('value')
+ ->from($this->dbCardsPropertiesTable)
+ ->where($query->expr()->eq('name', $query->createNamedParameter($name)))
+ ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($bookId)))
+ ->execute();
+
+ $all = $result->fetchAll(PDO::FETCH_COLUMN);
+ $result->closeCursor();
+
+ return $all;
+ }
+
+ /**
* get URI from a given contact
*
* @param int $id
diff --git a/apps/dav/lib/carddav/plugin.php b/apps/dav/lib/carddav/plugin.php
index 4acc1037b52..d94dce1db0e 100644
--- a/apps/dav/lib/carddav/plugin.php
+++ b/apps/dav/lib/carddav/plugin.php
@@ -21,10 +21,19 @@
namespace OCA\DAV\CardDAV;
+use OCA\DAV\CardDAV\Xml\Groups;
+use Sabre\DAV\INode;
+use Sabre\DAV\PropFind;
+use Sabre\DAV\Server;
use Sabre\HTTP\URLUtil;
class Plugin extends \Sabre\CardDAV\Plugin {
+ function initialize(Server $server) {
+ $server->on('propFind', [$this, 'propFind']);
+ parent::initialize($server);
+ }
+
/**
* Returns the addressbook home for a given principal
*
@@ -33,15 +42,34 @@ class Plugin extends \Sabre\CardDAV\Plugin {
*/
protected function getAddressbookHomeForPrincipal($principal) {
- if (strrpos($principal, 'principals/users', -strlen($principal)) !== FALSE) {
+ if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
list(, $principalId) = URLUtil::splitPath($principal);
return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
}
- if (strrpos($principal, 'principals/system', -strlen($principal)) !== FALSE) {
+ if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
list(, $principalId) = URLUtil::splitPath($principal);
return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
}
throw new \LogicException('This is not supposed to happen');
}
+
+ /**
+ * Adds all CardDAV-specific properties
+ *
+ * @param PropFind $propFind
+ * @param INode $node
+ * @return void
+ */
+ function propFind(PropFind $propFind, INode $node) {
+
+ $ns = '{http://owncloud.org/ns}';
+
+ if ($node instanceof AddressBook) {
+
+ $propFind->handle($ns . 'groups', function () use ($node) {
+ return new Groups($node->getContactsGroups());
+ });
+ }
+ }
}
diff --git a/apps/dav/lib/carddav/xml/groups.php b/apps/dav/lib/carddav/xml/groups.php
new file mode 100644
index 00000000000..b39615db033
--- /dev/null
+++ b/apps/dav/lib/carddav/xml/groups.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+namespace OCA\DAV\CardDAV\Xml;
+
+use Sabre\Xml\XmlSerializable;
+use Sabre\Xml\Element;
+use Sabre\Xml\Writer;
+
+class Groups implements XmlSerializable {
+ const NS_OWNCLOUD = 'http://owncloud.org/ns';
+
+ /** @var string[] of TYPE:CHECKSUM */
+ private $groups;
+
+ /**
+ * @param string $groups
+ */
+ public function __construct($groups) {
+ $this->groups = $groups;
+ }
+
+ function xmlSerialize(Writer $writer) {
+ foreach ($this->groups as $group) {
+ $writer->writeElement('{' . self::NS_OWNCLOUD . '}group', $group);
+ }
+ }
+}
diff --git a/apps/dav/tests/unit/carddav/carddavbackendtest.php b/apps/dav/tests/unit/carddav/carddavbackendtest.php
index 86bc26b4c0d..f7e59b3fda9 100644
--- a/apps/dav/tests/unit/carddav/carddavbackendtest.php
+++ b/apps/dav/tests/unit/carddav/carddavbackendtest.php
@@ -609,4 +609,21 @@ class CardDavBackendTest extends TestCase {
$this->assertEmpty($this->backend->getContact('uri'));
}
+ public function testCollectCardProperties() {
+ $query = $this->db->getQueryBuilder();
+ $query->insert($this->dbCardsPropertiesTable)
+ ->values(
+ [
+ 'addressbookid' => $query->createNamedParameter(666),
+ 'cardid' => $query->createNamedParameter(777),
+ 'name' => $query->createNamedParameter('FN'),
+ 'value' => $query->createNamedParameter('John Doe'),
+ 'preferred' => $query->createNamedParameter(0)
+ ]
+ )
+ ->execute();
+
+ $result = $this->backend->collectCardProperties(666, 'FN');
+ $this->assertEquals(['John Doe'], $result);
+ }
}
diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js
index 59a36a73d7b..fb3d37b5a22 100644
--- a/apps/encryption/l10n/fr.js
+++ b/apps/encryption/l10n/fr.js
@@ -25,6 +25,8 @@ OC.L10N.register(
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée de chiffrement n'est pas valide ! Veuillez mettre à jour le mot de passe de la clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
"Encryption App is enabled and ready" : "L'application de chiffrement est activée et prête",
+ "Bad Signature" : "Mauvaise signature",
+ "Missing Signature" : "Signature manquante",
"one-time password for server-side-encryption" : "Mot de passe à usage unique pour le chiffrement côté serveur",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous. ",
diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json
index b1fcfb35b27..30e38ae811c 100644
--- a/apps/encryption/l10n/fr.json
+++ b/apps/encryption/l10n/fr.json
@@ -23,6 +23,8 @@
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée de chiffrement n'est pas valide ! Veuillez mettre à jour le mot de passe de la clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
"Encryption App is enabled and ready" : "L'application de chiffrement est activée et prête",
+ "Bad Signature" : "Mauvaise signature",
+ "Missing Signature" : "Signature manquante",
"one-time password for server-side-encryption" : "Mot de passe à usage unique pour le chiffrement côté serveur",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous. ",
diff --git a/apps/files_external/l10n/sq.js b/apps/files_external/l10n/sq.js
index bab6a24df7f..35f43b52a35 100644
--- a/apps/files_external/l10n/sq.js
+++ b/apps/files_external/l10n/sq.js
@@ -68,9 +68,9 @@ OC.L10N.register(
"Rackspace" : "Rackspace",
"API key" : "Kyç API",
"Global Credentails" : "Kredenciale Globale",
- "Log-in credentials, save in database" : "Kredenciale hyrjesh, ruaje në bazën e të dhënave",
+ "Log-in credentials, save in database" : "Kredenciale hyrjesh, ruaji në bazën e të dhënave",
"Username and password" : "Emër përdoruesi dhe fjalëkalim",
- "Log-in credentials, save in session" : "Kredenciale hyrjesh, ruaje në sesion",
+ "Log-in credentials, save in session" : "Kredenciale hyrjesh, ruaji për sesion",
"User entered, store in database" : "Përdoruesi u dha, ruajeni në bazën e të dhënave",
"RSA public key" : "Kyç publik RSA ",
"Public key" : "Kyç publik",
diff --git a/apps/files_external/l10n/sq.json b/apps/files_external/l10n/sq.json
index 7c132ddd855..53b91d57c75 100644
--- a/apps/files_external/l10n/sq.json
+++ b/apps/files_external/l10n/sq.json
@@ -66,9 +66,9 @@
"Rackspace" : "Rackspace",
"API key" : "Kyç API",
"Global Credentails" : "Kredenciale Globale",
- "Log-in credentials, save in database" : "Kredenciale hyrjesh, ruaje në bazën e të dhënave",
+ "Log-in credentials, save in database" : "Kredenciale hyrjesh, ruaji në bazën e të dhënave",
"Username and password" : "Emër përdoruesi dhe fjalëkalim",
- "Log-in credentials, save in session" : "Kredenciale hyrjesh, ruaje në sesion",
+ "Log-in credentials, save in session" : "Kredenciale hyrjesh, ruaji për sesion",
"User entered, store in database" : "Përdoruesi u dha, ruajeni në bazën e të dhënave",
"RSA public key" : "Kyç publik RSA ",
"Public key" : "Kyç publik",
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 50bd56f28ad..b93e6e5b805 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -30,6 +30,7 @@
namespace OC\Files\Storage;
use Icewind\SMB\Exception\Exception;
+use Icewind\SMB\Exception\ForbiddenException;
use Icewind\SMB\Exception\NotFoundException;
use Icewind\SMB\NativeServer;
use Icewind\SMB\Server;
@@ -159,6 +160,8 @@ class SMB extends Common {
}
} catch (NotFoundException $e) {
return false;
+ } catch (ForbiddenException $e) {
+ return false;
}
}
@@ -239,6 +242,8 @@ class SMB extends Common {
return false;
} catch (NotFoundException $e) {
return false;
+ } catch (ForbiddenException $e) {
+ return false;
}
}
@@ -257,6 +262,8 @@ class SMB extends Common {
return true;
} catch (NotFoundException $e) {
return false;
+ } catch (ForbiddenException $e) {
+ return false;
}
}
@@ -270,7 +277,13 @@ class SMB extends Common {
}
public function opendir($path) {
- $files = $this->getFolderContents($path);
+ try {
+ $files = $this->getFolderContents($path);
+ } catch (NotFoundException $e) {
+ return false;
+ } catch (ForbiddenException $e) {
+ return false;
+ }
$names = array_map(function ($info) {
/** @var \Icewind\SMB\IFileInfo $info */
return $info->getName();
@@ -283,6 +296,8 @@ class SMB extends Common {
return $this->getFileInfo($path)->isDirectory() ? 'dir' : 'file';
} catch (NotFoundException $e) {
return false;
+ } catch (ForbiddenException $e) {
+ return false;
}
}
@@ -302,6 +317,8 @@ class SMB extends Common {
return true;
} catch (NotFoundException $e) {
return false;
+ } catch (ForbiddenException $e) {
+ return false;
}
}
diff --git a/apps/files_external/service/dbconfigservice.php b/apps/files_external/service/dbconfigservice.php
index d52bf51e4aa..07f9942e05c 100644
--- a/apps/files_external/service/dbconfigservice.php
+++ b/apps/files_external/service/dbconfigservice.php
@@ -23,6 +23,7 @@ namespace OCA\Files_External\Service;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
+use OCP\Security\ICrypto;
/**
* Stores the mount config in the database
@@ -41,12 +42,19 @@ class DBConfigService {
private $connection;
/**
+ * @var ICrypto
+ */
+ private $crypto;
+
+ /**
* DBConfigService constructor.
*
* @param IDBConnection $connection
+ * @param ICrypto $crypto
*/
- public function __construct(IDBConnection $connection) {
+ public function __construct(IDBConnection $connection, ICrypto $crypto) {
$this->connection = $connection;
+ $this->crypto = $crypto;
}
/**
@@ -246,6 +254,9 @@ class DBConfigService {
* @param string $value
*/
public function setConfig($mountId, $key, $value) {
+ if ($key === 'password') {
+ $value = $this->encryptValue($value);
+ }
$count = $this->connection->insertIfNotExist('*PREFIX*external_config', [
'mount_id' => $mountId,
'key' => $key,
@@ -267,6 +278,7 @@ class DBConfigService {
* @param string $value
*/
public function setOption($mountId, $key, $value) {
+
$count = $this->connection->insertIfNotExist('*PREFIX*external_options', [
'mount_id' => $mountId,
'key' => $key,
@@ -398,13 +410,31 @@ class DBConfigService {
* @return array ['key1' => $value1, ...]
*/
private function createKeyValueMap(array $keyValuePairs) {
+ $decryptedPairts = array_map(function ($pair) {
+ if ($pair['key'] === 'password') {
+ $pair['value'] = $this->decryptValue($pair['value']);
+ }
+ return $pair;
+ }, $keyValuePairs);
$keys = array_map(function ($pair) {
return $pair['key'];
- }, $keyValuePairs);
+ }, $decryptedPairts);
$values = array_map(function ($pair) {
return $pair['value'];
- }, $keyValuePairs);
+ }, $decryptedPairts);
return array_combine($keys, $values);
}
+
+ private function encryptValue($value) {
+ return $this->crypto->encrypt($value);
+ }
+
+ private function decryptValue($value) {
+ try {
+ return $this->crypto->decrypt($value);
+ } catch (\Exception $e) {
+ return $value;
+ }
+ }
}
diff --git a/apps/files_external/tests/service/dbconfigservicetest.php b/apps/files_external/tests/service/dbconfigservicetest.php
index 41b5df73613..30c67ac8c93 100644
--- a/apps/files_external/tests/service/dbconfigservicetest.php
+++ b/apps/files_external/tests/service/dbconfigservicetest.php
@@ -45,7 +45,7 @@ class DBConfigServiceTest extends TestCase {
public function setUp() {
parent::setUp();
$this->connection = \OC::$server->getDatabaseConnection();
- $this->dbConfig = new DBConfigService($this->connection);
+ $this->dbConfig = new DBConfigService($this->connection, \OC::$server->getCrypto());
}
public function tearDown() {
diff --git a/apps/files_external/tests/service/storagesservicetest.php b/apps/files_external/tests/service/storagesservicetest.php
index 68671b599bd..3fbe3b755e1 100644
--- a/apps/files_external/tests/service/storagesservicetest.php
+++ b/apps/files_external/tests/service/storagesservicetest.php
@@ -83,7 +83,7 @@ abstract class StoragesServiceTest extends \Test\TestCase {
public function setUp() {
parent::setUp();
- $this->dbConfig = new CleaningDBConfig(\OC::$server->getDatabaseConnection());
+ $this->dbConfig = new CleaningDBConfig(\OC::$server->getDatabaseConnection(), \OC::$server->getCrypto());
self::$hookCalls = array();
$config = \OC::$server->getConfig();
$this->dataDir = $config->getSystemValue(
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index f8d89828f4d..0a01c5af0ad 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -122,6 +122,10 @@
}
});
+ fileList.$el.on('changeDirectory', function() {
+ OCA.Sharing.sharesLoaded = false;
+ });
+
fileActions.registerAction({
name: 'Share',
displayName: '',
diff --git a/apps/files_sharing/l10n/ar.js b/apps/files_sharing/l10n/ar.js
index d597b01a7b8..a01f74789d1 100644
--- a/apps/files_sharing/l10n/ar.js
+++ b/apps/files_sharing/l10n/ar.js
@@ -7,8 +7,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "ملف أو مجلد تم </strong>مشاركته<strong> ",
"You shared %1$s with %2$s" : "شاركت %1$s مع %2$s",
"You shared %1$s with group %2$s" : "أنت شاركت %1$s مع مجموعة %2$s",
- "%2$s shared %1$s with you" : "%2$s شارك %1$s معك",
"You shared %1$s via link" : "لقد قمت بمشاركة %1$s عبر الرابط",
+ "%2$s shared %1$s with you" : "%2$s شارك %1$s معك",
"Shares" : "المشاركات",
"This share is password-protected" : "هذه المشاركة محمية بكلمة مرور",
"The password is wrong. Try again." : "كلمة المرور خاطئة. حاول مرة أخرى",
diff --git a/apps/files_sharing/l10n/ar.json b/apps/files_sharing/l10n/ar.json
index 1b4c04b33db..1db47e7ca8c 100644
--- a/apps/files_sharing/l10n/ar.json
+++ b/apps/files_sharing/l10n/ar.json
@@ -5,8 +5,8 @@
"A file or folder has been <strong>shared</strong>" : "ملف أو مجلد تم </strong>مشاركته<strong> ",
"You shared %1$s with %2$s" : "شاركت %1$s مع %2$s",
"You shared %1$s with group %2$s" : "أنت شاركت %1$s مع مجموعة %2$s",
- "%2$s shared %1$s with you" : "%2$s شارك %1$s معك",
"You shared %1$s via link" : "لقد قمت بمشاركة %1$s عبر الرابط",
+ "%2$s shared %1$s with you" : "%2$s شارك %1$s معك",
"Shares" : "المشاركات",
"This share is password-protected" : "هذه المشاركة محمية بكلمة مرور",
"The password is wrong. Try again." : "كلمة المرور خاطئة. حاول مرة أخرى",
diff --git a/apps/files_sharing/l10n/ast.js b/apps/files_sharing/l10n/ast.js
index b504ff6d092..2dea9485001 100644
--- a/apps/files_sharing/l10n/ast.js
+++ b/apps/files_sharing/l10n/ast.js
@@ -19,8 +19,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "<strong>Compartióse</strong> un ficheru o direutoriu",
"You shared %1$s with %2$s" : "Compartisti %1$s con %2$s",
"You shared %1$s with group %2$s" : "Compartisti %1$s col grupu %2$s",
- "%2$s shared %1$s with you" : "%2$s compartió %1$s contigo",
"You shared %1$s via link" : "Compartisti %1$s per enllaz",
+ "%2$s shared %1$s with you" : "%2$s compartió %1$s contigo",
"Shares" : "Comparticiones",
"This share is password-protected" : "Esta compartición tien contraseña protexida",
"The password is wrong. Try again." : "La contraseña ye incorreuta. Inténtalo otra vegada.",
diff --git a/apps/files_sharing/l10n/ast.json b/apps/files_sharing/l10n/ast.json
index 89f5607993e..f06f63a44b7 100644
--- a/apps/files_sharing/l10n/ast.json
+++ b/apps/files_sharing/l10n/ast.json
@@ -17,8 +17,8 @@
"A file or folder has been <strong>shared</strong>" : "<strong>Compartióse</strong> un ficheru o direutoriu",
"You shared %1$s with %2$s" : "Compartisti %1$s con %2$s",
"You shared %1$s with group %2$s" : "Compartisti %1$s col grupu %2$s",
- "%2$s shared %1$s with you" : "%2$s compartió %1$s contigo",
"You shared %1$s via link" : "Compartisti %1$s per enllaz",
+ "%2$s shared %1$s with you" : "%2$s compartió %1$s contigo",
"Shares" : "Comparticiones",
"This share is password-protected" : "Esta compartición tien contraseña protexida",
"The password is wrong. Try again." : "La contraseña ye incorreuta. Inténtalo otra vegada.",
diff --git a/apps/files_sharing/l10n/az.js b/apps/files_sharing/l10n/az.js
index 72fdda3ca99..5cec471aa24 100644
--- a/apps/files_sharing/l10n/az.js
+++ b/apps/files_sharing/l10n/az.js
@@ -37,8 +37,8 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Ümumi paylaşılmış fayl %1$s endirilmişdir",
"You shared %1$s with %2$s" : "Siz yayımladınız %1$s - i %2$s ilə",
"You shared %1$s with group %2$s" : "Siz yayımladınız %1$s qrupu ilə %2$s",
- "%2$s shared %1$s with you" : "%2$s yayımlanıb %1$s sizinlə",
"You shared %1$s via link" : "Siz yayımladınız %1$s link ilə",
+ "%2$s shared %1$s with you" : "%2$s yayımlanıb %1$s sizinlə",
"Shares" : "Yayımlanmalar",
"This share is password-protected" : "Bu paylaşım şifrə ilə müdafiəlidir",
"The password is wrong. Try again." : "Şifrə yalnışdır. Yenidən cəhd edin.",
diff --git a/apps/files_sharing/l10n/az.json b/apps/files_sharing/l10n/az.json
index 4e595220b65..bd74add7ca8 100644
--- a/apps/files_sharing/l10n/az.json
+++ b/apps/files_sharing/l10n/az.json
@@ -35,8 +35,8 @@
"Public shared file %1$s was downloaded" : "Ümumi paylaşılmış fayl %1$s endirilmişdir",
"You shared %1$s with %2$s" : "Siz yayımladınız %1$s - i %2$s ilə",
"You shared %1$s with group %2$s" : "Siz yayımladınız %1$s qrupu ilə %2$s",
- "%2$s shared %1$s with you" : "%2$s yayımlanıb %1$s sizinlə",
"You shared %1$s via link" : "Siz yayımladınız %1$s link ilə",
+ "%2$s shared %1$s with you" : "%2$s yayımlanıb %1$s sizinlə",
"Shares" : "Yayımlanmalar",
"This share is password-protected" : "Bu paylaşım şifrə ilə müdafiəlidir",
"The password is wrong. Try again." : "Şifrə yalnışdır. Yenidən cəhd edin.",
diff --git a/apps/files_sharing/l10n/bg_BG.js b/apps/files_sharing/l10n/bg_BG.js
index 4a7ec23b8e7..540f7d0f14a 100644
--- a/apps/files_sharing/l10n/bg_BG.js
+++ b/apps/files_sharing/l10n/bg_BG.js
@@ -33,8 +33,8 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Публично споделения файл %1$s бе изтеглен",
"You shared %1$s with %2$s" : "Вие споделихте %1$s с %2$s.",
"You shared %1$s with group %2$s" : "Вие споделихте %1$s с групата %2$s.",
- "%2$s shared %1$s with you" : "%2$s сподели %1$s с Вас.",
"You shared %1$s via link" : "Вие споделихте %1$s посредством връзка.",
+ "%2$s shared %1$s with you" : "%2$s сподели %1$s с Вас.",
"Shares" : "Споделени Папки",
"This share is password-protected" : "Тази зона е защитена с парола.",
"The password is wrong. Try again." : "Грешна парола. Опитай отново.",
diff --git a/apps/files_sharing/l10n/bg_BG.json b/apps/files_sharing/l10n/bg_BG.json
index b15438e8374..18dddd90cbc 100644
--- a/apps/files_sharing/l10n/bg_BG.json
+++ b/apps/files_sharing/l10n/bg_BG.json
@@ -31,8 +31,8 @@
"Public shared file %1$s was downloaded" : "Публично споделения файл %1$s бе изтеглен",
"You shared %1$s with %2$s" : "Вие споделихте %1$s с %2$s.",
"You shared %1$s with group %2$s" : "Вие споделихте %1$s с групата %2$s.",
- "%2$s shared %1$s with you" : "%2$s сподели %1$s с Вас.",
"You shared %1$s via link" : "Вие споделихте %1$s посредством връзка.",
+ "%2$s shared %1$s with you" : "%2$s сподели %1$s с Вас.",
"Shares" : "Споделени Папки",
"This share is password-protected" : "Тази зона е защитена с парола.",
"The password is wrong. Try again." : "Грешна парола. Опитай отново.",
diff --git a/apps/files_sharing/l10n/bn_BD.js b/apps/files_sharing/l10n/bn_BD.js
index a318f0dacb8..0e715b8c6cb 100644
--- a/apps/files_sharing/l10n/bn_BD.js
+++ b/apps/files_sharing/l10n/bn_BD.js
@@ -14,8 +14,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "একটি ফাইল বা ফোলডার <strong>ভাগাভাগি</strong> করা হয়েছে",
"You shared %1$s with %2$s" : "আপনি %1$sকে %2$sএর সাথে ভাগাভাগি করেছেন",
"You shared %1$s with group %2$s" : "আপনি %1$s কে %2$s দলের সাথে ভাগাভাগি করেছেন",
- "%2$s shared %1$s with you" : "%2$s আপনার সাথে %1$s ভাগাভাগি করেছেন",
"You shared %1$s via link" : "আপনি %1$s লিংকের মাধধমে ভাগাভাগি করেছেন",
+ "%2$s shared %1$s with you" : "%2$s আপনার সাথে %1$s ভাগাভাগি করেছেন",
"Shares" : "ভাগাভাগি",
"This share is password-protected" : "এই শেয়ারটি কূটশব্দদ্বারা সুরক্ষিত",
"The password is wrong. Try again." : "কুটশব্দটি ভুল। আবার চেষ্টা করুন।",
diff --git a/apps/files_sharing/l10n/bn_BD.json b/apps/files_sharing/l10n/bn_BD.json
index 028c22277b4..063b0761cb7 100644
--- a/apps/files_sharing/l10n/bn_BD.json
+++ b/apps/files_sharing/l10n/bn_BD.json
@@ -12,8 +12,8 @@
"A file or folder has been <strong>shared</strong>" : "একটি ফাইল বা ফোলডার <strong>ভাগাভাগি</strong> করা হয়েছে",
"You shared %1$s with %2$s" : "আপনি %1$sকে %2$sএর সাথে ভাগাভাগি করেছেন",
"You shared %1$s with group %2$s" : "আপনি %1$s কে %2$s দলের সাথে ভাগাভাগি করেছেন",
- "%2$s shared %1$s with you" : "%2$s আপনার সাথে %1$s ভাগাভাগি করেছেন",
"You shared %1$s via link" : "আপনি %1$s লিংকের মাধধমে ভাগাভাগি করেছেন",
+ "%2$s shared %1$s with you" : "%2$s আপনার সাথে %1$s ভাগাভাগি করেছেন",
"Shares" : "ভাগাভাগি",
"This share is password-protected" : "এই শেয়ারটি কূটশব্দদ্বারা সুরক্ষিত",
"The password is wrong. Try again." : "কুটশব্দটি ভুল। আবার চেষ্টা করুন।",
diff --git a/apps/files_sharing/l10n/bn_IN.js b/apps/files_sharing/l10n/bn_IN.js
index 2270e72e689..a53608ed26c 100644
--- a/apps/files_sharing/l10n/bn_IN.js
+++ b/apps/files_sharing/l10n/bn_IN.js
@@ -5,8 +5,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "ফাইল অথবা ফোল্ডার <strong>শেয়ার করা হয়েছে</strong>",
"You shared %1$s with %2$s" : "আপনি %1$s শেয়ার করছেন %2$s এর সাথে",
"You shared %1$s with group %2$s" : "আপনি %1$s কে %2$s গ্রুপের সাথে শেয়ার করেছেন",
- "%2$s shared %1$s with you" : "%2$s শেয়ার করেছে %1$s কে আপনার সাথে ",
"You shared %1$s via link" : "আপনি লিঙ্ক দ্বারা %1$s শেয়ার করুন ",
+ "%2$s shared %1$s with you" : "%2$s শেয়ার করেছে %1$s কে আপনার সাথে ",
"Shares" : "শেয়ারস",
"Name" : "নাম",
"Download" : "ডাউনলোড করুন"
diff --git a/apps/files_sharing/l10n/bn_IN.json b/apps/files_sharing/l10n/bn_IN.json
index 1c285d0899c..47d6eb00784 100644
--- a/apps/files_sharing/l10n/bn_IN.json
+++ b/apps/files_sharing/l10n/bn_IN.json
@@ -3,8 +3,8 @@
"A file or folder has been <strong>shared</strong>" : "ফাইল অথবা ফোল্ডার <strong>শেয়ার করা হয়েছে</strong>",
"You shared %1$s with %2$s" : "আপনি %1$s শেয়ার করছেন %2$s এর সাথে",
"You shared %1$s with group %2$s" : "আপনি %1$s কে %2$s গ্রুপের সাথে শেয়ার করেছেন",
- "%2$s shared %1$s with you" : "%2$s শেয়ার করেছে %1$s কে আপনার সাথে ",
"You shared %1$s via link" : "আপনি লিঙ্ক দ্বারা %1$s শেয়ার করুন ",
+ "%2$s shared %1$s with you" : "%2$s শেয়ার করেছে %1$s কে আপনার সাথে ",
"Shares" : "শেয়ারস",
"Name" : "নাম",
"Download" : "ডাউনলোড করুন"
diff --git a/apps/files_sharing/l10n/ca.js b/apps/files_sharing/l10n/ca.js
index b295a3aa7dc..31255f628bb 100644
--- a/apps/files_sharing/l10n/ca.js
+++ b/apps/files_sharing/l10n/ca.js
@@ -20,8 +20,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "S'ha <strong>compartit</strong> un fitxer o una carpeta",
"You shared %1$s with %2$s" : "Has compartit %1$s amb %2$s",
"You shared %1$s with group %2$s" : "has compartit %1$s amb el grup %2$s",
- "%2$s shared %1$s with you" : "%2$s ha compartit %1$s amb tu",
"You shared %1$s via link" : "Heu compartit %1$s via enllaç",
+ "%2$s shared %1$s with you" : "%2$s ha compartit %1$s amb tu",
"Shares" : "Compartits",
"This share is password-protected" : "Aquest compartit està protegit amb contrasenya",
"The password is wrong. Try again." : "la contrasenya és incorrecta. Intenteu-ho de nou.",
diff --git a/apps/files_sharing/l10n/ca.json b/apps/files_sharing/l10n/ca.json
index e5ce33561a5..e244021d55f 100644
--- a/apps/files_sharing/l10n/ca.json
+++ b/apps/files_sharing/l10n/ca.json
@@ -18,8 +18,8 @@
"A file or folder has been <strong>shared</strong>" : "S'ha <strong>compartit</strong> un fitxer o una carpeta",
"You shared %1$s with %2$s" : "Has compartit %1$s amb %2$s",
"You shared %1$s with group %2$s" : "has compartit %1$s amb el grup %2$s",
- "%2$s shared %1$s with you" : "%2$s ha compartit %1$s amb tu",
"You shared %1$s via link" : "Heu compartit %1$s via enllaç",
+ "%2$s shared %1$s with you" : "%2$s ha compartit %1$s amb tu",
"Shares" : "Compartits",
"This share is password-protected" : "Aquest compartit està protegit amb contrasenya",
"The password is wrong. Try again." : "la contrasenya és incorrecta. Intenteu-ho de nou.",
diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js
index 69317c65ab0..5a9fa528e8a 100644
--- a/apps/files_sharing/l10n/cs_CZ.js
+++ b/apps/files_sharing/l10n/cs_CZ.js
@@ -38,20 +38,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Byl stažen veřejně sdílený adresář %1$s ",
"Public shared file %1$s was downloaded" : "Byl stažen veřejně sdílený soubor %1$s ",
"You shared %1$s with %2$s" : "Sdílíte %1$s s %2$s",
- "You shared %1$s with group %2$s" : "Sdílíte %1$s se skupinou %2$s",
"%2$s shared %1$s with %3$s" : "%2$s nasdílel(a) %1$s s %3$s",
+ "You shared %1$s with group %2$s" : "Sdílíte %1$s se skupinou %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s nasdílel(a) %1$s se skupinou %3$s",
"%2$s shared %1$s via link" : "%2$s nasdílel(a) %1$s jako odkaz",
- "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
"You shared %1$s via link" : "Sdílíte %1$s přes odkaz",
+ "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
"Downloaded via public link" : "Staženo pomocí veřejného odkazu",
"Shared with %2$s" : "Sdíleno s %2$s",
- "Shared with group %2$s" : "Sdíleno se skupinou %2$s",
"Shared with %3$s by %2$s" : "%2$s sdílí s %3$s",
+ "Shared with group %2$s" : "Sdíleno se skupinou %2$s",
"Shared with group %3$s by %2$s" : "%2$s sdílí se skupinou %3$s",
"Shared via link by %2$s" : "%2$s sdílel(a) jako odkaz",
- "Shared by %2$s" : "%2$s sdílel(a)",
"Shared via public link" : "Sdíleno jako veřejný odkaz",
+ "Shared by %2$s" : "%2$s sdílel(a)",
"Shares" : "Sdílení",
"Accept" : "Přijmout",
"Decline" : "Zamítnout",
diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json
index dd380d7bca6..a87d50129f5 100644
--- a/apps/files_sharing/l10n/cs_CZ.json
+++ b/apps/files_sharing/l10n/cs_CZ.json
@@ -36,20 +36,20 @@
"Public shared folder %1$s was downloaded" : "Byl stažen veřejně sdílený adresář %1$s ",
"Public shared file %1$s was downloaded" : "Byl stažen veřejně sdílený soubor %1$s ",
"You shared %1$s with %2$s" : "Sdílíte %1$s s %2$s",
- "You shared %1$s with group %2$s" : "Sdílíte %1$s se skupinou %2$s",
"%2$s shared %1$s with %3$s" : "%2$s nasdílel(a) %1$s s %3$s",
+ "You shared %1$s with group %2$s" : "Sdílíte %1$s se skupinou %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s nasdílel(a) %1$s se skupinou %3$s",
"%2$s shared %1$s via link" : "%2$s nasdílel(a) %1$s jako odkaz",
- "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
"You shared %1$s via link" : "Sdílíte %1$s přes odkaz",
+ "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
"Downloaded via public link" : "Staženo pomocí veřejného odkazu",
"Shared with %2$s" : "Sdíleno s %2$s",
- "Shared with group %2$s" : "Sdíleno se skupinou %2$s",
"Shared with %3$s by %2$s" : "%2$s sdílí s %3$s",
+ "Shared with group %2$s" : "Sdíleno se skupinou %2$s",
"Shared with group %3$s by %2$s" : "%2$s sdílí se skupinou %3$s",
"Shared via link by %2$s" : "%2$s sdílel(a) jako odkaz",
- "Shared by %2$s" : "%2$s sdílel(a)",
"Shared via public link" : "Sdíleno jako veřejný odkaz",
+ "Shared by %2$s" : "%2$s sdílel(a)",
"Shares" : "Sdílení",
"Accept" : "Přijmout",
"Decline" : "Zamítnout",
diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js
index 40d09be82f5..d3ba2463591 100644
--- a/apps/files_sharing/l10n/da.js
+++ b/apps/files_sharing/l10n/da.js
@@ -37,20 +37,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Den offentligt delte mappe %1$s blev downloadet",
"Public shared file %1$s was downloaded" : "Den offentligt delte fil %1$s blev downloadet",
"You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
- "You shared %1$s with group %2$s" : "Du delte %1$s med gruppen %2$s",
"%2$s shared %1$s with %3$s" : "%2$s delt %1$s med %3$s",
+ "You shared %1$s with group %2$s" : "Du delte %1$s med gruppen %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s delt %1$s med gruppen %3$s",
"%2$s shared %1$s via link" : "%2$s delt %1$s via link",
- "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
"You shared %1$s via link" : "Du delte %1$s via link",
+ "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
"Downloaded via public link" : "Downloaded via et offentligt link",
"Shared with %2$s" : "Delt med %2$s",
- "Shared with group %2$s" : "Delt med gruppen %2$s",
"Shared with %3$s by %2$s" : "Delt med %3$s af %2$s",
+ "Shared with group %2$s" : "Delt med gruppen %2$s",
"Shared with group %3$s by %2$s" : "Delt med gruppen %3$s af %2$s",
"Shared via link by %2$s" : "Delt via link af %2$s",
- "Shared by %2$s" : "Delt af %2$s",
"Shared via public link" : "Delt via offentligt link",
+ "Shared by %2$s" : "Delt af %2$s",
"Shares" : "Delt",
"Accept" : "Acceptér",
"Decline" : "Afvis",
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
index 9c9a212b66c..d447dee544e 100644
--- a/apps/files_sharing/l10n/da.json
+++ b/apps/files_sharing/l10n/da.json
@@ -35,20 +35,20 @@
"Public shared folder %1$s was downloaded" : "Den offentligt delte mappe %1$s blev downloadet",
"Public shared file %1$s was downloaded" : "Den offentligt delte fil %1$s blev downloadet",
"You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
- "You shared %1$s with group %2$s" : "Du delte %1$s med gruppen %2$s",
"%2$s shared %1$s with %3$s" : "%2$s delt %1$s med %3$s",
+ "You shared %1$s with group %2$s" : "Du delte %1$s med gruppen %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s delt %1$s med gruppen %3$s",
"%2$s shared %1$s via link" : "%2$s delt %1$s via link",
- "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
"You shared %1$s via link" : "Du delte %1$s via link",
+ "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
"Downloaded via public link" : "Downloaded via et offentligt link",
"Shared with %2$s" : "Delt med %2$s",
- "Shared with group %2$s" : "Delt med gruppen %2$s",
"Shared with %3$s by %2$s" : "Delt med %3$s af %2$s",
+ "Shared with group %2$s" : "Delt med gruppen %2$s",
"Shared with group %3$s by %2$s" : "Delt med gruppen %3$s af %2$s",
"Shared via link by %2$s" : "Delt via link af %2$s",
- "Shared by %2$s" : "Delt af %2$s",
"Shared via public link" : "Delt via offentligt link",
+ "Shared by %2$s" : "Delt af %2$s",
"Shares" : "Delt",
"Accept" : "Acceptér",
"Decline" : "Afvis",
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index 8021e9aa5d8..fd874e1704a 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -37,20 +37,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen",
"Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
"You shared %1$s with %2$s" : "Du hast %1$s mit %2$s geteilt",
- "You shared %1$s with group %2$s" : "Du hast %1$s mit der Gruppe %2$s geteilt",
"%2$s shared %1$s with %3$s" : "%2$s geteilt %1$s mit %3$s",
+ "You shared %1$s with group %2$s" : "Du hast %1$s mit der Gruppe %2$s geteilt",
"%2$s shared %1$s with group %3$s" : "%2$s geteilt %1$s mit Gruppe %3$s",
"%2$s shared %1$s via link" : "%2$s geteilt %1$s via Link",
- "%2$s shared %1$s with you" : "%2$s hat %1$s mit Dir geteilt",
"You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben",
+ "%2$s shared %1$s with you" : "%2$s hat %1$s mit Dir geteilt",
"Downloaded via public link" : "Runtergeladen mittels öffentlichen Link",
"Shared with %2$s" : "Geteilt mit %2$s",
- "Shared with group %2$s" : "Geteilt mit Gruppe %2$s",
"Shared with %3$s by %2$s" : "Geteilt mit %3$s von %2$s",
+ "Shared with group %2$s" : "Geteilt mit Gruppe %2$s",
"Shared with group %3$s by %2$s" : "Geteilt mit Gruppe %3$s von %2$s",
"Shared via link by %2$s" : "Geteilt mittels Link von %2$s",
- "Shared by %2$s" : "Geteilt von %2$s",
"Shared via public link" : "Geteilt mittels öffentlichen Link",
+ "Shared by %2$s" : "Geteilt von %2$s",
"Shares" : "Freigaben",
"Accept" : "Ok",
"Decline" : "Abgelehnt",
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index b1ae20fba7d..008332a9ead 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -35,20 +35,20 @@
"Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen",
"Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
"You shared %1$s with %2$s" : "Du hast %1$s mit %2$s geteilt",
- "You shared %1$s with group %2$s" : "Du hast %1$s mit der Gruppe %2$s geteilt",
"%2$s shared %1$s with %3$s" : "%2$s geteilt %1$s mit %3$s",
+ "You shared %1$s with group %2$s" : "Du hast %1$s mit der Gruppe %2$s geteilt",
"%2$s shared %1$s with group %3$s" : "%2$s geteilt %1$s mit Gruppe %3$s",
"%2$s shared %1$s via link" : "%2$s geteilt %1$s via Link",
- "%2$s shared %1$s with you" : "%2$s hat %1$s mit Dir geteilt",
"You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben",
+ "%2$s shared %1$s with you" : "%2$s hat %1$s mit Dir geteilt",
"Downloaded via public link" : "Runtergeladen mittels öffentlichen Link",
"Shared with %2$s" : "Geteilt mit %2$s",
- "Shared with group %2$s" : "Geteilt mit Gruppe %2$s",
"Shared with %3$s by %2$s" : "Geteilt mit %3$s von %2$s",
+ "Shared with group %2$s" : "Geteilt mit Gruppe %2$s",
"Shared with group %3$s by %2$s" : "Geteilt mit Gruppe %3$s von %2$s",
"Shared via link by %2$s" : "Geteilt mittels Link von %2$s",
- "Shared by %2$s" : "Geteilt von %2$s",
"Shared via public link" : "Geteilt mittels öffentlichen Link",
+ "Shared by %2$s" : "Geteilt von %2$s",
"Shares" : "Freigaben",
"Accept" : "Ok",
"Decline" : "Abgelehnt",
diff --git a/apps/files_sharing/l10n/de_AT.js b/apps/files_sharing/l10n/de_AT.js
index 36a67ecac20..fdbbbee12f0 100644
--- a/apps/files_sharing/l10n/de_AT.js
+++ b/apps/files_sharing/l10n/de_AT.js
@@ -5,8 +5,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "Eine Datei oder ein Ordner wurde <strong>geteilt</strong>",
"You shared %1$s with %2$s" : "du teilst %1$s mit %2$s",
"You shared %1$s with group %2$s" : "Du teilst %1$s mit der Gruppe %2$s",
- "%2$s shared %1$s with you" : "%2$s hat %1$s mit dir geteilt",
"You shared %1$s via link" : "Du hast %1$s mithilfe eines Link geteilt",
+ "%2$s shared %1$s with you" : "%2$s hat %1$s mit dir geteilt",
"Shares" : "teilt",
"Password" : "Passwort",
"Download" : "Herunterladen"
diff --git a/apps/files_sharing/l10n/de_AT.json b/apps/files_sharing/l10n/de_AT.json
index fe0cfb4eeda..5cda52d6358 100644
--- a/apps/files_sharing/l10n/de_AT.json
+++ b/apps/files_sharing/l10n/de_AT.json
@@ -3,8 +3,8 @@
"A file or folder has been <strong>shared</strong>" : "Eine Datei oder ein Ordner wurde <strong>geteilt</strong>",
"You shared %1$s with %2$s" : "du teilst %1$s mit %2$s",
"You shared %1$s with group %2$s" : "Du teilst %1$s mit der Gruppe %2$s",
- "%2$s shared %1$s with you" : "%2$s hat %1$s mit dir geteilt",
"You shared %1$s via link" : "Du hast %1$s mithilfe eines Link geteilt",
+ "%2$s shared %1$s with you" : "%2$s hat %1$s mit dir geteilt",
"Shares" : "teilt",
"Password" : "Passwort",
"Download" : "Herunterladen"
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
index b1b4be9e5ad..b4c3cfb57b3 100644
--- a/apps/files_sharing/l10n/de_DE.js
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -38,16 +38,16 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
"You shared %1$s with %2$s" : "Sie haben %1$s mit %2$s geteilt",
"You shared %1$s with group %2$s" : "Sie haben %1$s mit der Gruppe %2$s geteilt",
- "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt",
"You shared %1$s via link" : "Sie haben %1$s über einen Link geteilt",
+ "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt",
"Downloaded via public link" : "Über den öffentlichen Link heruntergeladen",
"Shared with %2$s" : "Geteilt mit %2$s",
- "Shared with group %2$s" : "Geteilt mit der Gruppe %2$s",
"Shared with %3$s by %2$s" : "Geteilt mit %3$s von %2$s",
+ "Shared with group %2$s" : "Geteilt mit der Gruppe %2$s",
"Shared with group %3$s by %2$s" : "Geteilt mit der Gruppe %3$s von %2$s",
"Shared via link by %2$s" : "Geteilt durch einen Link von %2$s",
- "Shared by %2$s" : "Geteilt von %2$s",
"Shared via public link" : "Durch einen öffentlichen Link geteilt",
+ "Shared by %2$s" : "Geteilt von %2$s",
"Shares" : "Geteiltes",
"Accept" : "Akzeptieren",
"Decline" : "Ablehnen",
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
index 7ed2c480284..0f46c1b13f9 100644
--- a/apps/files_sharing/l10n/de_DE.json
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -36,16 +36,16 @@
"Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
"You shared %1$s with %2$s" : "Sie haben %1$s mit %2$s geteilt",
"You shared %1$s with group %2$s" : "Sie haben %1$s mit der Gruppe %2$s geteilt",
- "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt",
"You shared %1$s via link" : "Sie haben %1$s über einen Link geteilt",
+ "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt",
"Downloaded via public link" : "Über den öffentlichen Link heruntergeladen",
"Shared with %2$s" : "Geteilt mit %2$s",
- "Shared with group %2$s" : "Geteilt mit der Gruppe %2$s",
"Shared with %3$s by %2$s" : "Geteilt mit %3$s von %2$s",
+ "Shared with group %2$s" : "Geteilt mit der Gruppe %2$s",
"Shared with group %3$s by %2$s" : "Geteilt mit der Gruppe %3$s von %2$s",
"Shared via link by %2$s" : "Geteilt durch einen Link von %2$s",
- "Shared by %2$s" : "Geteilt von %2$s",
"Shared via public link" : "Durch einen öffentlichen Link geteilt",
+ "Shared by %2$s" : "Geteilt von %2$s",
"Shares" : "Geteiltes",
"Accept" : "Akzeptieren",
"Decline" : "Ablehnen",
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index 41331caee24..fe3a62c4357 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -37,20 +37,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Ο κοινόχρηστος διαμοιρασμένος φάκελος %1$s ελήφθη",
"Public shared file %1$s was downloaded" : "Το κοινόχρηστο διαμοιρασμένο αρχείο %1$s ελήφθη",
"You shared %1$s with %2$s" : "Διαμοιραστήκατε το %1$s με %2$s",
- "You shared %1$s with group %2$s" : "Διαμοιραστήκατε %1$s με την ομάδα %2$s",
"%2$s shared %1$s with %3$s" : "Ο %2$s διαμοιράστηκε το %1$s με %3$s",
+ "You shared %1$s with group %2$s" : "Διαμοιραστήκατε %1$s με την ομάδα %2$s",
"%2$s shared %1$s with group %3$s" : "Ο %2$s διαμοιράστηκε το %1$s με την ομάδα %3$s",
"%2$s shared %1$s via link" : "Ο %2$s διαμοιράστηκε το %1$s μέσω συνδέσμου",
- "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
"You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
+ "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
"Downloaded via public link" : "Μεταφορτώθηκε μέσω δημόσιου συνδέσμου",
"Shared with %2$s" : "Διαμοιράστηκε με %2$s",
- "Shared with group %2$s" : "Διαμοιράστηκε με την ομάδα %2$s",
"Shared with %3$s by %2$s" : "Διαμοιράστηκε με %3$s από %2$s",
+ "Shared with group %2$s" : "Διαμοιράστηκε με την ομάδα %2$s",
"Shared with group %3$s by %2$s" : "Διαμοιράστηκε με την ομάδα %3$s από %2$s",
"Shared via link by %2$s" : "Διαμοιράστηκε μέσω συνδέσμου από %2$s",
- "Shared by %2$s" : "Διαμοιράστηκε από %2$s",
"Shared via public link" : "Διαμοιράστηκε μέσω δημόσιου συνδέσμου",
+ "Shared by %2$s" : "Διαμοιράστηκε από %2$s",
"Shares" : "Κοινόχρηστοι φάκελοι",
"Accept" : "Αποδοχή",
"Decline" : "Απόρριψη",
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index 16d1d4739b7..3283aa0a029 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -35,20 +35,20 @@
"Public shared folder %1$s was downloaded" : "Ο κοινόχρηστος διαμοιρασμένος φάκελος %1$s ελήφθη",
"Public shared file %1$s was downloaded" : "Το κοινόχρηστο διαμοιρασμένο αρχείο %1$s ελήφθη",
"You shared %1$s with %2$s" : "Διαμοιραστήκατε το %1$s με %2$s",
- "You shared %1$s with group %2$s" : "Διαμοιραστήκατε %1$s με την ομάδα %2$s",
"%2$s shared %1$s with %3$s" : "Ο %2$s διαμοιράστηκε το %1$s με %3$s",
+ "You shared %1$s with group %2$s" : "Διαμοιραστήκατε %1$s με την ομάδα %2$s",
"%2$s shared %1$s with group %3$s" : "Ο %2$s διαμοιράστηκε το %1$s με την ομάδα %3$s",
"%2$s shared %1$s via link" : "Ο %2$s διαμοιράστηκε το %1$s μέσω συνδέσμου",
- "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
"You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
+ "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
"Downloaded via public link" : "Μεταφορτώθηκε μέσω δημόσιου συνδέσμου",
"Shared with %2$s" : "Διαμοιράστηκε με %2$s",
- "Shared with group %2$s" : "Διαμοιράστηκε με την ομάδα %2$s",
"Shared with %3$s by %2$s" : "Διαμοιράστηκε με %3$s από %2$s",
+ "Shared with group %2$s" : "Διαμοιράστηκε με την ομάδα %2$s",
"Shared with group %3$s by %2$s" : "Διαμοιράστηκε με την ομάδα %3$s από %2$s",
"Shared via link by %2$s" : "Διαμοιράστηκε μέσω συνδέσμου από %2$s",
- "Shared by %2$s" : "Διαμοιράστηκε από %2$s",
"Shared via public link" : "Διαμοιράστηκε μέσω δημόσιου συνδέσμου",
+ "Shared by %2$s" : "Διαμοιράστηκε από %2$s",
"Shares" : "Κοινόχρηστοι φάκελοι",
"Accept" : "Αποδοχή",
"Decline" : "Απόρριψη",
diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js
index 424fe743088..dbf6edd8065 100644
--- a/apps/files_sharing/l10n/en_GB.js
+++ b/apps/files_sharing/l10n/en_GB.js
@@ -37,8 +37,8 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Public shared file %1$s was downloaded",
"You shared %1$s with %2$s" : "You shared %1$s with %2$s",
"You shared %1$s with group %2$s" : "You shared %1$s with group %2$s",
- "%2$s shared %1$s with you" : "%2$s shared %1$s with you",
"You shared %1$s via link" : "You shared %1$s via link",
+ "%2$s shared %1$s with you" : "%2$s shared %1$s with you",
"Shares" : "Shares",
"Accept" : "Accept",
"This share is password-protected" : "This share is password-protected",
diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json
index 4e41be946d1..be91541737f 100644
--- a/apps/files_sharing/l10n/en_GB.json
+++ b/apps/files_sharing/l10n/en_GB.json
@@ -35,8 +35,8 @@
"Public shared file %1$s was downloaded" : "Public shared file %1$s was downloaded",
"You shared %1$s with %2$s" : "You shared %1$s with %2$s",
"You shared %1$s with group %2$s" : "You shared %1$s with group %2$s",
- "%2$s shared %1$s with you" : "%2$s shared %1$s with you",
"You shared %1$s via link" : "You shared %1$s via link",
+ "%2$s shared %1$s with you" : "%2$s shared %1$s with you",
"Shares" : "Shares",
"Accept" : "Accept",
"This share is password-protected" : "This share is password-protected",
diff --git a/apps/files_sharing/l10n/eo.js b/apps/files_sharing/l10n/eo.js
index ef900774146..33befd672dc 100644
--- a/apps/files_sharing/l10n/eo.js
+++ b/apps/files_sharing/l10n/eo.js
@@ -21,8 +21,8 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "La publika kunhavata dosiero %1$s elŝutiĝis",
"You shared %1$s with %2$s" : "Vi kunhavigis %1$s kun %2$s",
"You shared %1$s with group %2$s" : "Vi kunhavigis %1$s kun la grupo %2$s",
- "%2$s shared %1$s with you" : "%2$s kunhavigis %1$s kun vi",
"You shared %1$s via link" : "Vi kunhavigis %1$s per ligilo",
+ "%2$s shared %1$s with you" : "%2$s kunhavigis %1$s kun vi",
"Accept" : "Akcepti",
"This share is password-protected" : "Ĉi tiu kunhavigo estas protektata per pasvorto",
"The password is wrong. Try again." : "La pasvorto malĝustas. Provu denove.",
diff --git a/apps/files_sharing/l10n/eo.json b/apps/files_sharing/l10n/eo.json
index cc648a7c60d..5bc080158c4 100644
--- a/apps/files_sharing/l10n/eo.json
+++ b/apps/files_sharing/l10n/eo.json
@@ -19,8 +19,8 @@
"Public shared file %1$s was downloaded" : "La publika kunhavata dosiero %1$s elŝutiĝis",
"You shared %1$s with %2$s" : "Vi kunhavigis %1$s kun %2$s",
"You shared %1$s with group %2$s" : "Vi kunhavigis %1$s kun la grupo %2$s",
- "%2$s shared %1$s with you" : "%2$s kunhavigis %1$s kun vi",
"You shared %1$s via link" : "Vi kunhavigis %1$s per ligilo",
+ "%2$s shared %1$s with you" : "%2$s kunhavigis %1$s kun vi",
"Accept" : "Akcepti",
"This share is password-protected" : "Ĉi tiu kunhavigo estas protektata per pasvorto",
"The password is wrong. Try again." : "La pasvorto malĝustas. Provu denove.",
diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js
index f87544b413a..c14e24051ed 100644
--- a/apps/files_sharing/l10n/es.js
+++ b/apps/files_sharing/l10n/es.js
@@ -38,20 +38,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Se descargó la carpeta pública compartida %1$s",
"Public shared file %1$s was downloaded" : "Se descargó el archivo público compartido %1$s",
"You shared %1$s with %2$s" : "Usted compartió %1$s con %2$s",
- "You shared %1$s with group %2$s" : "Usted ha compartido %1$s con el grupo %2$s",
"%2$s shared %1$s with %3$s" : "%2$s compartó %1$s con %3$s",
+ "You shared %1$s with group %2$s" : "Usted ha compartido %1$s con el grupo %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s compartió %1$s con el grupo %3$s",
"%2$s shared %1$s via link" : "%2$s compartió %1$s vía enlace",
- "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted",
"You shared %1$s via link" : "Ha compartido %1$s vía enlace",
+ "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted",
"Downloaded via public link" : "Descargado vía enlace público",
"Shared with %2$s" : "Compartido con %2$s",
- "Shared with group %2$s" : "Compartido con el grupo %2$s",
"Shared with %3$s by %2$s" : "Compartido con %3$s por %2$s",
+ "Shared with group %2$s" : "Compartido con el grupo %2$s",
"Shared with group %3$s by %2$s" : "Compartido con el grupo %3$s por %2$s",
"Shared via link by %2$s" : "Compartido vía enlace por %2$s",
- "Shared by %2$s" : "Compartido por %2$s",
"Shared via public link" : "Compartido vía enlace público",
+ "Shared by %2$s" : "Compartido por %2$s",
"Shares" : "Compartidos",
"Accept" : "Aceptar",
"Decline" : "Denegar",
diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json
index 9ea18660eba..6b21f7c8d83 100644
--- a/apps/files_sharing/l10n/es.json
+++ b/apps/files_sharing/l10n/es.json
@@ -36,20 +36,20 @@
"Public shared folder %1$s was downloaded" : "Se descargó la carpeta pública compartida %1$s",
"Public shared file %1$s was downloaded" : "Se descargó el archivo público compartido %1$s",
"You shared %1$s with %2$s" : "Usted compartió %1$s con %2$s",
- "You shared %1$s with group %2$s" : "Usted ha compartido %1$s con el grupo %2$s",
"%2$s shared %1$s with %3$s" : "%2$s compartó %1$s con %3$s",
+ "You shared %1$s with group %2$s" : "Usted ha compartido %1$s con el grupo %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s compartió %1$s con el grupo %3$s",
"%2$s shared %1$s via link" : "%2$s compartió %1$s vía enlace",
- "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted",
"You shared %1$s via link" : "Ha compartido %1$s vía enlace",
+ "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted",
"Downloaded via public link" : "Descargado vía enlace público",
"Shared with %2$s" : "Compartido con %2$s",
- "Shared with group %2$s" : "Compartido con el grupo %2$s",
"Shared with %3$s by %2$s" : "Compartido con %3$s por %2$s",
+ "Shared with group %2$s" : "Compartido con el grupo %2$s",
"Shared with group %3$s by %2$s" : "Compartido con el grupo %3$s por %2$s",
"Shared via link by %2$s" : "Compartido vía enlace por %2$s",
- "Shared by %2$s" : "Compartido por %2$s",
"Shared via public link" : "Compartido vía enlace público",
+ "Shared by %2$s" : "Compartido por %2$s",
"Shares" : "Compartidos",
"Accept" : "Aceptar",
"Decline" : "Denegar",
diff --git a/apps/files_sharing/l10n/es_AR.js b/apps/files_sharing/l10n/es_AR.js
index f0e363b2f49..54a32182237 100644
--- a/apps/files_sharing/l10n/es_AR.js
+++ b/apps/files_sharing/l10n/es_AR.js
@@ -8,8 +8,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "Un archivo o carpeta ha sido <strong>compartido</strong>",
"You shared %1$s with %2$s" : "Has compartido %1$s con %2$s",
"You shared %1$s with group %2$s" : "Has compartido %1$s en el grupo %2$s",
- "%2$s shared %1$s with you" : "%2$s compartió %1$s contigo",
"You shared %1$s via link" : "Has compartido %1$s a través del enlace",
+ "%2$s shared %1$s with you" : "%2$s compartió %1$s contigo",
"Shares" : "Compartidos",
"This share is password-protected" : "Esto está protegido por contraseña",
"The password is wrong. Try again." : "La contraseña no es correcta. Probá de nuevo.",
diff --git a/apps/files_sharing/l10n/es_AR.json b/apps/files_sharing/l10n/es_AR.json
index 7a6441c7bdf..db975a6094f 100644
--- a/apps/files_sharing/l10n/es_AR.json
+++ b/apps/files_sharing/l10n/es_AR.json
@@ -6,8 +6,8 @@
"A file or folder has been <strong>shared</strong>" : "Un archivo o carpeta ha sido <strong>compartido</strong>",
"You shared %1$s with %2$s" : "Has compartido %1$s con %2$s",
"You shared %1$s with group %2$s" : "Has compartido %1$s en el grupo %2$s",
- "%2$s shared %1$s with you" : "%2$s compartió %1$s contigo",
"You shared %1$s via link" : "Has compartido %1$s a través del enlace",
+ "%2$s shared %1$s with you" : "%2$s compartió %1$s contigo",
"Shares" : "Compartidos",
"This share is password-protected" : "Esto está protegido por contraseña",
"The password is wrong. Try again." : "La contraseña no es correcta. Probá de nuevo.",
diff --git a/apps/files_sharing/l10n/es_CL.js b/apps/files_sharing/l10n/es_CL.js
index 792d5a3cad1..a07d991b5b9 100644
--- a/apps/files_sharing/l10n/es_CL.js
+++ b/apps/files_sharing/l10n/es_CL.js
@@ -5,8 +5,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "Un archivo o carpeta ha sido <strong>compartido</strong>",
"You shared %1$s with %2$s" : "Ha compartido %1$s con %2$s",
"You shared %1$s with group %2$s" : "Has compartido %1$s con el grupo %2$s",
- "%2$s shared %1$s with you" : "%2$s compartió %1$s con usted",
"You shared %1$s via link" : "Ha compartido %1$s vía enlace",
+ "%2$s shared %1$s with you" : "%2$s compartió %1$s con usted",
"Shares" : "Compartidos",
"Password" : "Clave",
"Download" : "Descargar"
diff --git a/apps/files_sharing/l10n/es_CL.json b/apps/files_sharing/l10n/es_CL.json
index 28f3056023b..97088d3de0e 100644
--- a/apps/files_sharing/l10n/es_CL.json
+++ b/apps/files_sharing/l10n/es_CL.json
@@ -3,8 +3,8 @@
"A file or folder has been <strong>shared</strong>" : "Un archivo o carpeta ha sido <strong>compartido</strong>",
"You shared %1$s with %2$s" : "Ha compartido %1$s con %2$s",
"You shared %1$s with group %2$s" : "Has compartido %1$s con el grupo %2$s",
- "%2$s shared %1$s with you" : "%2$s compartió %1$s con usted",
"You shared %1$s via link" : "Ha compartido %1$s vía enlace",
+ "%2$s shared %1$s with you" : "%2$s compartió %1$s con usted",
"Shares" : "Compartidos",
"Password" : "Clave",
"Download" : "Descargar"
diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js
index 2fcce251407..ab817fc569d 100644
--- a/apps/files_sharing/l10n/et_EE.js
+++ b/apps/files_sharing/l10n/et_EE.js
@@ -28,8 +28,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "Fail või kataloog on <strong>jagatud</strong>",
"You shared %1$s with %2$s" : "Jagasid %1$s %2$s kasutajaga",
"You shared %1$s with group %2$s" : "Jagasid %1$s %2$s grupiga",
- "%2$s shared %1$s with you" : "%2$s jagas sinuga %1$s",
"You shared %1$s via link" : "Jagasid %1$s lingiga",
+ "%2$s shared %1$s with you" : "%2$s jagas sinuga %1$s",
"Downloaded via public link" : "Alla laetud avalikult lingilt",
"Shared with %2$s" : "Jagatud kasutajaga %2$s",
"Shares" : "Jagamised",
diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json
index 34ddd9f1b15..2f97448e9d9 100644
--- a/apps/files_sharing/l10n/et_EE.json
+++ b/apps/files_sharing/l10n/et_EE.json
@@ -26,8 +26,8 @@
"A file or folder has been <strong>shared</strong>" : "Fail või kataloog on <strong>jagatud</strong>",
"You shared %1$s with %2$s" : "Jagasid %1$s %2$s kasutajaga",
"You shared %1$s with group %2$s" : "Jagasid %1$s %2$s grupiga",
- "%2$s shared %1$s with you" : "%2$s jagas sinuga %1$s",
"You shared %1$s via link" : "Jagasid %1$s lingiga",
+ "%2$s shared %1$s with you" : "%2$s jagas sinuga %1$s",
"Downloaded via public link" : "Alla laetud avalikult lingilt",
"Shared with %2$s" : "Jagatud kasutajaga %2$s",
"Shares" : "Jagamised",
diff --git a/apps/files_sharing/l10n/eu.js b/apps/files_sharing/l10n/eu.js
index 69a5e42cb4c..e7e5220d3f3 100644
--- a/apps/files_sharing/l10n/eu.js
+++ b/apps/files_sharing/l10n/eu.js
@@ -31,8 +31,8 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Publikoki partekatutako %1$s fitxategia deskargatu da",
"You shared %1$s with %2$s" : "Zuk %1$s elkarbanatu duzu %2$srekin",
"You shared %1$s with group %2$s" : "Zuk %1$s elkarbanatu duzu %2$s taldearekin",
- "%2$s shared %1$s with you" : "%2$sk zurekin %1$s elkarbanatu du",
"You shared %1$s via link" : "Konpartitu duzu %1$s esteka baten bidez",
+ "%2$s shared %1$s with you" : "%2$sk zurekin %1$s elkarbanatu du",
"Shares" : "Partekatuak",
"This share is password-protected" : "Elkarbanatutako hau pasahitzarekin babestuta dago",
"The password is wrong. Try again." : "Pasahitza ez da egokia. Saiatu berriro.",
diff --git a/apps/files_sharing/l10n/eu.json b/apps/files_sharing/l10n/eu.json
index e7890855cd4..72e3b036323 100644
--- a/apps/files_sharing/l10n/eu.json
+++ b/apps/files_sharing/l10n/eu.json
@@ -29,8 +29,8 @@
"Public shared file %1$s was downloaded" : "Publikoki partekatutako %1$s fitxategia deskargatu da",
"You shared %1$s with %2$s" : "Zuk %1$s elkarbanatu duzu %2$srekin",
"You shared %1$s with group %2$s" : "Zuk %1$s elkarbanatu duzu %2$s taldearekin",
- "%2$s shared %1$s with you" : "%2$sk zurekin %1$s elkarbanatu du",
"You shared %1$s via link" : "Konpartitu duzu %1$s esteka baten bidez",
+ "%2$s shared %1$s with you" : "%2$sk zurekin %1$s elkarbanatu du",
"Shares" : "Partekatuak",
"This share is password-protected" : "Elkarbanatutako hau pasahitzarekin babestuta dago",
"The password is wrong. Try again." : "Pasahitza ez da egokia. Saiatu berriro.",
diff --git a/apps/files_sharing/l10n/fa.js b/apps/files_sharing/l10n/fa.js
index cd915b79a17..b6cb143a3dd 100644
--- a/apps/files_sharing/l10n/fa.js
+++ b/apps/files_sharing/l10n/fa.js
@@ -25,8 +25,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "فایل یا پوشه ای به <strong>اشتراک</strong> گذاشته شد",
"You shared %1$s with %2$s" : "شما %1$s را با %2$s به اشتراک گذاشتید",
"You shared %1$s with group %2$s" : "شما %1$s را با گروه %2$s به اشتراک گذاشتید",
- "%2$s shared %1$s with you" : "%2$s مورد %1$s را با شما به اشتراک گذاشت",
"You shared %1$s via link" : "شما %1$s را توسط پیوند به اشتراک گذاشتید",
+ "%2$s shared %1$s with you" : "%2$s مورد %1$s را با شما به اشتراک گذاشت",
"Shares" : "موارد به اشتراک گذاشته",
"Accept" : "قبول",
"This share is password-protected" : "این اشتراک توسط رمز عبور محافظت می شود",
diff --git a/apps/files_sharing/l10n/fa.json b/apps/files_sharing/l10n/fa.json
index a345d9f1401..e3d73a7a633 100644
--- a/apps/files_sharing/l10n/fa.json
+++ b/apps/files_sharing/l10n/fa.json
@@ -23,8 +23,8 @@
"A file or folder has been <strong>shared</strong>" : "فایل یا پوشه ای به <strong>اشتراک</strong> گذاشته شد",
"You shared %1$s with %2$s" : "شما %1$s را با %2$s به اشتراک گذاشتید",
"You shared %1$s with group %2$s" : "شما %1$s را با گروه %2$s به اشتراک گذاشتید",
- "%2$s shared %1$s with you" : "%2$s مورد %1$s را با شما به اشتراک گذاشت",
"You shared %1$s via link" : "شما %1$s را توسط پیوند به اشتراک گذاشتید",
+ "%2$s shared %1$s with you" : "%2$s مورد %1$s را با شما به اشتراک گذاشت",
"Shares" : "موارد به اشتراک گذاشته",
"Accept" : "قبول",
"This share is password-protected" : "این اشتراک توسط رمز عبور محافظت می شود",
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
index de851266a43..68b41feb46c 100644
--- a/apps/files_sharing/l10n/fi_FI.js
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -11,6 +11,7 @@ OC.L10N.register(
"Shared with you" : "Jaettu kanssasi",
"Shared with others" : "Jaettu muiden kanssa",
"Shared by link" : "Jaettu linkin kautta",
+ "Federated sharing" : "Federoitu jakaminen",
"Nothing shared with you yet" : "Kanssasi ei ole vielä jaettu mitään",
"Files and folders others share with you will show up here" : "Kanssasi jaetut tiedostot ja kansiot näkyvät täällä",
"Nothing shared yet" : "Ei mitään jaettua",
@@ -38,21 +39,27 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Julkisesti jaettu kansio %1$s ladattiin",
"Public shared file %1$s was downloaded" : "Julkisesti jaettu tiedosto %1$s ladattiin",
"You shared %1$s with %2$s" : "Jaoit kohteen %1$s käyttäjän %2$s kanssa",
- "You shared %1$s with group %2$s" : "Jaoit kohteen %1$s ryhmän %2$s kanssa",
"%2$s shared %1$s with %3$s" : "%2$s jakoi kohteen %1$s käyttäjän %3$s kanssa",
+ "You shared %1$s with group %2$s" : "Jaoit kohteen %1$s ryhmän %2$s kanssa",
"%2$s shared %1$s with group %3$s" : "%2$s jakoi kohteen %1$s ryhmän %3$s kanssa",
"%2$s shared %1$s via link" : "%2$s jakoi kohteen %1$s linkin kautta",
- "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
"You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
+ "Your public link for %1$s expired" : "Julkinen linkkisi kohteelle %1$s vanhentui",
+ "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
"Downloaded via public link" : "Lataa julkista linkkiä käyttäen",
"Shared with %2$s" : "Jaettu käyttäjän %2$s kanssa",
- "Shared with group %2$s" : "Jaettu ryhmän %2$s kanssa",
"Shared with %3$s by %2$s" : "Jaettu käyttäjän %3$s kanssa käyttäjän %2$s toimesta",
+ "Shared with group %2$s" : "Jaettu ryhmän %2$s kanssa",
"Shared with group %3$s by %2$s" : "Jaettu ryhmän %3$s kanssa käyttäjän %2$s toimesta",
"Shared via link by %2$s" : "Jaettu linkin kautta käyttäjän %2$s toimesta",
- "Shared by %2$s" : "Jakanut %2$s",
"Shared via public link" : "Jaettu julkisen linkin kautta",
+ "Removed public link" : "Julkinen linkki poistettu",
+ "%2$s removed public link" : "%2$s poisti julkisen linkin",
+ "Public link expired" : "Julkinen linkki vanhentui",
+ "Public link of %2$s expired" : "Kohteen %2$s julkinen linkki vanhentui",
+ "Shared by %2$s" : "Jakanut %2$s",
"Shares" : "Jaot",
+ "You received \"/%2$s\" as a remote share from %1$s" : "Vastaanotit kohteen \"/%2$s\" etäjakona käyttäjältä %1$s",
"Accept" : "Hyväksy",
"Decline" : "Kieltäydy",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s",
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
index bec40bca1be..e1834ab3c0e 100644
--- a/apps/files_sharing/l10n/fi_FI.json
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -9,6 +9,7 @@
"Shared with you" : "Jaettu kanssasi",
"Shared with others" : "Jaettu muiden kanssa",
"Shared by link" : "Jaettu linkin kautta",
+ "Federated sharing" : "Federoitu jakaminen",
"Nothing shared with you yet" : "Kanssasi ei ole vielä jaettu mitään",
"Files and folders others share with you will show up here" : "Kanssasi jaetut tiedostot ja kansiot näkyvät täällä",
"Nothing shared yet" : "Ei mitään jaettua",
@@ -36,21 +37,27 @@
"Public shared folder %1$s was downloaded" : "Julkisesti jaettu kansio %1$s ladattiin",
"Public shared file %1$s was downloaded" : "Julkisesti jaettu tiedosto %1$s ladattiin",
"You shared %1$s with %2$s" : "Jaoit kohteen %1$s käyttäjän %2$s kanssa",
- "You shared %1$s with group %2$s" : "Jaoit kohteen %1$s ryhmän %2$s kanssa",
"%2$s shared %1$s with %3$s" : "%2$s jakoi kohteen %1$s käyttäjän %3$s kanssa",
+ "You shared %1$s with group %2$s" : "Jaoit kohteen %1$s ryhmän %2$s kanssa",
"%2$s shared %1$s with group %3$s" : "%2$s jakoi kohteen %1$s ryhmän %3$s kanssa",
"%2$s shared %1$s via link" : "%2$s jakoi kohteen %1$s linkin kautta",
- "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
"You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
+ "Your public link for %1$s expired" : "Julkinen linkkisi kohteelle %1$s vanhentui",
+ "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
"Downloaded via public link" : "Lataa julkista linkkiä käyttäen",
"Shared with %2$s" : "Jaettu käyttäjän %2$s kanssa",
- "Shared with group %2$s" : "Jaettu ryhmän %2$s kanssa",
"Shared with %3$s by %2$s" : "Jaettu käyttäjän %3$s kanssa käyttäjän %2$s toimesta",
+ "Shared with group %2$s" : "Jaettu ryhmän %2$s kanssa",
"Shared with group %3$s by %2$s" : "Jaettu ryhmän %3$s kanssa käyttäjän %2$s toimesta",
"Shared via link by %2$s" : "Jaettu linkin kautta käyttäjän %2$s toimesta",
- "Shared by %2$s" : "Jakanut %2$s",
"Shared via public link" : "Jaettu julkisen linkin kautta",
+ "Removed public link" : "Julkinen linkki poistettu",
+ "%2$s removed public link" : "%2$s poisti julkisen linkin",
+ "Public link expired" : "Julkinen linkki vanhentui",
+ "Public link of %2$s expired" : "Kohteen %2$s julkinen linkki vanhentui",
+ "Shared by %2$s" : "Jakanut %2$s",
"Shares" : "Jaot",
+ "You received \"/%2$s\" as a remote share from %1$s" : "Vastaanotit kohteen \"/%2$s\" etäjakona käyttäjältä %1$s",
"Accept" : "Hyväksy",
"Decline" : "Kieltäydy",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s",
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index b33a8631255..e99dffcdcac 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -11,6 +11,7 @@ OC.L10N.register(
"Shared with you" : "Partagés avec vous",
"Shared with others" : "Partagés avec d'autres",
"Shared by link" : "Partagés par lien",
+ "Federated sharing" : "Federated sharing",
"Nothing shared with you yet" : "Aucun fichier n'est partagé avec vous pour l'instant",
"Files and folders others share with you will show up here" : "Les fichiers et dossiers partagés avec vous apparaîtront ici",
"Nothing shared yet" : "Rien n'est partagé pour l'instant",
@@ -38,21 +39,39 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Le dossier public %1$s a été téléchargé",
"Public shared file %1$s was downloaded" : "Le fichier public %1$s a été téléchargé",
"You shared %1$s with %2$s" : "Vous avez partagé %1$s avec %2$s",
- "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s",
"%2$s shared %1$s with %3$s" : "%2$s a partagé %1$s avec %3$s",
+ "You removed the share of %2$s for %1$s" : "Vous avez supprimé le partage de %2$s pour %1$s",
+ "%2$s removed the share of %3$s for %1$s" : "%2$s a supprimé votre partage de %3$s pour %1$s",
+ "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s",
+ "You removed the share of group %2$s for %1$s" : "Vous avez supprimé le partage du groupe %2$s pour %1$s",
+ "%2$s removed the share of group %3$s for %1$s" : "%2$s a supprimé le partage du groupe %3$s pour %1$s",
"%2$s shared %1$s via link" : "%2$s a partagé %1$s par lien",
- "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
"You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
+ "You removed the public link for %1$s" : "Vous avez supprimé le lien public pour %1$s",
+ "%2$s removed the public link for %1$s" : "%2$s a supprimé le lien public pour %1$s",
+ "Your public link for %1$s expired" : "Le lien public pour %1$s a expiré",
+ "The public link of %2$s for %1$s expired" : "Le lien public de %2$s pour %1$s a expiré",
+ "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
+ "%2$s removed the share for %1$s" : "%2$s a supprimé le partage pour %1$s",
"Downloaded via public link" : "Téléchargé par lien public",
"Shared with %2$s" : "Partagé avec %2$s",
- "Shared with group %2$s" : "Partagé avec le groupe %2$s",
"Shared with %3$s by %2$s" : "Partagé avec %3$s par %2$s",
+ "Removed share for %2$s" : "Partage supprimé pour %2$s",
+ "%2$s removed share for %3$s" : "%2$s a supprimé le partage pour %3$s",
+ "Shared with group %2$s" : "Partagé avec le groupe %2$s",
"Shared with group %3$s by %2$s" : "Partagé avec le groupe %3$s par %2$s",
+ "Removed share of group %2$s" : "Partage supprimé du groupe %2$s",
+ "%2$s removed share of group %3$s" : "%2$s a supprimé le partage du groupe %3$s",
"Shared via link by %2$s" : "Partagé via lien par %2$s",
- "Shared by %2$s" : "Partagé par %2$s",
"Shared via public link" : "Partagé par lien public",
+ "Removed public link" : "Lien public supprimé",
+ "%2$s removed public link" : "%2$s a supprimé le lien public",
+ "Public link expired" : "Lien public expiré",
+ "Public link of %2$s expired" : "Le lien public de %2$s a expiré",
+ "Shared by %2$s" : "Partagé par %2$s",
"Shares" : "Partages",
+ "You received \"/%2$s\" as a remote share from %1$s" : "L'utilisateur %1$s a partagé la ressource distante %2$s avec vous",
"Accept" : "Accepter",
"Decline" : "Refuser",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s",
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index 9c8f590bd4b..c0c7b85bf96 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -9,6 +9,7 @@
"Shared with you" : "Partagés avec vous",
"Shared with others" : "Partagés avec d'autres",
"Shared by link" : "Partagés par lien",
+ "Federated sharing" : "Federated sharing",
"Nothing shared with you yet" : "Aucun fichier n'est partagé avec vous pour l'instant",
"Files and folders others share with you will show up here" : "Les fichiers et dossiers partagés avec vous apparaîtront ici",
"Nothing shared yet" : "Rien n'est partagé pour l'instant",
@@ -36,21 +37,39 @@
"Public shared folder %1$s was downloaded" : "Le dossier public %1$s a été téléchargé",
"Public shared file %1$s was downloaded" : "Le fichier public %1$s a été téléchargé",
"You shared %1$s with %2$s" : "Vous avez partagé %1$s avec %2$s",
- "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s",
"%2$s shared %1$s with %3$s" : "%2$s a partagé %1$s avec %3$s",
+ "You removed the share of %2$s for %1$s" : "Vous avez supprimé le partage de %2$s pour %1$s",
+ "%2$s removed the share of %3$s for %1$s" : "%2$s a supprimé votre partage de %3$s pour %1$s",
+ "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s",
+ "You removed the share of group %2$s for %1$s" : "Vous avez supprimé le partage du groupe %2$s pour %1$s",
+ "%2$s removed the share of group %3$s for %1$s" : "%2$s a supprimé le partage du groupe %3$s pour %1$s",
"%2$s shared %1$s via link" : "%2$s a partagé %1$s par lien",
- "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
"You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
+ "You removed the public link for %1$s" : "Vous avez supprimé le lien public pour %1$s",
+ "%2$s removed the public link for %1$s" : "%2$s a supprimé le lien public pour %1$s",
+ "Your public link for %1$s expired" : "Le lien public pour %1$s a expiré",
+ "The public link of %2$s for %1$s expired" : "Le lien public de %2$s pour %1$s a expiré",
+ "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
+ "%2$s removed the share for %1$s" : "%2$s a supprimé le partage pour %1$s",
"Downloaded via public link" : "Téléchargé par lien public",
"Shared with %2$s" : "Partagé avec %2$s",
- "Shared with group %2$s" : "Partagé avec le groupe %2$s",
"Shared with %3$s by %2$s" : "Partagé avec %3$s par %2$s",
+ "Removed share for %2$s" : "Partage supprimé pour %2$s",
+ "%2$s removed share for %3$s" : "%2$s a supprimé le partage pour %3$s",
+ "Shared with group %2$s" : "Partagé avec le groupe %2$s",
"Shared with group %3$s by %2$s" : "Partagé avec le groupe %3$s par %2$s",
+ "Removed share of group %2$s" : "Partage supprimé du groupe %2$s",
+ "%2$s removed share of group %3$s" : "%2$s a supprimé le partage du groupe %3$s",
"Shared via link by %2$s" : "Partagé via lien par %2$s",
- "Shared by %2$s" : "Partagé par %2$s",
"Shared via public link" : "Partagé par lien public",
+ "Removed public link" : "Lien public supprimé",
+ "%2$s removed public link" : "%2$s a supprimé le lien public",
+ "Public link expired" : "Lien public expiré",
+ "Public link of %2$s expired" : "Le lien public de %2$s a expiré",
+ "Shared by %2$s" : "Partagé par %2$s",
"Shares" : "Partages",
+ "You received \"/%2$s\" as a remote share from %1$s" : "L'utilisateur %1$s a partagé la ressource distante %2$s avec vous",
"Accept" : "Accepter",
"Decline" : "Refuser",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s",
diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js
index f2a2d528ffc..7d4028f0bad 100644
--- a/apps/files_sharing/l10n/gl.js
+++ b/apps/files_sharing/l10n/gl.js
@@ -38,8 +38,8 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Foi descargado o ficheiro público %1$s",
"You shared %1$s with %2$s" : "Compartiu %1$s con %2$s",
"You shared %1$s with group %2$s" : "Compartiu %1$s co grupo %2$s",
- "%2$s shared %1$s with you" : "%2$s compartiu %1$s con vostede",
"You shared %1$s via link" : "Vostede compartiu %1$s mediante ligazón",
+ "%2$s shared %1$s with you" : "%2$s compartiu %1$s con vostede",
"Shares" : "Comparticións",
"Accept" : "Aceptar",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Comparte comigo a través do meu ID da nube federada do #ownCloud , vexa %s",
diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json
index b9998a47a12..a6aa34d14cb 100644
--- a/apps/files_sharing/l10n/gl.json
+++ b/apps/files_sharing/l10n/gl.json
@@ -36,8 +36,8 @@
"Public shared file %1$s was downloaded" : "Foi descargado o ficheiro público %1$s",
"You shared %1$s with %2$s" : "Compartiu %1$s con %2$s",
"You shared %1$s with group %2$s" : "Compartiu %1$s co grupo %2$s",
- "%2$s shared %1$s with you" : "%2$s compartiu %1$s con vostede",
"You shared %1$s via link" : "Vostede compartiu %1$s mediante ligazón",
+ "%2$s shared %1$s with you" : "%2$s compartiu %1$s con vostede",
"Shares" : "Comparticións",
"Accept" : "Aceptar",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Comparte comigo a través do meu ID da nube federada do #ownCloud , vexa %s",
diff --git a/apps/files_sharing/l10n/he.js b/apps/files_sharing/l10n/he.js
index 81f09e347d1..b0be1d34c97 100644
--- a/apps/files_sharing/l10n/he.js
+++ b/apps/files_sharing/l10n/he.js
@@ -11,6 +11,7 @@ OC.L10N.register(
"Shared with you" : "שיתף/שיתפה אתך",
"Shared with others" : "משותף עם אחרים",
"Shared by link" : "משותף עם קישור",
+ "Federated sharing" : "שיתוף מאוגד",
"Nothing shared with you yet" : "עדיין לא שיתפו אתך דבר",
"Files and folders others share with you will show up here" : "קבצים ותיקיות שאחרים שיתפו אתך יוצגו כאן",
"Nothing shared yet" : "עדיין לא שותף דבר",
@@ -38,21 +39,39 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "תיקיית שיתוף ציבורית %1$s הורדה",
"Public shared file %1$s was downloaded" : "קובץ שיתוף ציבורי %1$s הורד",
"You shared %1$s with %2$s" : "שיתפת %1$s עם %2$s",
- "You shared %1$s with group %2$s" : "שיתפת %1$s עם קבוצת %2$s",
"%2$s shared %1$s with %3$s" : "%2$s שיתף/שיתפה %1$s עם %3$s",
+ "You removed the share of %2$s for %1$s" : "הסרת את השיתוף של %2$s עבור %1$s",
+ "%2$s removed the share of %3$s for %1$s" : "%2$s הסיר/ה את השיתוף של %3$s עבור %1$s",
+ "You shared %1$s with group %2$s" : "שיתפת %1$s עם קבוצת %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s שיתף/שיתפה %1$s עם קבוצה %3$s",
+ "You removed the share of group %2$s for %1$s" : "הסרת את השיתוף לקבוצה %2$s עבור %1$s",
+ "%2$s removed the share of group %3$s for %1$s" : "%2$s הסיר/ה את השיתוף לקבוצה %3$s עבור %1$s",
"%2$s shared %1$s via link" : "%2$s שיתף/שיתפה %1$s על ידי קישור",
- "%2$s shared %1$s with you" : "%2$s שיתפו %1$s אתך",
"You shared %1$s via link" : "שיתפת %1$s על בסיס קישור",
+ "You removed the public link for %1$s" : "הסרת את הקישור הציבורי של %1$s",
+ "%2$s removed the public link for %1$s" : "%2$s הסיר/ה את הקישור הציבורי של %1$s",
+ "Your public link for %1$s expired" : "הקישור הציבורי של %1$s פג תוקף",
+ "The public link of %2$s for %1$s expired" : "הקישור הציבורי של %2$s עבור %1$s פג תוקף",
+ "%2$s shared %1$s with you" : "%2$s שיתפו %1$s אתך",
+ "%2$s removed the share for %1$s" : "%2$s הסיר/ה את השיתוף של %1$s",
"Downloaded via public link" : "הורד על בסיס קישור ציבורי",
"Shared with %2$s" : "שיתף/שיתפה עם %2$s",
- "Shared with group %2$s" : "שיתף/שיתפה עם קבוצה %2$s",
"Shared with %3$s by %2$s" : "שיתף/שיתפה עם %3$s על ידי %2$s",
+ "Removed share for %2$s" : "הסיר/ה שיתוף של %2$s",
+ "%2$s removed share for %3$s" : "%2$s הסיר/ה שיתוף של %3$s",
+ "Shared with group %2$s" : "שיתף/שיתפה עם קבוצה %2$s",
"Shared with group %3$s by %2$s" : "שיתף/שיתפה עם קבוצה %3$s על ידי %2$s",
+ "Removed share of group %2$s" : "הסיר/ה שיתוף של קבוצה %2$s",
+ "%2$s removed share of group %3$s" : "%2$s הסיר/ה שיתוף של קבוצה %3$s",
"Shared via link by %2$s" : "שיתף/שיתפה על בסיס קישור על ידי %2$s",
- "Shared by %2$s" : "שיתף/שיתפה על ידי %2$s",
"Shared via public link" : "משותף על בסיס קישור ציבורי",
+ "Removed public link" : "הסיר/ה קישור ציבורי",
+ "%2$s removed public link" : "%2$s הסיר/ה קישור ציבורי",
+ "Public link expired" : "קישור ציבורי פג תוקף",
+ "Public link of %2$s expired" : "קישור ציבורי של %2$s פג תוקף",
+ "Shared by %2$s" : "שיתף/שיתפה על ידי %2$s",
"Shares" : "שיתופים",
+ "You received \"/%2$s\" as a remote share from %1$s" : "קבלת \"/%2$s\" כשיתוף חיצוני מאת %1$s",
"Accept" : "אישור",
"Decline" : "סירוב",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "שיתוף איתי באמצעות מספר זהות שרת ה- #ownCloud המאוגד שלי, ניתן לראות %s",
diff --git a/apps/files_sharing/l10n/he.json b/apps/files_sharing/l10n/he.json
index 14e0ec5524b..de1cfff07b5 100644
--- a/apps/files_sharing/l10n/he.json
+++ b/apps/files_sharing/l10n/he.json
@@ -9,6 +9,7 @@
"Shared with you" : "שיתף/שיתפה אתך",
"Shared with others" : "משותף עם אחרים",
"Shared by link" : "משותף עם קישור",
+ "Federated sharing" : "שיתוף מאוגד",
"Nothing shared with you yet" : "עדיין לא שיתפו אתך דבר",
"Files and folders others share with you will show up here" : "קבצים ותיקיות שאחרים שיתפו אתך יוצגו כאן",
"Nothing shared yet" : "עדיין לא שותף דבר",
@@ -36,21 +37,39 @@
"Public shared folder %1$s was downloaded" : "תיקיית שיתוף ציבורית %1$s הורדה",
"Public shared file %1$s was downloaded" : "קובץ שיתוף ציבורי %1$s הורד",
"You shared %1$s with %2$s" : "שיתפת %1$s עם %2$s",
- "You shared %1$s with group %2$s" : "שיתפת %1$s עם קבוצת %2$s",
"%2$s shared %1$s with %3$s" : "%2$s שיתף/שיתפה %1$s עם %3$s",
+ "You removed the share of %2$s for %1$s" : "הסרת את השיתוף של %2$s עבור %1$s",
+ "%2$s removed the share of %3$s for %1$s" : "%2$s הסיר/ה את השיתוף של %3$s עבור %1$s",
+ "You shared %1$s with group %2$s" : "שיתפת %1$s עם קבוצת %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s שיתף/שיתפה %1$s עם קבוצה %3$s",
+ "You removed the share of group %2$s for %1$s" : "הסרת את השיתוף לקבוצה %2$s עבור %1$s",
+ "%2$s removed the share of group %3$s for %1$s" : "%2$s הסיר/ה את השיתוף לקבוצה %3$s עבור %1$s",
"%2$s shared %1$s via link" : "%2$s שיתף/שיתפה %1$s על ידי קישור",
- "%2$s shared %1$s with you" : "%2$s שיתפו %1$s אתך",
"You shared %1$s via link" : "שיתפת %1$s על בסיס קישור",
+ "You removed the public link for %1$s" : "הסרת את הקישור הציבורי של %1$s",
+ "%2$s removed the public link for %1$s" : "%2$s הסיר/ה את הקישור הציבורי של %1$s",
+ "Your public link for %1$s expired" : "הקישור הציבורי של %1$s פג תוקף",
+ "The public link of %2$s for %1$s expired" : "הקישור הציבורי של %2$s עבור %1$s פג תוקף",
+ "%2$s shared %1$s with you" : "%2$s שיתפו %1$s אתך",
+ "%2$s removed the share for %1$s" : "%2$s הסיר/ה את השיתוף של %1$s",
"Downloaded via public link" : "הורד על בסיס קישור ציבורי",
"Shared with %2$s" : "שיתף/שיתפה עם %2$s",
- "Shared with group %2$s" : "שיתף/שיתפה עם קבוצה %2$s",
"Shared with %3$s by %2$s" : "שיתף/שיתפה עם %3$s על ידי %2$s",
+ "Removed share for %2$s" : "הסיר/ה שיתוף של %2$s",
+ "%2$s removed share for %3$s" : "%2$s הסיר/ה שיתוף של %3$s",
+ "Shared with group %2$s" : "שיתף/שיתפה עם קבוצה %2$s",
"Shared with group %3$s by %2$s" : "שיתף/שיתפה עם קבוצה %3$s על ידי %2$s",
+ "Removed share of group %2$s" : "הסיר/ה שיתוף של קבוצה %2$s",
+ "%2$s removed share of group %3$s" : "%2$s הסיר/ה שיתוף של קבוצה %3$s",
"Shared via link by %2$s" : "שיתף/שיתפה על בסיס קישור על ידי %2$s",
- "Shared by %2$s" : "שיתף/שיתפה על ידי %2$s",
"Shared via public link" : "משותף על בסיס קישור ציבורי",
+ "Removed public link" : "הסיר/ה קישור ציבורי",
+ "%2$s removed public link" : "%2$s הסיר/ה קישור ציבורי",
+ "Public link expired" : "קישור ציבורי פג תוקף",
+ "Public link of %2$s expired" : "קישור ציבורי של %2$s פג תוקף",
+ "Shared by %2$s" : "שיתף/שיתפה על ידי %2$s",
"Shares" : "שיתופים",
+ "You received \"/%2$s\" as a remote share from %1$s" : "קבלת \"/%2$s\" כשיתוף חיצוני מאת %1$s",
"Accept" : "אישור",
"Decline" : "סירוב",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "שיתוף איתי באמצעות מספר זהות שרת ה- #ownCloud המאוגד שלי, ניתן לראות %s",
diff --git a/apps/files_sharing/l10n/hr.js b/apps/files_sharing/l10n/hr.js
index 63090dd4e4e..9016c589e9f 100644
--- a/apps/files_sharing/l10n/hr.js
+++ b/apps/files_sharing/l10n/hr.js
@@ -18,8 +18,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "Datoteka ili mapa su <strong>podijeljeni</strong>",
"You shared %1$s with %2$s" : "Podijelili ste %1$s s %2$s",
"You shared %1$s with group %2$s" : "Podijelili ste %1$s s grupom %2$s",
- "%2$s shared %1$s with you" : "%2$s je %1$s podijelio s vama",
"You shared %1$s via link" : "Podijelili ste %1$s putem veze",
+ "%2$s shared %1$s with you" : "%2$s je %1$s podijelio s vama",
"Shares" : "Dijeljeni resursi",
"This share is password-protected" : "Ovaj zajednički resurs je zaštićen lozinkom",
"The password is wrong. Try again." : "Pogrešna lozinka. Pokušajte ponovno.",
diff --git a/apps/files_sharing/l10n/hr.json b/apps/files_sharing/l10n/hr.json
index dd5fa0489fb..b9505667312 100644
--- a/apps/files_sharing/l10n/hr.json
+++ b/apps/files_sharing/l10n/hr.json
@@ -16,8 +16,8 @@
"A file or folder has been <strong>shared</strong>" : "Datoteka ili mapa su <strong>podijeljeni</strong>",
"You shared %1$s with %2$s" : "Podijelili ste %1$s s %2$s",
"You shared %1$s with group %2$s" : "Podijelili ste %1$s s grupom %2$s",
- "%2$s shared %1$s with you" : "%2$s je %1$s podijelio s vama",
"You shared %1$s via link" : "Podijelili ste %1$s putem veze",
+ "%2$s shared %1$s with you" : "%2$s je %1$s podijelio s vama",
"Shares" : "Dijeljeni resursi",
"This share is password-protected" : "Ovaj zajednički resurs je zaštićen lozinkom",
"The password is wrong. Try again." : "Pogrešna lozinka. Pokušajte ponovno.",
diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js
index 3380587df02..aee9a893a19 100644
--- a/apps/files_sharing/l10n/hu_HU.js
+++ b/apps/files_sharing/l10n/hu_HU.js
@@ -38,20 +38,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Nyilvánosan megosztott könyvtár %1$s le lett töltve",
"Public shared file %1$s was downloaded" : "Nyilvánosan megosztott fálj %1$s le lett töltve",
"You shared %1$s with %2$s" : "%1$s-t megosztottam ővele: %2$s",
- "You shared %1$s with group %2$s" : "%1$s-t megosztottam ezzel a csoporttal: %2$s",
"%2$s shared %1$s with %3$s" : "%2$s megosztotta ezt: %1$s, ővele: %3$s",
+ "You shared %1$s with group %2$s" : "%1$s-t megosztottam ezzel a csoporttal: %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s megosztotta ezt: %1$s, ezzel a csoporttal: %3$s",
"%2$s shared %1$s via link" : "%2$s megosztotta ezt: %1$s, hivatkozással",
- "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
"You shared %1$s via link" : "Megosztottam link segítségével: %1$s",
+ "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
"Downloaded via public link" : "Letöltve publikus hivatkozással",
"Shared with %2$s" : "Megosztva vele: %2$s",
- "Shared with group %2$s" : "Megosztva ezzel a csoporttal: %2$s",
"Shared with %3$s by %2$s" : "Megosztva vele: %3$s, megosztó: %2$s",
+ "Shared with group %2$s" : "Megosztva ezzel a csoporttal: %2$s",
"Shared with group %3$s by %2$s" : "Megosztva ezzel a csoporttal: %3$s, megosztó: %2$s",
"Shared via link by %2$s" : "Megosztva hivatkozással: %2$s",
- "Shared by %2$s" : "Megosztó: %2$s",
"Shared via public link" : "Megosztva publikus hivatkozással",
+ "Shared by %2$s" : "Megosztó: %2$s",
"Shares" : "Megosztások",
"Accept" : "Elfogadás",
"Decline" : "Elutasítás",
diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json
index b647c64e348..a91d017d0fd 100644
--- a/apps/files_sharing/l10n/hu_HU.json
+++ b/apps/files_sharing/l10n/hu_HU.json
@@ -36,20 +36,20 @@
"Public shared folder %1$s was downloaded" : "Nyilvánosan megosztott könyvtár %1$s le lett töltve",
"Public shared file %1$s was downloaded" : "Nyilvánosan megosztott fálj %1$s le lett töltve",
"You shared %1$s with %2$s" : "%1$s-t megosztottam ővele: %2$s",
- "You shared %1$s with group %2$s" : "%1$s-t megosztottam ezzel a csoporttal: %2$s",
"%2$s shared %1$s with %3$s" : "%2$s megosztotta ezt: %1$s, ővele: %3$s",
+ "You shared %1$s with group %2$s" : "%1$s-t megosztottam ezzel a csoporttal: %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s megosztotta ezt: %1$s, ezzel a csoporttal: %3$s",
"%2$s shared %1$s via link" : "%2$s megosztotta ezt: %1$s, hivatkozással",
- "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
"You shared %1$s via link" : "Megosztottam link segítségével: %1$s",
+ "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
"Downloaded via public link" : "Letöltve publikus hivatkozással",
"Shared with %2$s" : "Megosztva vele: %2$s",
- "Shared with group %2$s" : "Megosztva ezzel a csoporttal: %2$s",
"Shared with %3$s by %2$s" : "Megosztva vele: %3$s, megosztó: %2$s",
+ "Shared with group %2$s" : "Megosztva ezzel a csoporttal: %2$s",
"Shared with group %3$s by %2$s" : "Megosztva ezzel a csoporttal: %3$s, megosztó: %2$s",
"Shared via link by %2$s" : "Megosztva hivatkozással: %2$s",
- "Shared by %2$s" : "Megosztó: %2$s",
"Shared via public link" : "Megosztva publikus hivatkozással",
+ "Shared by %2$s" : "Megosztó: %2$s",
"Shares" : "Megosztások",
"Accept" : "Elfogadás",
"Decline" : "Elutasítás",
diff --git a/apps/files_sharing/l10n/ia.js b/apps/files_sharing/l10n/ia.js
index 43b103e272f..8e6401b8835 100644
--- a/apps/files_sharing/l10n/ia.js
+++ b/apps/files_sharing/l10n/ia.js
@@ -5,8 +5,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "Un file o un dossier ha essite <strong>compartite</strong>",
"You shared %1$s with %2$s" : "Tu compartiva %1$s con %2$s",
"You shared %1$s with group %2$s" : "Tu compartiva %1$s con gruppo %2$s",
- "%2$s shared %1$s with you" : "%2$s compartiva %1$s con te",
"You shared %1$s via link" : "Tu compartiva %1$s via ligamine",
+ "%2$s shared %1$s with you" : "%2$s compartiva %1$s con te",
"Shares" : "Comparti",
"Password" : "Contrasigno",
"Name" : "Nomine",
diff --git a/apps/files_sharing/l10n/ia.json b/apps/files_sharing/l10n/ia.json
index 64bda72c7d2..e5efb202155 100644
--- a/apps/files_sharing/l10n/ia.json
+++ b/apps/files_sharing/l10n/ia.json
@@ -3,8 +3,8 @@
"A file or folder has been <strong>shared</strong>" : "Un file o un dossier ha essite <strong>compartite</strong>",
"You shared %1$s with %2$s" : "Tu compartiva %1$s con %2$s",
"You shared %1$s with group %2$s" : "Tu compartiva %1$s con gruppo %2$s",
- "%2$s shared %1$s with you" : "%2$s compartiva %1$s con te",
"You shared %1$s via link" : "Tu compartiva %1$s via ligamine",
+ "%2$s shared %1$s with you" : "%2$s compartiva %1$s con te",
"Shares" : "Comparti",
"Password" : "Contrasigno",
"Name" : "Nomine",
diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js
index a376ff5949b..837c0cfa843 100644
--- a/apps/files_sharing/l10n/id.js
+++ b/apps/files_sharing/l10n/id.js
@@ -37,20 +37,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Folder berbagi publik %1$s telah diunduh",
"Public shared file %1$s was downloaded" : "Berkas berbagi publik %1$s telah diunduh",
"You shared %1$s with %2$s" : "Anda membagikan %1$s dengan %2$s",
- "You shared %1$s with group %2$s" : "Anda membagikan %1$s dengan grup %2$s",
"%2$s shared %1$s with %3$s" : "%2$s berbagi %1$s kepada %3$s",
+ "You shared %1$s with group %2$s" : "Anda membagikan %1$s dengan grup %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s berbagi %1$s kepada grup %3$s",
"%2$s shared %1$s via link" : "%2$s berbagi %1$s via tautan",
- "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
"You shared %1$s via link" : "Anda membagikan %1$s via tautan",
+ "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
"Downloaded via public link" : "Diunduh via tautan publik",
"Shared with %2$s" : "Dibagikan kepada %2$s",
- "Shared with group %2$s" : "Dibagikan kepada grup %2$s",
"Shared with %3$s by %2$s" : "Dibagikan kepada %3$s oleh %2$s",
+ "Shared with group %2$s" : "Dibagikan kepada grup %2$s",
"Shared with group %3$s by %2$s" : "Dibagikan kepada grup %3$s oleh %2$s",
"Shared via link by %2$s" : "Dibagikan via tautan oleh %2$s",
- "Shared by %2$s" : "Dibagikan oleh %2$s",
"Shared via public link" : "Dibagikan via tautan publik",
+ "Shared by %2$s" : "Dibagikan oleh %2$s",
"Shares" : "Dibagikan",
"Accept" : "Terima",
"Decline" : "Tolak",
diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json
index 46fabf27329..40789ec9355 100644
--- a/apps/files_sharing/l10n/id.json
+++ b/apps/files_sharing/l10n/id.json
@@ -35,20 +35,20 @@
"Public shared folder %1$s was downloaded" : "Folder berbagi publik %1$s telah diunduh",
"Public shared file %1$s was downloaded" : "Berkas berbagi publik %1$s telah diunduh",
"You shared %1$s with %2$s" : "Anda membagikan %1$s dengan %2$s",
- "You shared %1$s with group %2$s" : "Anda membagikan %1$s dengan grup %2$s",
"%2$s shared %1$s with %3$s" : "%2$s berbagi %1$s kepada %3$s",
+ "You shared %1$s with group %2$s" : "Anda membagikan %1$s dengan grup %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s berbagi %1$s kepada grup %3$s",
"%2$s shared %1$s via link" : "%2$s berbagi %1$s via tautan",
- "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
"You shared %1$s via link" : "Anda membagikan %1$s via tautan",
+ "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
"Downloaded via public link" : "Diunduh via tautan publik",
"Shared with %2$s" : "Dibagikan kepada %2$s",
- "Shared with group %2$s" : "Dibagikan kepada grup %2$s",
"Shared with %3$s by %2$s" : "Dibagikan kepada %3$s oleh %2$s",
+ "Shared with group %2$s" : "Dibagikan kepada grup %2$s",
"Shared with group %3$s by %2$s" : "Dibagikan kepada grup %3$s oleh %2$s",
"Shared via link by %2$s" : "Dibagikan via tautan oleh %2$s",
- "Shared by %2$s" : "Dibagikan oleh %2$s",
"Shared via public link" : "Dibagikan via tautan publik",
+ "Shared by %2$s" : "Dibagikan oleh %2$s",
"Shares" : "Dibagikan",
"Accept" : "Terima",
"Decline" : "Tolak",
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index 8b86a19021c..93adc336604 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -11,6 +11,7 @@ OC.L10N.register(
"Shared with you" : "Condivisi con te",
"Shared with others" : "Condivisi con altri",
"Shared by link" : "Condivisi tramite collegamento",
+ "Federated sharing" : "Condivisione federata",
"Nothing shared with you yet" : "Non è stato condiviso ancora niente con te",
"Files and folders others share with you will show up here" : "I file e le cartelle che altri condividono con te saranno mostrati qui",
"Nothing shared yet" : "Ancora nessuna condivisione",
@@ -38,21 +39,39 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "La cartella condivisa pubblicamente %1$s è stata scaricata",
"Public shared file %1$s was downloaded" : "Il file condiviso pubblicamente %1$s è stato scaricato",
"You shared %1$s with %2$s" : "Hai condiviso %1$s con %2$s",
- "You shared %1$s with group %2$s" : "Hai condiviso %1$s con il gruppo %2$s",
"%2$s shared %1$s with %3$s" : "%2$s ha condiviso %1$s con %3$s",
+ "You removed the share of %2$s for %1$s" : "Hai rimosso la condivisione di %2$s per %1$s",
+ "%2$s removed the share of %3$s for %1$s" : "%2$s ha rimosso la condivisione di %3$s per %1$s",
+ "You shared %1$s with group %2$s" : "Hai condiviso %1$s con il gruppo %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s ha condiviso %1$s con il gruppo %3$s",
+ "You removed the share of group %2$s for %1$s" : "Hai rimosso la condivisione del gruppo %2$s per %1$s",
+ "%2$s removed the share of group %3$s for %1$s" : "%2$s ha rimosso la condivisione del gruppo %3$s per %1$s",
"%2$s shared %1$s via link" : "%2$s ha condiviso %1$s tramite collegamento",
- "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
"You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
+ "You removed the public link for %1$s" : "Hai rimosso il collegamento pubblico per %1$s",
+ "%2$s removed the public link for %1$s" : "%2$s ha rimosso il collegamento pubblico per %1$s",
+ "Your public link for %1$s expired" : "il tuo collegamento pubblico per %1$s è scaduto",
+ "The public link of %2$s for %1$s expired" : "il collegamento pubblico di %2$s per %1$s è scaduto",
+ "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
+ "%2$s removed the share for %1$s" : "%2$s ha rimosso la condivisione per %1$s",
"Downloaded via public link" : "Scaricata tramite collegamento pubblico",
"Shared with %2$s" : "Condivisa con %2$s",
- "Shared with group %2$s" : "Condivisa con il gruppo %2$s",
"Shared with %3$s by %2$s" : "Condivisa con %3$s da %2$s",
+ "Removed share for %2$s" : "Condivisione rimossa per %2$s",
+ "%2$s removed share for %3$s" : "%2$s ha rimosso la condivisione per %3$s",
+ "Shared with group %2$s" : "Condivisa con il gruppo %2$s",
"Shared with group %3$s by %2$s" : "Condivisa con il gruppo %3$s da %2$s",
+ "Removed share of group %2$s" : "Condivisione rimossa del gruppo %2$s",
+ "%2$s removed share of group %3$s" : "%2$s ha rimosso la condivisione del gruppo %3$s",
"Shared via link by %2$s" : "Condivisa tramite collegamento da %2$s",
- "Shared by %2$s" : "Condivisa da %2$s",
"Shared via public link" : "Condivisa tramite collegamento pubblico",
+ "Removed public link" : "Collegamento pubblico rimosso",
+ "%2$s removed public link" : "%2$s ha rimosso il collegamento pubblico",
+ "Public link expired" : "Collegamento pubblico scaduto",
+ "Public link of %2$s expired" : "il collegamento pubblico di %2$s è scaduto",
+ "Shared by %2$s" : "Condivisa da %2$s",
"Shares" : "Condivisioni",
+ "You received \"/%2$s\" as a remote share from %1$s" : "Hai ricevuto \"/%2$s\" come condivisione remota da %1$s",
"Accept" : "Accetta",
"Decline" : "Rifiuta",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index b924c9c080b..d95f35be0a9 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -9,6 +9,7 @@
"Shared with you" : "Condivisi con te",
"Shared with others" : "Condivisi con altri",
"Shared by link" : "Condivisi tramite collegamento",
+ "Federated sharing" : "Condivisione federata",
"Nothing shared with you yet" : "Non è stato condiviso ancora niente con te",
"Files and folders others share with you will show up here" : "I file e le cartelle che altri condividono con te saranno mostrati qui",
"Nothing shared yet" : "Ancora nessuna condivisione",
@@ -36,21 +37,39 @@
"Public shared folder %1$s was downloaded" : "La cartella condivisa pubblicamente %1$s è stata scaricata",
"Public shared file %1$s was downloaded" : "Il file condiviso pubblicamente %1$s è stato scaricato",
"You shared %1$s with %2$s" : "Hai condiviso %1$s con %2$s",
- "You shared %1$s with group %2$s" : "Hai condiviso %1$s con il gruppo %2$s",
"%2$s shared %1$s with %3$s" : "%2$s ha condiviso %1$s con %3$s",
+ "You removed the share of %2$s for %1$s" : "Hai rimosso la condivisione di %2$s per %1$s",
+ "%2$s removed the share of %3$s for %1$s" : "%2$s ha rimosso la condivisione di %3$s per %1$s",
+ "You shared %1$s with group %2$s" : "Hai condiviso %1$s con il gruppo %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s ha condiviso %1$s con il gruppo %3$s",
+ "You removed the share of group %2$s for %1$s" : "Hai rimosso la condivisione del gruppo %2$s per %1$s",
+ "%2$s removed the share of group %3$s for %1$s" : "%2$s ha rimosso la condivisione del gruppo %3$s per %1$s",
"%2$s shared %1$s via link" : "%2$s ha condiviso %1$s tramite collegamento",
- "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
"You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
+ "You removed the public link for %1$s" : "Hai rimosso il collegamento pubblico per %1$s",
+ "%2$s removed the public link for %1$s" : "%2$s ha rimosso il collegamento pubblico per %1$s",
+ "Your public link for %1$s expired" : "il tuo collegamento pubblico per %1$s è scaduto",
+ "The public link of %2$s for %1$s expired" : "il collegamento pubblico di %2$s per %1$s è scaduto",
+ "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
+ "%2$s removed the share for %1$s" : "%2$s ha rimosso la condivisione per %1$s",
"Downloaded via public link" : "Scaricata tramite collegamento pubblico",
"Shared with %2$s" : "Condivisa con %2$s",
- "Shared with group %2$s" : "Condivisa con il gruppo %2$s",
"Shared with %3$s by %2$s" : "Condivisa con %3$s da %2$s",
+ "Removed share for %2$s" : "Condivisione rimossa per %2$s",
+ "%2$s removed share for %3$s" : "%2$s ha rimosso la condivisione per %3$s",
+ "Shared with group %2$s" : "Condivisa con il gruppo %2$s",
"Shared with group %3$s by %2$s" : "Condivisa con il gruppo %3$s da %2$s",
+ "Removed share of group %2$s" : "Condivisione rimossa del gruppo %2$s",
+ "%2$s removed share of group %3$s" : "%2$s ha rimosso la condivisione del gruppo %3$s",
"Shared via link by %2$s" : "Condivisa tramite collegamento da %2$s",
- "Shared by %2$s" : "Condivisa da %2$s",
"Shared via public link" : "Condivisa tramite collegamento pubblico",
+ "Removed public link" : "Collegamento pubblico rimosso",
+ "%2$s removed public link" : "%2$s ha rimosso il collegamento pubblico",
+ "Public link expired" : "Collegamento pubblico scaduto",
+ "Public link of %2$s expired" : "il collegamento pubblico di %2$s è scaduto",
+ "Shared by %2$s" : "Condivisa da %2$s",
"Shares" : "Condivisioni",
+ "You received \"/%2$s\" as a remote share from %1$s" : "Hai ricevuto \"/%2$s\" come condivisione remota da %1$s",
"Accept" : "Accetta",
"Decline" : "Rifiuta",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js
index f01543e5dcf..7c121ca1997 100644
--- a/apps/files_sharing/l10n/ja.js
+++ b/apps/files_sharing/l10n/ja.js
@@ -38,20 +38,25 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "公開共有フォルダー %1$s がダウンロードされました",
"Public shared file %1$s was downloaded" : "公開共有ファイル %1$s がダウンロードされました",
"You shared %1$s with %2$s" : "あなたは %1$s を %2$s と共有しました",
- "You shared %1$s with group %2$s" : "あなたは %1$s をグループ %2$s と共有しました",
"%2$s shared %1$s with %3$s" : "%2$s は %1$s を %3$s と共有しました",
+ "You removed the share of %2$s for %1$s" : "%1$sとの%2$sの共有を削除しました",
+ "%2$s removed the share of %3$s for %1$s" : "%2$sは%1$sとの%3$sの共有を削除しました",
+ "You shared %1$s with group %2$s" : "あなたは %1$s をグループ %2$s と共有しました",
"%2$s shared %1$s with group %3$s" : "%2$s は %1$s をグループ %3$s と共有しました",
+ "You removed the share of group %2$s for %1$s" : "%1$sとのグループ%2$sの共有を削除しました",
"%2$s shared %1$s via link" : "%2$s はリンク経由で %1$s を共有しました",
- "%2$s shared %1$s with you" : "%2$s は %1$s をあなたと共有しました",
"You shared %1$s via link" : "リンク経由で %1$s を共有しています",
+ "The public link of %2$s for %1$s expired" : "%1$sへの公開リンク%2$sの期限が切れました",
+ "%2$s shared %1$s with you" : "%2$s は %1$s をあなたと共有しました",
"Downloaded via public link" : "公開リンクからダウンロードしました",
"Shared with %2$s" : "%2$s と共有しました",
- "Shared with group %2$s" : "%2$s グループと共有しました",
"Shared with %3$s by %2$s" : "%3$s と %2$s で共有しました",
+ "Removed share for %2$s" : " %2$sとの共有を削除しました",
+ "Shared with group %2$s" : "%2$s グループと共有しました",
"Shared with group %3$s by %2$s" : "%3$s グループと %2$s で共有しました",
"Shared via link by %2$s" : "リンク経由で %2$s が共有しました",
- "Shared by %2$s" : "%2$s が共有",
"Shared via public link" : "公開リンク経由で共有中",
+ "Shared by %2$s" : "%2$s が共有",
"Shares" : "共有",
"Accept" : "承諾",
"Decline" : "拒否《はてなキーワード》",
diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json
index 2a605d3a3e8..5bb3a9ccbd9 100644
--- a/apps/files_sharing/l10n/ja.json
+++ b/apps/files_sharing/l10n/ja.json
@@ -36,20 +36,25 @@
"Public shared folder %1$s was downloaded" : "公開共有フォルダー %1$s がダウンロードされました",
"Public shared file %1$s was downloaded" : "公開共有ファイル %1$s がダウンロードされました",
"You shared %1$s with %2$s" : "あなたは %1$s を %2$s と共有しました",
- "You shared %1$s with group %2$s" : "あなたは %1$s をグループ %2$s と共有しました",
"%2$s shared %1$s with %3$s" : "%2$s は %1$s を %3$s と共有しました",
+ "You removed the share of %2$s for %1$s" : "%1$sとの%2$sの共有を削除しました",
+ "%2$s removed the share of %3$s for %1$s" : "%2$sは%1$sとの%3$sの共有を削除しました",
+ "You shared %1$s with group %2$s" : "あなたは %1$s をグループ %2$s と共有しました",
"%2$s shared %1$s with group %3$s" : "%2$s は %1$s をグループ %3$s と共有しました",
+ "You removed the share of group %2$s for %1$s" : "%1$sとのグループ%2$sの共有を削除しました",
"%2$s shared %1$s via link" : "%2$s はリンク経由で %1$s を共有しました",
- "%2$s shared %1$s with you" : "%2$s は %1$s をあなたと共有しました",
"You shared %1$s via link" : "リンク経由で %1$s を共有しています",
+ "The public link of %2$s for %1$s expired" : "%1$sへの公開リンク%2$sの期限が切れました",
+ "%2$s shared %1$s with you" : "%2$s は %1$s をあなたと共有しました",
"Downloaded via public link" : "公開リンクからダウンロードしました",
"Shared with %2$s" : "%2$s と共有しました",
- "Shared with group %2$s" : "%2$s グループと共有しました",
"Shared with %3$s by %2$s" : "%3$s と %2$s で共有しました",
+ "Removed share for %2$s" : " %2$sとの共有を削除しました",
+ "Shared with group %2$s" : "%2$s グループと共有しました",
"Shared with group %3$s by %2$s" : "%3$s グループと %2$s で共有しました",
"Shared via link by %2$s" : "リンク経由で %2$s が共有しました",
- "Shared by %2$s" : "%2$s が共有",
"Shared via public link" : "公開リンク経由で共有中",
+ "Shared by %2$s" : "%2$s が共有",
"Shares" : "共有",
"Accept" : "承諾",
"Decline" : "拒否《はてなキーワード》",
diff --git a/apps/files_sharing/l10n/km.js b/apps/files_sharing/l10n/km.js
index a6066a3a596..d9bcc23c21d 100644
--- a/apps/files_sharing/l10n/km.js
+++ b/apps/files_sharing/l10n/km.js
@@ -7,8 +7,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "<strong>បាន​ចែករំលែក</strong> ឯកសារ​ឬ​ថត",
"You shared %1$s with %2$s" : "អ្នក​បាន​ចែករំលែក %1$s ជាមួយ %2$s",
"You shared %1$s with group %2$s" : "អ្នក​បាន​ចែករំលែក %1$s ជាមួយ​ក្រុម %2$s",
- "%2$s shared %1$s with you" : "%2$s បាន​ចែករំលែក %1$s ជាមួយ​អ្នក",
"You shared %1$s via link" : "អ្នក​បាន​ចែក​រំលែក %1$s តាម​រយៈ​តំណរភ្ជាប់",
+ "%2$s shared %1$s with you" : "%2$s បាន​ចែករំលែក %1$s ជាមួយ​អ្នក",
"Shares" : "ចែក​រំលែក",
"This share is password-protected" : "ការ​ចែករំលែក​នេះ​ត្រូវ​បាន​ការពារ​ដោយ​ពាក្យ​សម្ងាត់",
"The password is wrong. Try again." : "ពាក្យ​សម្ងាត់​ខុស​ហើយ។ ព្យាយាម​ម្ដង​ទៀត។",
diff --git a/apps/files_sharing/l10n/km.json b/apps/files_sharing/l10n/km.json
index a1c84079d73..319203ef946 100644
--- a/apps/files_sharing/l10n/km.json
+++ b/apps/files_sharing/l10n/km.json
@@ -5,8 +5,8 @@
"A file or folder has been <strong>shared</strong>" : "<strong>បាន​ចែករំលែក</strong> ឯកសារ​ឬ​ថត",
"You shared %1$s with %2$s" : "អ្នក​បាន​ចែករំលែក %1$s ជាមួយ %2$s",
"You shared %1$s with group %2$s" : "អ្នក​បាន​ចែករំលែក %1$s ជាមួយ​ក្រុម %2$s",
- "%2$s shared %1$s with you" : "%2$s បាន​ចែករំលែក %1$s ជាមួយ​អ្នក",
"You shared %1$s via link" : "អ្នក​បាន​ចែក​រំលែក %1$s តាម​រយៈ​តំណរភ្ជាប់",
+ "%2$s shared %1$s with you" : "%2$s បាន​ចែករំលែក %1$s ជាមួយ​អ្នក",
"Shares" : "ចែក​រំលែក",
"This share is password-protected" : "ការ​ចែករំលែក​នេះ​ត្រូវ​បាន​ការពារ​ដោយ​ពាក្យ​សម្ងាត់",
"The password is wrong. Try again." : "ពាក្យ​សម្ងាត់​ខុស​ហើយ។ ព្យាយាម​ម្ដង​ទៀត។",
diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js
index 31bbe3646ff..99cdb6bda86 100644
--- a/apps/files_sharing/l10n/ko.js
+++ b/apps/files_sharing/l10n/ko.js
@@ -37,20 +37,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "공개 공유 폴더 %1$s이(가) 다운로드됨",
"Public shared file %1$s was downloaded" : "공개 공유 파일 %1$s이(가) 다운로드됨",
"You shared %1$s with %2$s" : "내가 %2$s 님과 %1$s을(를) 공유함",
- "You shared %1$s with group %2$s" : "내가 %2$s 그룹과 %1$s을(를) 공유함",
"%2$s shared %1$s with %3$s" : "%2$s 님이 %1$s을(를) %3$s 님과 공유함",
+ "You shared %1$s with group %2$s" : "내가 %2$s 그룹과 %1$s을(를) 공유함",
"%2$s shared %1$s with group %3$s" : "%2$s 님이 %1$s을(를) %3$s 그룹과 공유함",
"%2$s shared %1$s via link" : "%2$s 님이 %1$s을(를) 링크로 공유함",
- "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함",
"You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함",
+ "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함",
"Downloaded via public link" : "공개 링크로 다운로드",
"Shared with %2$s" : "%2$s 님과 공유함",
- "Shared with group %2$s" : "%2$s 그룹과 공유함",
"Shared with %3$s by %2$s" : "%2$s 님이 %3$s 님과 공유함",
+ "Shared with group %2$s" : "%2$s 그룹과 공유함",
"Shared with group %3$s by %2$s" : "%2$s 님이 %3$s 그룹과 공유함",
"Shared via link by %2$s" : "%2$s 님이 링크로 공유함",
- "Shared by %2$s" : "%2$s 님이 공유함",
"Shared via public link" : "공개 링크로 공유함",
+ "Shared by %2$s" : "%2$s 님이 공유함",
"Shares" : "공유",
"Accept" : "수락",
"Decline" : "거절",
diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json
index 75a328ddc9a..ad944c69215 100644
--- a/apps/files_sharing/l10n/ko.json
+++ b/apps/files_sharing/l10n/ko.json
@@ -35,20 +35,20 @@
"Public shared folder %1$s was downloaded" : "공개 공유 폴더 %1$s이(가) 다운로드됨",
"Public shared file %1$s was downloaded" : "공개 공유 파일 %1$s이(가) 다운로드됨",
"You shared %1$s with %2$s" : "내가 %2$s 님과 %1$s을(를) 공유함",
- "You shared %1$s with group %2$s" : "내가 %2$s 그룹과 %1$s을(를) 공유함",
"%2$s shared %1$s with %3$s" : "%2$s 님이 %1$s을(를) %3$s 님과 공유함",
+ "You shared %1$s with group %2$s" : "내가 %2$s 그룹과 %1$s을(를) 공유함",
"%2$s shared %1$s with group %3$s" : "%2$s 님이 %1$s을(를) %3$s 그룹과 공유함",
"%2$s shared %1$s via link" : "%2$s 님이 %1$s을(를) 링크로 공유함",
- "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함",
"You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함",
+ "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함",
"Downloaded via public link" : "공개 링크로 다운로드",
"Shared with %2$s" : "%2$s 님과 공유함",
- "Shared with group %2$s" : "%2$s 그룹과 공유함",
"Shared with %3$s by %2$s" : "%2$s 님이 %3$s 님과 공유함",
+ "Shared with group %2$s" : "%2$s 그룹과 공유함",
"Shared with group %3$s by %2$s" : "%2$s 님이 %3$s 그룹과 공유함",
"Shared via link by %2$s" : "%2$s 님이 링크로 공유함",
- "Shared by %2$s" : "%2$s 님이 공유함",
"Shared via public link" : "공개 링크로 공유함",
+ "Shared by %2$s" : "%2$s 님이 공유함",
"Shares" : "공유",
"Accept" : "수락",
"Decline" : "거절",
diff --git a/apps/files_sharing/l10n/lt_LT.js b/apps/files_sharing/l10n/lt_LT.js
index 87410413461..8aa1be493b9 100644
--- a/apps/files_sharing/l10n/lt_LT.js
+++ b/apps/files_sharing/l10n/lt_LT.js
@@ -38,20 +38,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Viešas dalijimosi aplankas %1$s parsiųstas",
"Public shared file %1$s was downloaded" : "Viešai dalinamas failas %1$s parsiųstas",
"You shared %1$s with %2$s" : "Jūs pasidalinote %1$s su %2$s",
- "You shared %1$s with group %2$s" : "Jūs pasidalinote %1$s su grupe %2$s",
"%2$s shared %1$s with %3$s" : "%2$s pasidalino %1$s su %3$s",
+ "You shared %1$s with group %2$s" : "Jūs pasidalinote %1$s su grupe %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s pasidalino %1$s su grupe %3$s",
"%2$s shared %1$s via link" : "%2$s pasidalino %1$s nuoroda",
- "%2$s shared %1$s with you" : "%2$s pasidalino %1$s su jumis",
"You shared %1$s via link" : "Pasidalinote %1$s per nuorodą",
+ "%2$s shared %1$s with you" : "%2$s pasidalino %1$s su jumis",
"Downloaded via public link" : "Atsiųsti per viešą nuorodą",
"Shared with %2$s" : "Pasidalinta su %2$s",
- "Shared with group %2$s" : "Pasidalinta su grupe %2$s",
"Shared with %3$s by %2$s" : "%2$s pasidalino %3$s",
+ "Shared with group %2$s" : "Pasidalinta su grupe %2$s",
"Shared with group %3$s by %2$s" : "%2$s pasidalino su grupe %3$s",
"Shared via link by %2$s" : "%2$s pasidalino nuoroda",
- "Shared by %2$s" : "Pasidalino %2$s",
"Shared via public link" : "Pasidalinta vieša nuoroda",
+ "Shared by %2$s" : "Pasidalino %2$s",
"Shares" : "Dalijimaisi",
"Accept" : "Priimti",
"Decline" : "Atmesti",
diff --git a/apps/files_sharing/l10n/lt_LT.json b/apps/files_sharing/l10n/lt_LT.json
index e19ba5fd100..ef139068832 100644
--- a/apps/files_sharing/l10n/lt_LT.json
+++ b/apps/files_sharing/l10n/lt_LT.json
@@ -36,20 +36,20 @@
"Public shared folder %1$s was downloaded" : "Viešas dalijimosi aplankas %1$s parsiųstas",
"Public shared file %1$s was downloaded" : "Viešai dalinamas failas %1$s parsiųstas",
"You shared %1$s with %2$s" : "Jūs pasidalinote %1$s su %2$s",
- "You shared %1$s with group %2$s" : "Jūs pasidalinote %1$s su grupe %2$s",
"%2$s shared %1$s with %3$s" : "%2$s pasidalino %1$s su %3$s",
+ "You shared %1$s with group %2$s" : "Jūs pasidalinote %1$s su grupe %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s pasidalino %1$s su grupe %3$s",
"%2$s shared %1$s via link" : "%2$s pasidalino %1$s nuoroda",
- "%2$s shared %1$s with you" : "%2$s pasidalino %1$s su jumis",
"You shared %1$s via link" : "Pasidalinote %1$s per nuorodą",
+ "%2$s shared %1$s with you" : "%2$s pasidalino %1$s su jumis",
"Downloaded via public link" : "Atsiųsti per viešą nuorodą",
"Shared with %2$s" : "Pasidalinta su %2$s",
- "Shared with group %2$s" : "Pasidalinta su grupe %2$s",
"Shared with %3$s by %2$s" : "%2$s pasidalino %3$s",
+ "Shared with group %2$s" : "Pasidalinta su grupe %2$s",
"Shared with group %3$s by %2$s" : "%2$s pasidalino su grupe %3$s",
"Shared via link by %2$s" : "%2$s pasidalino nuoroda",
- "Shared by %2$s" : "Pasidalino %2$s",
"Shared via public link" : "Pasidalinta vieša nuoroda",
+ "Shared by %2$s" : "Pasidalino %2$s",
"Shares" : "Dalijimaisi",
"Accept" : "Priimti",
"Decline" : "Atmesti",
diff --git a/apps/files_sharing/l10n/lv.js b/apps/files_sharing/l10n/lv.js
index f59a8d0b395..a27ea0de207 100644
--- a/apps/files_sharing/l10n/lv.js
+++ b/apps/files_sharing/l10n/lv.js
@@ -36,8 +36,8 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Publiski koplietots fails %1$s tika lejupielādēts",
"You shared %1$s with %2$s" : "Tu koplietoji %1$s ar %2$s",
"You shared %1$s with group %2$s" : "Tu koplietoji %1$s ar grupu %2$s",
- "%2$s shared %1$s with you" : "%2$s koplietoja %1$s ar tevi",
"You shared %1$s via link" : "Tu koplietoji %1$s , izmantojot saiti",
+ "%2$s shared %1$s with you" : "%2$s koplietoja %1$s ar tevi",
"Shares" : "Koplietotie",
"This share is password-protected" : "Šī koplietotne ir aizsargāta ar paroli",
"The password is wrong. Try again." : "Nepareiza parole. Mēģiniet vēlreiz.",
diff --git a/apps/files_sharing/l10n/lv.json b/apps/files_sharing/l10n/lv.json
index 7c7e43cce4b..45868381304 100644
--- a/apps/files_sharing/l10n/lv.json
+++ b/apps/files_sharing/l10n/lv.json
@@ -34,8 +34,8 @@
"Public shared file %1$s was downloaded" : "Publiski koplietots fails %1$s tika lejupielādēts",
"You shared %1$s with %2$s" : "Tu koplietoji %1$s ar %2$s",
"You shared %1$s with group %2$s" : "Tu koplietoji %1$s ar grupu %2$s",
- "%2$s shared %1$s with you" : "%2$s koplietoja %1$s ar tevi",
"You shared %1$s via link" : "Tu koplietoji %1$s , izmantojot saiti",
+ "%2$s shared %1$s with you" : "%2$s koplietoja %1$s ar tevi",
"Shares" : "Koplietotie",
"This share is password-protected" : "Šī koplietotne ir aizsargāta ar paroli",
"The password is wrong. Try again." : "Nepareiza parole. Mēģiniet vēlreiz.",
diff --git a/apps/files_sharing/l10n/mk.js b/apps/files_sharing/l10n/mk.js
index 5be22894b99..e628c96125b 100644
--- a/apps/files_sharing/l10n/mk.js
+++ b/apps/files_sharing/l10n/mk.js
@@ -26,12 +26,12 @@ OC.L10N.register(
"%2$s shared %1$s with you" : "%2$s споделено %1$s со вас",
"Downloaded via public link" : "Преземи преку јавен линк",
"Shared with %2$s" : "Споделено со %2$s",
- "Shared with group %2$s" : "Споделено со група %2$s",
"Shared with %3$s by %2$s" : "Споделено со %3$s од %2$s",
+ "Shared with group %2$s" : "Споделено со група %2$s",
"Shared with group %3$s by %2$s" : "Споделено со група %3$s од %2$s",
"Shared via link by %2$s" : "Споделено со врска/линк од %2$s",
- "Shared by %2$s" : "Споделено од %2$s",
"Shared via public link" : "Споделено со јавна врска/линк",
+ "Shared by %2$s" : "Споделено од %2$s",
"Shares" : "Споделувања",
"Accept" : "Прифати",
"Decline" : "Одбиј",
diff --git a/apps/files_sharing/l10n/mk.json b/apps/files_sharing/l10n/mk.json
index 40bcf9f8bde..33358b782b7 100644
--- a/apps/files_sharing/l10n/mk.json
+++ b/apps/files_sharing/l10n/mk.json
@@ -24,12 +24,12 @@
"%2$s shared %1$s with you" : "%2$s споделено %1$s со вас",
"Downloaded via public link" : "Преземи преку јавен линк",
"Shared with %2$s" : "Споделено со %2$s",
- "Shared with group %2$s" : "Споделено со група %2$s",
"Shared with %3$s by %2$s" : "Споделено со %3$s од %2$s",
+ "Shared with group %2$s" : "Споделено со група %2$s",
"Shared with group %3$s by %2$s" : "Споделено со група %3$s од %2$s",
"Shared via link by %2$s" : "Споделено со врска/линк од %2$s",
- "Shared by %2$s" : "Споделено од %2$s",
"Shared via public link" : "Споделено со јавна врска/линк",
+ "Shared by %2$s" : "Споделено од %2$s",
"Shares" : "Споделувања",
"Accept" : "Прифати",
"Decline" : "Одбиј",
diff --git a/apps/files_sharing/l10n/ml_IN.js b/apps/files_sharing/l10n/ml_IN.js
index 56904b38ec2..04675764bf6 100644
--- a/apps/files_sharing/l10n/ml_IN.js
+++ b/apps/files_sharing/l10n/ml_IN.js
@@ -4,8 +4,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "ഒരു ഫയലോ അറയോ <strong>പങ്കിട്ടിരിക്കുന്നു</strong>",
"You shared %1$s with %2$s" : "നിങ്ങൾ %1$s %2$sനു പങ്കുവെച്ചു",
"You shared %1$s with group %2$s" : "നിങ്ങൾ %1$s %2$s കൂട്ടത്തിന് പങ്കുവെച്ചു",
- "%2$s shared %1$s with you" : "%2$s %1$s നിങ്ങൾക്ക് പങ്കുവെച്ചു",
"You shared %1$s via link" : "താങ്കൾ %1$s ലിങ്കിലൂടെ പങ്കുവെച്ചിരിക്കുന്നു",
+ "%2$s shared %1$s with you" : "%2$s %1$s നിങ്ങൾക്ക് പങ്കുവെച്ചു",
"Shares" : "പങ്കിടലുകൾ"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/ml_IN.json b/apps/files_sharing/l10n/ml_IN.json
index 05ff39a1479..93d8c0f5e46 100644
--- a/apps/files_sharing/l10n/ml_IN.json
+++ b/apps/files_sharing/l10n/ml_IN.json
@@ -2,8 +2,8 @@
"A file or folder has been <strong>shared</strong>" : "ഒരു ഫയലോ അറയോ <strong>പങ്കിട്ടിരിക്കുന്നു</strong>",
"You shared %1$s with %2$s" : "നിങ്ങൾ %1$s %2$sനു പങ്കുവെച്ചു",
"You shared %1$s with group %2$s" : "നിങ്ങൾ %1$s %2$s കൂട്ടത്തിന് പങ്കുവെച്ചു",
- "%2$s shared %1$s with you" : "%2$s %1$s നിങ്ങൾക്ക് പങ്കുവെച്ചു",
"You shared %1$s via link" : "താങ്കൾ %1$s ലിങ്കിലൂടെ പങ്കുവെച്ചിരിക്കുന്നു",
+ "%2$s shared %1$s with you" : "%2$s %1$s നിങ്ങൾക്ക് പങ്കുവെച്ചു",
"Shares" : "പങ്കിടലുകൾ"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files_sharing/l10n/mn.js b/apps/files_sharing/l10n/mn.js
index 49251482ada..15fb0cabe5f 100644
--- a/apps/files_sharing/l10n/mn.js
+++ b/apps/files_sharing/l10n/mn.js
@@ -5,8 +5,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "Файл эсвэл хавтас амжилттай <strong>түгээгдлээ</strong>",
"You shared %1$s with %2$s" : "Та %1$s-ийг %2$s руу түгээлээ",
"You shared %1$s with group %2$s" : "Та %1$s-ийг %2$s групп руу түгээлээ",
- "%2$s shared %1$s with you" : "%2$s %1$s-ийг тань руу түгээлээ",
"You shared %1$s via link" : "Та %1$s-ийг холбоосоор түгээлээ",
+ "%2$s shared %1$s with you" : "%2$s %1$s-ийг тань руу түгээлээ",
"Shares" : "Түгээлтүүд",
"Password" : "Нууц үг"
},
diff --git a/apps/files_sharing/l10n/mn.json b/apps/files_sharing/l10n/mn.json
index f727c47a008..3fd64731e5a 100644
--- a/apps/files_sharing/l10n/mn.json
+++ b/apps/files_sharing/l10n/mn.json
@@ -3,8 +3,8 @@
"A file or folder has been <strong>shared</strong>" : "Файл эсвэл хавтас амжилттай <strong>түгээгдлээ</strong>",
"You shared %1$s with %2$s" : "Та %1$s-ийг %2$s руу түгээлээ",
"You shared %1$s with group %2$s" : "Та %1$s-ийг %2$s групп руу түгээлээ",
- "%2$s shared %1$s with you" : "%2$s %1$s-ийг тань руу түгээлээ",
"You shared %1$s via link" : "Та %1$s-ийг холбоосоор түгээлээ",
+ "%2$s shared %1$s with you" : "%2$s %1$s-ийг тань руу түгээлээ",
"Shares" : "Түгээлтүүд",
"Password" : "Нууц үг"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/ms_MY.js b/apps/files_sharing/l10n/ms_MY.js
index 0b540000375..43c01b830e0 100644
--- a/apps/files_sharing/l10n/ms_MY.js
+++ b/apps/files_sharing/l10n/ms_MY.js
@@ -3,8 +3,8 @@ OC.L10N.register(
{
"Cancel" : "Batal",
"Shared by" : "Dikongsi dengan",
- "%2$s shared %1$s with you" : "%2$s berkongsi %1$s dengan anda",
"You shared %1$s via link" : "Anda kongsikan %1$s melalui sambungan",
+ "%2$s shared %1$s with you" : "%2$s berkongsi %1$s dengan anda",
"Shares" : "Kongsi",
"Password" : "Kata laluan",
"Name" : "Nama",
diff --git a/apps/files_sharing/l10n/ms_MY.json b/apps/files_sharing/l10n/ms_MY.json
index 8897e9e101a..333999e133b 100644
--- a/apps/files_sharing/l10n/ms_MY.json
+++ b/apps/files_sharing/l10n/ms_MY.json
@@ -1,8 +1,8 @@
{ "translations": {
"Cancel" : "Batal",
"Shared by" : "Dikongsi dengan",
- "%2$s shared %1$s with you" : "%2$s berkongsi %1$s dengan anda",
"You shared %1$s via link" : "Anda kongsikan %1$s melalui sambungan",
+ "%2$s shared %1$s with you" : "%2$s berkongsi %1$s dengan anda",
"Shares" : "Kongsi",
"Password" : "Kata laluan",
"Name" : "Nama",
diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js
index eaefe3c4444..9b09a14f57c 100644
--- a/apps/files_sharing/l10n/nb_NO.js
+++ b/apps/files_sharing/l10n/nb_NO.js
@@ -38,20 +38,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Offentlig delt mappe %1$s ble lastet ned",
"Public shared file %1$s was downloaded" : "Offentlig delt fil %1$s ble lastet ned",
"You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
- "You shared %1$s with group %2$s" : "Du delte %1$s med gruppe %2$s",
"%2$s shared %1$s with %3$s" : "%2$s delte %1$s med %3$s",
+ "You shared %1$s with group %2$s" : "Du delte %1$s med gruppe %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s delte %1$s med gruppe %3$s",
"%2$s shared %1$s via link" : "%2$s delte %1$s via lenke",
- "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
"You shared %1$s via link" : "Du delte %1$s via lenke",
+ "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
"Downloaded via public link" : "Nedlastet via offentlig lenke",
"Shared with %2$s" : "Delt med %2$s",
- "Shared with group %2$s" : "Delt med gruppe %2$s",
"Shared with %3$s by %2$s" : "Delt med %3$s av %2$s",
+ "Shared with group %2$s" : "Delt med gruppe %2$s",
"Shared with group %3$s by %2$s" : "Delt med gruppe %3$s av %2$s",
"Shared via link by %2$s" : "Delt via lenke av %2$s",
- "Shared by %2$s" : "Delt av %2$s",
"Shared via public link" : "Delt via offentlig lenke",
+ "Shared by %2$s" : "Delt av %2$s",
"Shares" : "Delinger",
"Accept" : "Aksepter",
"Decline" : "Avslå",
diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json
index a803a37996a..9c8ff29b791 100644
--- a/apps/files_sharing/l10n/nb_NO.json
+++ b/apps/files_sharing/l10n/nb_NO.json
@@ -36,20 +36,20 @@
"Public shared folder %1$s was downloaded" : "Offentlig delt mappe %1$s ble lastet ned",
"Public shared file %1$s was downloaded" : "Offentlig delt fil %1$s ble lastet ned",
"You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
- "You shared %1$s with group %2$s" : "Du delte %1$s med gruppe %2$s",
"%2$s shared %1$s with %3$s" : "%2$s delte %1$s med %3$s",
+ "You shared %1$s with group %2$s" : "Du delte %1$s med gruppe %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s delte %1$s med gruppe %3$s",
"%2$s shared %1$s via link" : "%2$s delte %1$s via lenke",
- "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
"You shared %1$s via link" : "Du delte %1$s via lenke",
+ "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
"Downloaded via public link" : "Nedlastet via offentlig lenke",
"Shared with %2$s" : "Delt med %2$s",
- "Shared with group %2$s" : "Delt med gruppe %2$s",
"Shared with %3$s by %2$s" : "Delt med %3$s av %2$s",
+ "Shared with group %2$s" : "Delt med gruppe %2$s",
"Shared with group %3$s by %2$s" : "Delt med gruppe %3$s av %2$s",
"Shared via link by %2$s" : "Delt via lenke av %2$s",
- "Shared by %2$s" : "Delt av %2$s",
"Shared via public link" : "Delt via offentlig lenke",
+ "Shared by %2$s" : "Delt av %2$s",
"Shares" : "Delinger",
"Accept" : "Aksepter",
"Decline" : "Avslå",
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index 7ee2d32cbff..79938b02c1c 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -38,20 +38,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Openbaar gedeelde map %1$s werd gedownloaded",
"Public shared file %1$s was downloaded" : "Openbaar gedeeld bestand %1$s werd gedownloaded",
"You shared %1$s with %2$s" : "U deelde %1$s met %2$s",
- "You shared %1$s with group %2$s" : "U deelde %1$s met groep %2$s",
"%2$s shared %1$s with %3$s" : "%2$s deelde %1$s met %3$s",
+ "You shared %1$s with group %2$s" : "U deelde %1$s met groep %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s deelde %1$s met groep %3$s",
"%2$s shared %1$s via link" : "%2$s deelde %1$s via link",
- "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
"You shared %1$s via link" : "U deelde %1$s via link",
+ "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
"Downloaded via public link" : "Gedownload via een openbare link",
"Shared with %2$s" : "Gedeeld met %2$s",
- "Shared with group %2$s" : "Gedeeld met groep %2$s",
"Shared with %3$s by %2$s" : "Gedeeld met %3$s door %2$s",
+ "Shared with group %2$s" : "Gedeeld met groep %2$s",
"Shared with group %3$s by %2$s" : "Gedeeld met groep %3$s door %2$s",
"Shared via link by %2$s" : "Gedeeld via link door %2$s",
- "Shared by %2$s" : "Gedeeld door %2$s",
"Shared via public link" : "Gedeeld via een openbare link",
+ "Shared by %2$s" : "Gedeeld door %2$s",
"Shares" : "Gedeeld",
"Accept" : "Accepteren",
"Decline" : "Afwijzen",
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index 741ecc8168f..78aca262e78 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -36,20 +36,20 @@
"Public shared folder %1$s was downloaded" : "Openbaar gedeelde map %1$s werd gedownloaded",
"Public shared file %1$s was downloaded" : "Openbaar gedeeld bestand %1$s werd gedownloaded",
"You shared %1$s with %2$s" : "U deelde %1$s met %2$s",
- "You shared %1$s with group %2$s" : "U deelde %1$s met groep %2$s",
"%2$s shared %1$s with %3$s" : "%2$s deelde %1$s met %3$s",
+ "You shared %1$s with group %2$s" : "U deelde %1$s met groep %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s deelde %1$s met groep %3$s",
"%2$s shared %1$s via link" : "%2$s deelde %1$s via link",
- "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
"You shared %1$s via link" : "U deelde %1$s via link",
+ "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
"Downloaded via public link" : "Gedownload via een openbare link",
"Shared with %2$s" : "Gedeeld met %2$s",
- "Shared with group %2$s" : "Gedeeld met groep %2$s",
"Shared with %3$s by %2$s" : "Gedeeld met %3$s door %2$s",
+ "Shared with group %2$s" : "Gedeeld met groep %2$s",
"Shared with group %3$s by %2$s" : "Gedeeld met groep %3$s door %2$s",
"Shared via link by %2$s" : "Gedeeld via link door %2$s",
- "Shared by %2$s" : "Gedeeld door %2$s",
"Shared via public link" : "Gedeeld via een openbare link",
+ "Shared by %2$s" : "Gedeeld door %2$s",
"Shares" : "Gedeeld",
"Accept" : "Accepteren",
"Decline" : "Afwijzen",
diff --git a/apps/files_sharing/l10n/nn_NO.js b/apps/files_sharing/l10n/nn_NO.js
index 233dd6c0583..5585f720596 100644
--- a/apps/files_sharing/l10n/nn_NO.js
+++ b/apps/files_sharing/l10n/nn_NO.js
@@ -7,8 +7,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "Ei fil eller ei mappe har blitt <strong>delt</strong>",
"You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
"You shared %1$s with group %2$s" : "Du delte %1$s med gruppa %2$s",
- "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
"You shared %1$s via link" : "Du delte %1$s via ei lenkje",
+ "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
"Shares" : "Delingar",
"The password is wrong. Try again." : "Passordet er gale. Prøv igjen.",
"Password" : "Passord",
diff --git a/apps/files_sharing/l10n/nn_NO.json b/apps/files_sharing/l10n/nn_NO.json
index d5d33c0ae44..81e16df9b28 100644
--- a/apps/files_sharing/l10n/nn_NO.json
+++ b/apps/files_sharing/l10n/nn_NO.json
@@ -5,8 +5,8 @@
"A file or folder has been <strong>shared</strong>" : "Ei fil eller ei mappe har blitt <strong>delt</strong>",
"You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
"You shared %1$s with group %2$s" : "Du delte %1$s med gruppa %2$s",
- "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
"You shared %1$s via link" : "Du delte %1$s via ei lenkje",
+ "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
"Shares" : "Delingar",
"The password is wrong. Try again." : "Passordet er gale. Prøv igjen.",
"Password" : "Passord",
diff --git a/apps/files_sharing/l10n/oc.js b/apps/files_sharing/l10n/oc.js
index 7fd52d203d9..350d35b2de0 100644
--- a/apps/files_sharing/l10n/oc.js
+++ b/apps/files_sharing/l10n/oc.js
@@ -37,20 +37,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Lo dorsièr public %1$s es estat telecargat",
"Public shared file %1$s was downloaded" : "Lo fichièr public %1$s es estat telecargat",
"You shared %1$s with %2$s" : "Avètz partejat %1$s amb %2$s",
- "You shared %1$s with group %2$s" : "Avètz partejat %1$s amb lo grop %2$s",
"%2$s shared %1$s with %3$s" : "%2$s partejat %1$s amb %3$s",
+ "You shared %1$s with group %2$s" : "Avètz partejat %1$s amb lo grop %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s partejat %1$s amb lo grop %3$s",
"%2$s shared %1$s via link" : "%2$s a partejat %1$s per ligam public",
- "%2$s shared %1$s with you" : "%2$s a partejat %1$s amb vos",
"You shared %1$s via link" : "Avètz partejat %1$s per ligam public",
+ "%2$s shared %1$s with you" : "%2$s a partejat %1$s amb vos",
"Downloaded via public link" : "Telecargat per ligam public",
"Shared with %2$s" : "Partejat amb %2$s",
- "Shared with group %2$s" : "Partejat amb lo grop %2$s",
"Shared with %3$s by %2$s" : "Partejat amb %3$s per %2$s",
+ "Shared with group %2$s" : "Partejat amb lo grop %2$s",
"Shared with group %3$s by %2$s" : "Partejat amb lo grop %3$s per %2$s",
"Shared via link by %2$s" : "Partejat via ligam per %2$s",
- "Shared by %2$s" : "Partejat per %2$s",
"Shared via public link" : "Partejat per ligam public",
+ "Shared by %2$s" : "Partejat per %2$s",
"Shares" : "Partiments",
"Accept" : "Acceptar",
"Decline" : "Refusar",
diff --git a/apps/files_sharing/l10n/oc.json b/apps/files_sharing/l10n/oc.json
index 6dfa61f4735..90254deca48 100644
--- a/apps/files_sharing/l10n/oc.json
+++ b/apps/files_sharing/l10n/oc.json
@@ -35,20 +35,20 @@
"Public shared folder %1$s was downloaded" : "Lo dorsièr public %1$s es estat telecargat",
"Public shared file %1$s was downloaded" : "Lo fichièr public %1$s es estat telecargat",
"You shared %1$s with %2$s" : "Avètz partejat %1$s amb %2$s",
- "You shared %1$s with group %2$s" : "Avètz partejat %1$s amb lo grop %2$s",
"%2$s shared %1$s with %3$s" : "%2$s partejat %1$s amb %3$s",
+ "You shared %1$s with group %2$s" : "Avètz partejat %1$s amb lo grop %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s partejat %1$s amb lo grop %3$s",
"%2$s shared %1$s via link" : "%2$s a partejat %1$s per ligam public",
- "%2$s shared %1$s with you" : "%2$s a partejat %1$s amb vos",
"You shared %1$s via link" : "Avètz partejat %1$s per ligam public",
+ "%2$s shared %1$s with you" : "%2$s a partejat %1$s amb vos",
"Downloaded via public link" : "Telecargat per ligam public",
"Shared with %2$s" : "Partejat amb %2$s",
- "Shared with group %2$s" : "Partejat amb lo grop %2$s",
"Shared with %3$s by %2$s" : "Partejat amb %3$s per %2$s",
+ "Shared with group %2$s" : "Partejat amb lo grop %2$s",
"Shared with group %3$s by %2$s" : "Partejat amb lo grop %3$s per %2$s",
"Shared via link by %2$s" : "Partejat via ligam per %2$s",
- "Shared by %2$s" : "Partejat per %2$s",
"Shared via public link" : "Partejat per ligam public",
+ "Shared by %2$s" : "Partejat per %2$s",
"Shares" : "Partiments",
"Accept" : "Acceptar",
"Decline" : "Refusar",
diff --git a/apps/files_sharing/l10n/pl.js b/apps/files_sharing/l10n/pl.js
index 62b128844df..5acdcf116fd 100644
--- a/apps/files_sharing/l10n/pl.js
+++ b/apps/files_sharing/l10n/pl.js
@@ -27,8 +27,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "Plik lub folder stał się <strong>współdzielony</strong>",
"You shared %1$s with %2$s" : "Współdzielisz %1$s z %2$s",
"You shared %1$s with group %2$s" : "Współdzielisz %1$s z grupą %2$s",
- "%2$s shared %1$s with you" : "%2$s współdzieli %1$s z Tobą",
"You shared %1$s via link" : "Udostępniasz %1$s przez link",
+ "%2$s shared %1$s with you" : "%2$s współdzieli %1$s z Tobą",
"Shares" : "Udziały",
"Accept" : "Akceptuj",
"This share is password-protected" : "Udział ten jest chroniony hasłem",
diff --git a/apps/files_sharing/l10n/pl.json b/apps/files_sharing/l10n/pl.json
index 76052b1dfb7..ded962ac9e1 100644
--- a/apps/files_sharing/l10n/pl.json
+++ b/apps/files_sharing/l10n/pl.json
@@ -25,8 +25,8 @@
"A file or folder has been <strong>shared</strong>" : "Plik lub folder stał się <strong>współdzielony</strong>",
"You shared %1$s with %2$s" : "Współdzielisz %1$s z %2$s",
"You shared %1$s with group %2$s" : "Współdzielisz %1$s z grupą %2$s",
- "%2$s shared %1$s with you" : "%2$s współdzieli %1$s z Tobą",
"You shared %1$s via link" : "Udostępniasz %1$s przez link",
+ "%2$s shared %1$s with you" : "%2$s współdzieli %1$s z Tobą",
"Shares" : "Udziały",
"Accept" : "Akceptuj",
"This share is password-protected" : "Udział ten jest chroniony hasłem",
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index 19ff49f9af3..22f4d7dd9ce 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -11,6 +11,7 @@ OC.L10N.register(
"Shared with you" : "Compartilhado com você",
"Shared with others" : "Compartilhado com outros",
"Shared by link" : "Compartilhado por link",
+ "Federated sharing" : "Compartilhamento associado",
"Nothing shared with you yet" : "Nada compartilhado com você até agora",
"Files and folders others share with you will show up here" : "Arquivos e pastas que outros compartilham com você são mostrados aqui",
"Nothing shared yet" : "Nada compartilhado até agora",
@@ -38,21 +39,22 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "A pasta %1$s compartilhada publicamente foi baixada",
"Public shared file %1$s was downloaded" : "O arquivo %1$s compartilhado publicamente foi baixado",
"You shared %1$s with %2$s" : "Você compartilhou %1$s com %2$s",
- "You shared %1$s with group %2$s" : "Você compartilhou %1$s com o grupo %2$s",
"%2$s shared %1$s with %3$s" : "%2$s compartilhado %1$s com %3$s",
+ "You shared %1$s with group %2$s" : "Você compartilhou %1$s com o grupo %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s compartilhado %1$s com o grupo %3$s",
"%2$s shared %1$s via link" : "%2$s compartilhado via link %1$s",
- "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
"You shared %1$s via link" : "Você compartilhou %1$s via link",
+ "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
"Downloaded via public link" : "Baixar via link público",
"Shared with %2$s" : "Compartilhado com %2$s",
- "Shared with group %2$s" : "Compartilhado com o grupo %2$s",
"Shared with %3$s by %2$s" : "Compartilhado com %3$s por %2$s",
+ "Shared with group %2$s" : "Compartilhado com o grupo %2$s",
"Shared with group %3$s by %2$s" : "Compartilhado com o grupo %3$s por %2$s",
"Shared via link by %2$s" : "Compartilhado via link por %2$s",
- "Shared by %2$s" : "Compartilhado por %2$s",
"Shared via public link" : "Compartilhado via link público",
+ "Shared by %2$s" : "Compartilhado por %2$s",
"Shares" : "Compartilhamentos",
+ "You received \"/%2$s\" as a remote share from %1$s" : "Você recebeu \"/%2$s\" como um compartilhamento remoto de %1$s",
"Accept" : "Aceitar",
"Decline" : "Rejeitar",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem ID Associada, veja %s",
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index d55750ae47a..490bbfdf0ee 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -9,6 +9,7 @@
"Shared with you" : "Compartilhado com você",
"Shared with others" : "Compartilhado com outros",
"Shared by link" : "Compartilhado por link",
+ "Federated sharing" : "Compartilhamento associado",
"Nothing shared with you yet" : "Nada compartilhado com você até agora",
"Files and folders others share with you will show up here" : "Arquivos e pastas que outros compartilham com você são mostrados aqui",
"Nothing shared yet" : "Nada compartilhado até agora",
@@ -36,21 +37,22 @@
"Public shared folder %1$s was downloaded" : "A pasta %1$s compartilhada publicamente foi baixada",
"Public shared file %1$s was downloaded" : "O arquivo %1$s compartilhado publicamente foi baixado",
"You shared %1$s with %2$s" : "Você compartilhou %1$s com %2$s",
- "You shared %1$s with group %2$s" : "Você compartilhou %1$s com o grupo %2$s",
"%2$s shared %1$s with %3$s" : "%2$s compartilhado %1$s com %3$s",
+ "You shared %1$s with group %2$s" : "Você compartilhou %1$s com o grupo %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s compartilhado %1$s com o grupo %3$s",
"%2$s shared %1$s via link" : "%2$s compartilhado via link %1$s",
- "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
"You shared %1$s via link" : "Você compartilhou %1$s via link",
+ "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
"Downloaded via public link" : "Baixar via link público",
"Shared with %2$s" : "Compartilhado com %2$s",
- "Shared with group %2$s" : "Compartilhado com o grupo %2$s",
"Shared with %3$s by %2$s" : "Compartilhado com %3$s por %2$s",
+ "Shared with group %2$s" : "Compartilhado com o grupo %2$s",
"Shared with group %3$s by %2$s" : "Compartilhado com o grupo %3$s por %2$s",
"Shared via link by %2$s" : "Compartilhado via link por %2$s",
- "Shared by %2$s" : "Compartilhado por %2$s",
"Shared via public link" : "Compartilhado via link público",
+ "Shared by %2$s" : "Compartilhado por %2$s",
"Shares" : "Compartilhamentos",
+ "You received \"/%2$s\" as a remote share from %1$s" : "Você recebeu \"/%2$s\" como um compartilhamento remoto de %1$s",
"Accept" : "Aceitar",
"Decline" : "Rejeitar",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem ID Associada, veja %s",
diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js
index 3d2145c156c..e9cf412bc53 100644
--- a/apps/files_sharing/l10n/pt_PT.js
+++ b/apps/files_sharing/l10n/pt_PT.js
@@ -11,6 +11,7 @@ OC.L10N.register(
"Shared with you" : "Partilhado consigo ",
"Shared with others" : "Partilhado com outros",
"Shared by link" : "Partilhado pela hiperligação",
+ "Federated sharing" : "Partilha federada",
"Nothing shared with you yet" : "Ainda não foi partilhado nada consigo",
"Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradaos aqui",
"Nothing shared yet" : "Ainda não foi partilhado nada",
@@ -38,21 +39,39 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi transferida",
"Public shared file %1$s was downloaded" : "Foi transferido o ficheiro %1$s partilhado publicamente",
"You shared %1$s with %2$s" : "Partilhou %1$s com %2$s",
- "You shared %1$s with group %2$s" : "Partilhou %1$s com o grupo %2$s",
"%2$s shared %1$s with %3$s" : "%2$s partilhou %1$s com %3$s",
+ "You removed the share of %2$s for %1$s" : "Removeu a partilha de %2$s para %1$s",
+ "%2$s removed the share of %3$s for %1$s" : "%2$s removeu a partilha de %3$s para %1$s",
+ "You shared %1$s with group %2$s" : "Partilhou %1$s com o grupo %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s partilhou %1$s com o grupo %3$s",
+ "You removed the share of group %2$s for %1$s" : "Removeu a partilha do grupo %2$s para %1$s",
+ "%2$s removed the share of group %3$s for %1$s" : "%2$s removeu a partilha do grupo %3$s para %1$s",
"%2$s shared %1$s via link" : "%2$s partilhou %1$s via hiperligação",
- "%2$s shared %1$s with you" : "%2$s partilhou %1$s consigo",
"You shared %1$s via link" : "Partilhou %1$s através de uma hiperligação",
+ "You removed the public link for %1$s" : "Removeu o link público de %1$s",
+ "%2$s removed the public link for %1$s" : "%2$s removeu o link público de %1$s",
+ "Your public link for %1$s expired" : "O seu link público de %1$s expirou",
+ "The public link of %2$s for %1$s expired" : "O link público de %2$s para %1$s expirou",
+ "%2$s shared %1$s with you" : "%2$s partilhou %1$s consigo",
+ "%2$s removed the share for %1$s" : "%2$s removeu a partilha para %1$s",
"Downloaded via public link" : "Transferido via hiperligação pública",
"Shared with %2$s" : "Partilhado com %2$s",
- "Shared with group %2$s" : "Partilhado com o grupo %2$s",
"Shared with %3$s by %2$s" : "Partilhado com %3$s por %2$s",
+ "Removed share for %2$s" : "Partilha removida para %2$s",
+ "%2$s removed share for %3$s" : "%2$s removeu a partilha para %3$s",
+ "Shared with group %2$s" : "Partilhado com o grupo %2$s",
"Shared with group %3$s by %2$s" : "Partilhado com o grupo %3$s por %2$s",
+ "Removed share of group %2$s" : "Partilha removida do grupo %2$s",
+ "%2$s removed share of group %3$s" : "%2$s removeu a partilha do grupo %3$s",
"Shared via link by %2$s" : "Partilhado via hiperligação por %2$s",
- "Shared by %2$s" : "Partilhado por %2$s",
"Shared via public link" : "Partilhado via hiperligação pública",
+ "Removed public link" : "Removeu link público",
+ "%2$s removed public link" : "%2$s removeu link público",
+ "Public link expired" : "Link público expirou",
+ "Public link of %2$s expired" : "Link público de %2$s expirou",
+ "Shared by %2$s" : "Partilhado por %2$s",
"Shares" : "Partilhas",
+ "You received \"/%2$s\" as a remote share from %1$s" : "Recebeu \"/%2$s\" como uma partilha remota de %1$s",
"Accept" : "Aceitar",
"Decline" : "Recusar",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s",
diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json
index 1f90556e9a2..f311ef6bb33 100644
--- a/apps/files_sharing/l10n/pt_PT.json
+++ b/apps/files_sharing/l10n/pt_PT.json
@@ -9,6 +9,7 @@
"Shared with you" : "Partilhado consigo ",
"Shared with others" : "Partilhado com outros",
"Shared by link" : "Partilhado pela hiperligação",
+ "Federated sharing" : "Partilha federada",
"Nothing shared with you yet" : "Ainda não foi partilhado nada consigo",
"Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradaos aqui",
"Nothing shared yet" : "Ainda não foi partilhado nada",
@@ -36,21 +37,39 @@
"Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi transferida",
"Public shared file %1$s was downloaded" : "Foi transferido o ficheiro %1$s partilhado publicamente",
"You shared %1$s with %2$s" : "Partilhou %1$s com %2$s",
- "You shared %1$s with group %2$s" : "Partilhou %1$s com o grupo %2$s",
"%2$s shared %1$s with %3$s" : "%2$s partilhou %1$s com %3$s",
+ "You removed the share of %2$s for %1$s" : "Removeu a partilha de %2$s para %1$s",
+ "%2$s removed the share of %3$s for %1$s" : "%2$s removeu a partilha de %3$s para %1$s",
+ "You shared %1$s with group %2$s" : "Partilhou %1$s com o grupo %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s partilhou %1$s com o grupo %3$s",
+ "You removed the share of group %2$s for %1$s" : "Removeu a partilha do grupo %2$s para %1$s",
+ "%2$s removed the share of group %3$s for %1$s" : "%2$s removeu a partilha do grupo %3$s para %1$s",
"%2$s shared %1$s via link" : "%2$s partilhou %1$s via hiperligação",
- "%2$s shared %1$s with you" : "%2$s partilhou %1$s consigo",
"You shared %1$s via link" : "Partilhou %1$s através de uma hiperligação",
+ "You removed the public link for %1$s" : "Removeu o link público de %1$s",
+ "%2$s removed the public link for %1$s" : "%2$s removeu o link público de %1$s",
+ "Your public link for %1$s expired" : "O seu link público de %1$s expirou",
+ "The public link of %2$s for %1$s expired" : "O link público de %2$s para %1$s expirou",
+ "%2$s shared %1$s with you" : "%2$s partilhou %1$s consigo",
+ "%2$s removed the share for %1$s" : "%2$s removeu a partilha para %1$s",
"Downloaded via public link" : "Transferido via hiperligação pública",
"Shared with %2$s" : "Partilhado com %2$s",
- "Shared with group %2$s" : "Partilhado com o grupo %2$s",
"Shared with %3$s by %2$s" : "Partilhado com %3$s por %2$s",
+ "Removed share for %2$s" : "Partilha removida para %2$s",
+ "%2$s removed share for %3$s" : "%2$s removeu a partilha para %3$s",
+ "Shared with group %2$s" : "Partilhado com o grupo %2$s",
"Shared with group %3$s by %2$s" : "Partilhado com o grupo %3$s por %2$s",
+ "Removed share of group %2$s" : "Partilha removida do grupo %2$s",
+ "%2$s removed share of group %3$s" : "%2$s removeu a partilha do grupo %3$s",
"Shared via link by %2$s" : "Partilhado via hiperligação por %2$s",
- "Shared by %2$s" : "Partilhado por %2$s",
"Shared via public link" : "Partilhado via hiperligação pública",
+ "Removed public link" : "Removeu link público",
+ "%2$s removed public link" : "%2$s removeu link público",
+ "Public link expired" : "Link público expirou",
+ "Public link of %2$s expired" : "Link público de %2$s expirou",
+ "Shared by %2$s" : "Partilhado por %2$s",
"Shares" : "Partilhas",
+ "You received \"/%2$s\" as a remote share from %1$s" : "Recebeu \"/%2$s\" como uma partilha remota de %1$s",
"Accept" : "Aceitar",
"Decline" : "Recusar",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s",
diff --git a/apps/files_sharing/l10n/ro.js b/apps/files_sharing/l10n/ro.js
index 1ec5b930d27..dbbff12cd6c 100644
--- a/apps/files_sharing/l10n/ro.js
+++ b/apps/files_sharing/l10n/ro.js
@@ -12,8 +12,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "Un fișier sau director a fost <strong>partajat</strong>",
"You shared %1$s with %2$s" : "Ai partajat %1$s cu %2$s",
"You shared %1$s with group %2$s" : "Ai partajat %1$s cu grupul %2$s",
- "%2$s shared %1$s with you" : "%2$s a partajat %1$s cu tine",
"You shared %1$s via link" : "Ai partajat %1$s prin legătură",
+ "%2$s shared %1$s with you" : "%2$s a partajat %1$s cu tine",
"Shares" : "Partajări",
"This share is password-protected" : "Această partajare este protejată cu parolă",
"The password is wrong. Try again." : "Parola este incorectă. Încercaţi din nou.",
diff --git a/apps/files_sharing/l10n/ro.json b/apps/files_sharing/l10n/ro.json
index b106c990019..19554a0c950 100644
--- a/apps/files_sharing/l10n/ro.json
+++ b/apps/files_sharing/l10n/ro.json
@@ -10,8 +10,8 @@
"A file or folder has been <strong>shared</strong>" : "Un fișier sau director a fost <strong>partajat</strong>",
"You shared %1$s with %2$s" : "Ai partajat %1$s cu %2$s",
"You shared %1$s with group %2$s" : "Ai partajat %1$s cu grupul %2$s",
- "%2$s shared %1$s with you" : "%2$s a partajat %1$s cu tine",
"You shared %1$s via link" : "Ai partajat %1$s prin legătură",
+ "%2$s shared %1$s with you" : "%2$s a partajat %1$s cu tine",
"Shares" : "Partajări",
"This share is password-protected" : "Această partajare este protejată cu parolă",
"The password is wrong. Try again." : "Parola este incorectă. Încercaţi din nou.",
diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js
index fea7d9b9e6f..79e47222102 100644
--- a/apps/files_sharing/l10n/ru.js
+++ b/apps/files_sharing/l10n/ru.js
@@ -11,6 +11,7 @@ OC.L10N.register(
"Shared with you" : "Поделились с вами",
"Shared with others" : "Доступные для других",
"Shared by link" : "Доступные по ссылке",
+ "Federated sharing" : "Общий доступ из объединенного общего хранилища",
"Nothing shared with you yet" : "С вами пока ничем не поделились",
"Files and folders others share with you will show up here" : "Здесь появятся файлы и каталоги, которыми с вами поделятся",
"Nothing shared yet" : "Пока ничего не опубликовано",
@@ -38,21 +39,22 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Общий каталог %1$s был скачан",
"Public shared file %1$s was downloaded" : "Общий файл %1$s, был скачан",
"You shared %1$s with %2$s" : "Вы поделились %1$s с %2$s",
- "You shared %1$s with group %2$s" : "Вы поделились %1$s с группой %2$s",
"%2$s shared %1$s with %3$s" : "%2$s поделился %1$s с %3$s",
+ "You shared %1$s with group %2$s" : "Вы поделились %1$s с группой %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s поделился %1$s с группой %3$s",
"%2$s shared %1$s via link" : "%2$s поделился %1$s по ссылке",
- "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s",
"You shared %1$s via link" : "Вы поделились %1$s с помощью ссылки",
+ "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s",
"Downloaded via public link" : "Загружено по открытой ссылке",
"Shared with %2$s" : "Поделился с %2$s",
- "Shared with group %2$s" : "Поделился с группой %2$s",
"Shared with %3$s by %2$s" : "Поделился %2$s с %3$s",
+ "Shared with group %2$s" : "Поделился с группой %2$s",
"Shared with group %3$s by %2$s" : "Поделился %2$s с группой %3$s",
"Shared via link by %2$s" : "Поделился ссылкой %2$s",
- "Shared by %2$s" : "Поделился %2$s",
"Shared via public link" : "Поделился открытой ссылкой",
+ "Shared by %2$s" : "Поделился %2$s",
"Shares" : "События обмена файлами",
+ "You received \"/%2$s\" as a remote share from %1$s" : "Вы получили доступ к \"/%2$s\" от пользователя %1$s",
"Accept" : "Принять",
"Decline" : "Отклонить",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s",
diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json
index 5c7f34858a1..26019ba1a01 100644
--- a/apps/files_sharing/l10n/ru.json
+++ b/apps/files_sharing/l10n/ru.json
@@ -9,6 +9,7 @@
"Shared with you" : "Поделились с вами",
"Shared with others" : "Доступные для других",
"Shared by link" : "Доступные по ссылке",
+ "Federated sharing" : "Общий доступ из объединенного общего хранилища",
"Nothing shared with you yet" : "С вами пока ничем не поделились",
"Files and folders others share with you will show up here" : "Здесь появятся файлы и каталоги, которыми с вами поделятся",
"Nothing shared yet" : "Пока ничего не опубликовано",
@@ -36,21 +37,22 @@
"Public shared folder %1$s was downloaded" : "Общий каталог %1$s был скачан",
"Public shared file %1$s was downloaded" : "Общий файл %1$s, был скачан",
"You shared %1$s with %2$s" : "Вы поделились %1$s с %2$s",
- "You shared %1$s with group %2$s" : "Вы поделились %1$s с группой %2$s",
"%2$s shared %1$s with %3$s" : "%2$s поделился %1$s с %3$s",
+ "You shared %1$s with group %2$s" : "Вы поделились %1$s с группой %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s поделился %1$s с группой %3$s",
"%2$s shared %1$s via link" : "%2$s поделился %1$s по ссылке",
- "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s",
"You shared %1$s via link" : "Вы поделились %1$s с помощью ссылки",
+ "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s",
"Downloaded via public link" : "Загружено по открытой ссылке",
"Shared with %2$s" : "Поделился с %2$s",
- "Shared with group %2$s" : "Поделился с группой %2$s",
"Shared with %3$s by %2$s" : "Поделился %2$s с %3$s",
+ "Shared with group %2$s" : "Поделился с группой %2$s",
"Shared with group %3$s by %2$s" : "Поделился %2$s с группой %3$s",
"Shared via link by %2$s" : "Поделился ссылкой %2$s",
- "Shared by %2$s" : "Поделился %2$s",
"Shared via public link" : "Поделился открытой ссылкой",
+ "Shared by %2$s" : "Поделился %2$s",
"Shares" : "События обмена файлами",
+ "You received \"/%2$s\" as a remote share from %1$s" : "Вы получили доступ к \"/%2$s\" от пользователя %1$s",
"Accept" : "Принять",
"Decline" : "Отклонить",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s",
diff --git a/apps/files_sharing/l10n/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js
index d96958037b6..dfd287e067d 100644
--- a/apps/files_sharing/l10n/sk_SK.js
+++ b/apps/files_sharing/l10n/sk_SK.js
@@ -37,20 +37,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Verejne zdieľaný priečinok %1$s bol stiahnutý",
"Public shared file %1$s was downloaded" : "Verejne zdieľaný súbor %1$s bol stiahnutý",
"You shared %1$s with %2$s" : "Bol zdieľaný %1$s s %2$s",
- "You shared %1$s with group %2$s" : "Bol zdieľaný %1$s so skupinou %2$s",
"%2$s shared %1$s with %3$s" : "%2$s zdieľané %1$s s %3$s",
+ "You shared %1$s with group %2$s" : "Bol zdieľaný %1$s so skupinou %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s zdieľané %1$s so skupinou %3$s",
"%2$s shared %1$s via link" : "%2$s zdieľané %1$s pomocou linky",
- "%2$s shared %1$s with you" : "%2$s vám zdieľal %1$s",
"You shared %1$s via link" : "Zdieľate %1$s prostredníctvom odkazu",
+ "%2$s shared %1$s with you" : "%2$s vám zdieľal %1$s",
"Downloaded via public link" : "Stiahnuté prostredníctvom verejného odkazu",
"Shared with %2$s" : "Zdieľané s %2$s",
- "Shared with group %2$s" : "Zdieľané so skupinou %2$s",
"Shared with %3$s by %2$s" : "Zdieľané s %3$s prostredníctvom %2$s",
+ "Shared with group %2$s" : "Zdieľané so skupinou %2$s",
"Shared with group %3$s by %2$s" : "Zdieľané so skupinou %3$s prostredníctvom %2$s",
"Shared via link by %2$s" : "Zdieľané prostredníctvom odkazu s %2$s",
- "Shared by %2$s" : "Zdieľané s %2$s",
"Shared via public link" : "Zdieľané prostredníctvom verejného odkazu",
+ "Shared by %2$s" : "Zdieľané s %2$s",
"Shares" : "Zdieľanie",
"Accept" : "Schváliť",
"Decline" : "Odmietnuť",
diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json
index bfa047963c4..5d23d16c976 100644
--- a/apps/files_sharing/l10n/sk_SK.json
+++ b/apps/files_sharing/l10n/sk_SK.json
@@ -35,20 +35,20 @@
"Public shared folder %1$s was downloaded" : "Verejne zdieľaný priečinok %1$s bol stiahnutý",
"Public shared file %1$s was downloaded" : "Verejne zdieľaný súbor %1$s bol stiahnutý",
"You shared %1$s with %2$s" : "Bol zdieľaný %1$s s %2$s",
- "You shared %1$s with group %2$s" : "Bol zdieľaný %1$s so skupinou %2$s",
"%2$s shared %1$s with %3$s" : "%2$s zdieľané %1$s s %3$s",
+ "You shared %1$s with group %2$s" : "Bol zdieľaný %1$s so skupinou %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s zdieľané %1$s so skupinou %3$s",
"%2$s shared %1$s via link" : "%2$s zdieľané %1$s pomocou linky",
- "%2$s shared %1$s with you" : "%2$s vám zdieľal %1$s",
"You shared %1$s via link" : "Zdieľate %1$s prostredníctvom odkazu",
+ "%2$s shared %1$s with you" : "%2$s vám zdieľal %1$s",
"Downloaded via public link" : "Stiahnuté prostredníctvom verejného odkazu",
"Shared with %2$s" : "Zdieľané s %2$s",
- "Shared with group %2$s" : "Zdieľané so skupinou %2$s",
"Shared with %3$s by %2$s" : "Zdieľané s %3$s prostredníctvom %2$s",
+ "Shared with group %2$s" : "Zdieľané so skupinou %2$s",
"Shared with group %3$s by %2$s" : "Zdieľané so skupinou %3$s prostredníctvom %2$s",
"Shared via link by %2$s" : "Zdieľané prostredníctvom odkazu s %2$s",
- "Shared by %2$s" : "Zdieľané s %2$s",
"Shared via public link" : "Zdieľané prostredníctvom verejného odkazu",
+ "Shared by %2$s" : "Zdieľané s %2$s",
"Shares" : "Zdieľanie",
"Accept" : "Schváliť",
"Decline" : "Odmietnuť",
diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js
index 3624766ecee..b7459f5824b 100644
--- a/apps/files_sharing/l10n/sl.js
+++ b/apps/files_sharing/l10n/sl.js
@@ -37,8 +37,8 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Datoteka v souporabi %1$s je bila prejeta",
"You shared %1$s with %2$s" : "Omogočili ste souporabo %1$s z uporabnikom %2$s",
"You shared %1$s with group %2$s" : "Omogočili ste souporabo %1$s s skupino %2$s",
- "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s",
"You shared %1$s via link" : "Omogočili ste souporabo %1$s preko povezave",
+ "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s",
"Shares" : "Souporaba",
"Accept" : "Sprejmi",
"Decline" : "Zavrni",
diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json
index 758097746bc..4e17fee37db 100644
--- a/apps/files_sharing/l10n/sl.json
+++ b/apps/files_sharing/l10n/sl.json
@@ -35,8 +35,8 @@
"Public shared file %1$s was downloaded" : "Datoteka v souporabi %1$s je bila prejeta",
"You shared %1$s with %2$s" : "Omogočili ste souporabo %1$s z uporabnikom %2$s",
"You shared %1$s with group %2$s" : "Omogočili ste souporabo %1$s s skupino %2$s",
- "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s",
"You shared %1$s via link" : "Omogočili ste souporabo %1$s preko povezave",
+ "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s",
"Shares" : "Souporaba",
"Accept" : "Sprejmi",
"Decline" : "Zavrni",
diff --git a/apps/files_sharing/l10n/sq.js b/apps/files_sharing/l10n/sq.js
index d26b3a0834d..8ffc9dba389 100644
--- a/apps/files_sharing/l10n/sq.js
+++ b/apps/files_sharing/l10n/sq.js
@@ -11,6 +11,7 @@ OC.L10N.register(
"Shared with you" : "Të ndara me ju",
"Shared with others" : "Të ndara me të tjerët",
"Shared by link" : "Të ndara me lidhje",
+ "Federated sharing" : "Ndarje e federuar",
"Nothing shared with you yet" : "Ende pa ndarë gjë me ju",
"Files and folders others share with you will show up here" : "Këtu do të shfaqen kartelat dhe dosjet që të jerët ndajnë me ju",
"Nothing shared yet" : "Ende pa ndarë gjë",
@@ -38,21 +39,39 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "U shkarkua dosja e ndarë publikisht %1$s",
"Public shared file %1$s was downloaded" : "U shkarkua kartela e ndarë publikisht %1$s",
"You shared %1$s with %2$s" : "Ndatë %1$s me %2$s",
- "You shared %1$s with group %2$s" : "Ndatë %1$s me grupin %2$s",
"%2$s shared %1$s with %3$s" : "%2$s ndau %1$s me %3$s",
+ "You removed the share of %2$s for %1$s" : "Hoqët ndarjen e %2$s për %1$s",
+ "%2$s removed the share of %3$s for %1$s" : "%2$s hoqi ndarjen e %3$s për %1$s",
+ "You shared %1$s with group %2$s" : "Ndatë %1$s me grupin %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s ndau %1$s me grupin %3$s",
+ "You removed the share of group %2$s for %1$s" : "Hoqët ndarjen e grupit %2$s për %1$s",
+ "%2$s removed the share of group %3$s for %1$s" : "%2$s hoqi ndarjen e grupit %3$s për %1$s",
"%2$s shared %1$s via link" : "%2$s ndau %1$s përmes një lidhjeje",
- "%2$s shared %1$s with you" : "%2$s ndau %1$s me ju",
"You shared %1$s via link" : "Ndatë %1$s përmes një lidhjeje",
+ "You removed the public link for %1$s" : "Hoqët lidhjen publike për %1$s",
+ "%2$s removed the public link for %1$s" : "%2$s hoqi lidhjen publike për %1$s",
+ "Your public link for %1$s expired" : "Lidhja juaj publike për %1$s skadoi",
+ "The public link of %2$s for %1$s expired" : "Lidhja publike e %2$s për %1$s skadoi",
+ "%2$s shared %1$s with you" : "%2$s ndau %1$s me ju",
+ "%2$s removed the share for %1$s" : "%2$s hoqi ndarjen për %1$s",
"Downloaded via public link" : "Shkarkuar përmes një lidhjeje publike",
"Shared with %2$s" : "U nda me %2$s",
- "Shared with group %2$s" : "U nda me grupin %2$s",
"Shared with %3$s by %2$s" : "U nda me %3$s nga %2$s",
+ "Removed share for %2$s" : "Hoqi ndarjen për %2$s",
+ "%2$s removed share for %3$s" : "%2$s hoqi ndarjen për %3$s",
+ "Shared with group %2$s" : "U nda me grupin %2$s",
"Shared with group %3$s by %2$s" : "U nda me grupin %3$s nga %2$s",
+ "Removed share of group %2$s" : "Hoqi ndarjen e grupit %2$s",
+ "%2$s removed share of group %3$s" : "%2$s hoqi ndarjen e grupit %3$s",
"Shared via link by %2$s" : "U nda përmes një lidhje nga %2$s",
- "Shared by %2$s" : "U nda nga %2$s",
"Shared via public link" : "U nda përmes një lidhje publike",
+ "Removed public link" : "Hoqi lidhje publike",
+ "%2$s removed public link" : "%2$s hoqi lidhje publike",
+ "Public link expired" : "Lidhja publike skadoi",
+ "Public link of %2$s expired" : "Lidhja publike e %2$s skadoi",
+ "Shared by %2$s" : "U nda nga %2$s",
"Shares" : "Ndarje",
+ "You received \"/%2$s\" as a remote share from %1$s" : "Ju erdhi \"/%2$s\" si ndarje e largët prej %1$s",
"Accept" : "Pranoje",
"Decline" : "Hidhe poshtë",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ndani me mua përmes ID-së time për #ownCloud Federated Cloud, shihni %s",
diff --git a/apps/files_sharing/l10n/sq.json b/apps/files_sharing/l10n/sq.json
index 8d56faa38e1..70b2a3ff20d 100644
--- a/apps/files_sharing/l10n/sq.json
+++ b/apps/files_sharing/l10n/sq.json
@@ -9,6 +9,7 @@
"Shared with you" : "Të ndara me ju",
"Shared with others" : "Të ndara me të tjerët",
"Shared by link" : "Të ndara me lidhje",
+ "Federated sharing" : "Ndarje e federuar",
"Nothing shared with you yet" : "Ende pa ndarë gjë me ju",
"Files and folders others share with you will show up here" : "Këtu do të shfaqen kartelat dhe dosjet që të jerët ndajnë me ju",
"Nothing shared yet" : "Ende pa ndarë gjë",
@@ -36,21 +37,39 @@
"Public shared folder %1$s was downloaded" : "U shkarkua dosja e ndarë publikisht %1$s",
"Public shared file %1$s was downloaded" : "U shkarkua kartela e ndarë publikisht %1$s",
"You shared %1$s with %2$s" : "Ndatë %1$s me %2$s",
- "You shared %1$s with group %2$s" : "Ndatë %1$s me grupin %2$s",
"%2$s shared %1$s with %3$s" : "%2$s ndau %1$s me %3$s",
+ "You removed the share of %2$s for %1$s" : "Hoqët ndarjen e %2$s për %1$s",
+ "%2$s removed the share of %3$s for %1$s" : "%2$s hoqi ndarjen e %3$s për %1$s",
+ "You shared %1$s with group %2$s" : "Ndatë %1$s me grupin %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s ndau %1$s me grupin %3$s",
+ "You removed the share of group %2$s for %1$s" : "Hoqët ndarjen e grupit %2$s për %1$s",
+ "%2$s removed the share of group %3$s for %1$s" : "%2$s hoqi ndarjen e grupit %3$s për %1$s",
"%2$s shared %1$s via link" : "%2$s ndau %1$s përmes një lidhjeje",
- "%2$s shared %1$s with you" : "%2$s ndau %1$s me ju",
"You shared %1$s via link" : "Ndatë %1$s përmes një lidhjeje",
+ "You removed the public link for %1$s" : "Hoqët lidhjen publike për %1$s",
+ "%2$s removed the public link for %1$s" : "%2$s hoqi lidhjen publike për %1$s",
+ "Your public link for %1$s expired" : "Lidhja juaj publike për %1$s skadoi",
+ "The public link of %2$s for %1$s expired" : "Lidhja publike e %2$s për %1$s skadoi",
+ "%2$s shared %1$s with you" : "%2$s ndau %1$s me ju",
+ "%2$s removed the share for %1$s" : "%2$s hoqi ndarjen për %1$s",
"Downloaded via public link" : "Shkarkuar përmes një lidhjeje publike",
"Shared with %2$s" : "U nda me %2$s",
- "Shared with group %2$s" : "U nda me grupin %2$s",
"Shared with %3$s by %2$s" : "U nda me %3$s nga %2$s",
+ "Removed share for %2$s" : "Hoqi ndarjen për %2$s",
+ "%2$s removed share for %3$s" : "%2$s hoqi ndarjen për %3$s",
+ "Shared with group %2$s" : "U nda me grupin %2$s",
"Shared with group %3$s by %2$s" : "U nda me grupin %3$s nga %2$s",
+ "Removed share of group %2$s" : "Hoqi ndarjen e grupit %2$s",
+ "%2$s removed share of group %3$s" : "%2$s hoqi ndarjen e grupit %3$s",
"Shared via link by %2$s" : "U nda përmes një lidhje nga %2$s",
- "Shared by %2$s" : "U nda nga %2$s",
"Shared via public link" : "U nda përmes një lidhje publike",
+ "Removed public link" : "Hoqi lidhje publike",
+ "%2$s removed public link" : "%2$s hoqi lidhje publike",
+ "Public link expired" : "Lidhja publike skadoi",
+ "Public link of %2$s expired" : "Lidhja publike e %2$s skadoi",
+ "Shared by %2$s" : "U nda nga %2$s",
"Shares" : "Ndarje",
+ "You received \"/%2$s\" as a remote share from %1$s" : "Ju erdhi \"/%2$s\" si ndarje e largët prej %1$s",
"Accept" : "Pranoje",
"Decline" : "Hidhe poshtë",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ndani me mua përmes ID-së time për #ownCloud Federated Cloud, shihni %s",
diff --git a/apps/files_sharing/l10n/sr.js b/apps/files_sharing/l10n/sr.js
index ddb15bd2183..a9452e14890 100644
--- a/apps/files_sharing/l10n/sr.js
+++ b/apps/files_sharing/l10n/sr.js
@@ -37,8 +37,8 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Јавно дељени фајл %1$s је преузет",
"You shared %1$s with %2$s" : "Поделили сте %1$s са %2$s",
"You shared %1$s with group %2$s" : "Поделили сте %1$s са групом %2$s",
- "%2$s shared %1$s with you" : "%2$s подели %1$s са вама",
"You shared %1$s via link" : "Поделили сте %1$s путем везе",
+ "%2$s shared %1$s with you" : "%2$s подели %1$s са вама",
"Shares" : "Дељења",
"Accept" : "Прихвати",
"This share is password-protected" : "Дељење је заштићено лозинком",
diff --git a/apps/files_sharing/l10n/sr.json b/apps/files_sharing/l10n/sr.json
index dc44b1fbb60..96d0e37bea5 100644
--- a/apps/files_sharing/l10n/sr.json
+++ b/apps/files_sharing/l10n/sr.json
@@ -35,8 +35,8 @@
"Public shared file %1$s was downloaded" : "Јавно дељени фајл %1$s је преузет",
"You shared %1$s with %2$s" : "Поделили сте %1$s са %2$s",
"You shared %1$s with group %2$s" : "Поделили сте %1$s са групом %2$s",
- "%2$s shared %1$s with you" : "%2$s подели %1$s са вама",
"You shared %1$s via link" : "Поделили сте %1$s путем везе",
+ "%2$s shared %1$s with you" : "%2$s подели %1$s са вама",
"Shares" : "Дељења",
"Accept" : "Прихвати",
"This share is password-protected" : "Дељење је заштићено лозинком",
diff --git a/apps/files_sharing/l10n/sr@latin.js b/apps/files_sharing/l10n/sr@latin.js
index 32f2b298855..d9ea5a22416 100644
--- a/apps/files_sharing/l10n/sr@latin.js
+++ b/apps/files_sharing/l10n/sr@latin.js
@@ -33,8 +33,8 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Javni deljeni fajl %1$s je preuzet",
"You shared %1$s with %2$s" : "Delili ste %1$s sa %2$s",
"You shared %1$s with group %2$s" : "Delili ste %1$s sa grupom %2$s",
- "%2$s shared %1$s with you" : "%2$s je delio %1$s sa Vama",
"You shared %1$s via link" : "Delili ste %1$s pomoću prečice",
+ "%2$s shared %1$s with you" : "%2$s je delio %1$s sa Vama",
"Shares" : "Deljenja",
"This share is password-protected" : "Ovaj deljeni resurs je zaštićen lozinkom",
"The password is wrong. Try again." : "Lozinka je netačna. Pokušajte ponovo.",
diff --git a/apps/files_sharing/l10n/sr@latin.json b/apps/files_sharing/l10n/sr@latin.json
index aae286962f2..8cba518384e 100644
--- a/apps/files_sharing/l10n/sr@latin.json
+++ b/apps/files_sharing/l10n/sr@latin.json
@@ -31,8 +31,8 @@
"Public shared file %1$s was downloaded" : "Javni deljeni fajl %1$s je preuzet",
"You shared %1$s with %2$s" : "Delili ste %1$s sa %2$s",
"You shared %1$s with group %2$s" : "Delili ste %1$s sa grupom %2$s",
- "%2$s shared %1$s with you" : "%2$s je delio %1$s sa Vama",
"You shared %1$s via link" : "Delili ste %1$s pomoću prečice",
+ "%2$s shared %1$s with you" : "%2$s je delio %1$s sa Vama",
"Shares" : "Deljenja",
"This share is password-protected" : "Ovaj deljeni resurs je zaštićen lozinkom",
"The password is wrong. Try again." : "Lozinka je netačna. Pokušajte ponovo.",
diff --git a/apps/files_sharing/l10n/sv.js b/apps/files_sharing/l10n/sv.js
index 47f5f6b368c..d2357c0de33 100644
--- a/apps/files_sharing/l10n/sv.js
+++ b/apps/files_sharing/l10n/sv.js
@@ -33,8 +33,8 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Publikt delad fil %1$s blev nerladdad",
"You shared %1$s with %2$s" : "Du delade %1$s med %2$s",
"You shared %1$s with group %2$s" : "Du delade %1$s med grupp %2$s",
- "%2$s shared %1$s with you" : "%2$s delade %1$s med dig",
"You shared %1$s via link" : "Du delade %1$s via länk",
+ "%2$s shared %1$s with you" : "%2$s delade %1$s med dig",
"Shares" : "Delningar",
"Accept" : "Acceptera",
"This share is password-protected" : "Den här delningen är lösenordsskyddad",
diff --git a/apps/files_sharing/l10n/sv.json b/apps/files_sharing/l10n/sv.json
index b20343b3594..9331d95aafb 100644
--- a/apps/files_sharing/l10n/sv.json
+++ b/apps/files_sharing/l10n/sv.json
@@ -31,8 +31,8 @@
"Public shared file %1$s was downloaded" : "Publikt delad fil %1$s blev nerladdad",
"You shared %1$s with %2$s" : "Du delade %1$s med %2$s",
"You shared %1$s with group %2$s" : "Du delade %1$s med grupp %2$s",
- "%2$s shared %1$s with you" : "%2$s delade %1$s med dig",
"You shared %1$s via link" : "Du delade %1$s via länk",
+ "%2$s shared %1$s with you" : "%2$s delade %1$s med dig",
"Shares" : "Delningar",
"Accept" : "Acceptera",
"This share is password-protected" : "Den här delningen är lösenordsskyddad",
diff --git a/apps/files_sharing/l10n/ta_IN.js b/apps/files_sharing/l10n/ta_IN.js
index 6a7e3897cc8..265649f9174 100644
--- a/apps/files_sharing/l10n/ta_IN.js
+++ b/apps/files_sharing/l10n/ta_IN.js
@@ -4,8 +4,8 @@ OC.L10N.register(
"A file or folder has been <strong>shared</strong>" : "ஒரு கோப்புறை அல்லது ஆவணம் <strong> பகிர்வு செய்யப்பட்டுள்ளது.</strong>",
"You shared %1$s with %2$s" : "நீங்கள் %1$s 'ஐ %2$s உடன் பகிர்ந்துள்ளிர்கள். ",
"You shared %1$s with group %2$s" : "நீங்கள் %1$s 'ஐ %2$s குழுவுடன் உடன் பகிர்ந்துள்ளிர்கள்.",
- "%2$s shared %1$s with you" : "%2$s %1$s 'ஐ உங்களுடன் பகிர்ந்துள்ளார்.",
"You shared %1$s via link" : "நீங்கள் %1$s 'ஐ இணைப்பு மூலம் பகிர்ந்துள்ளிர்கள்.",
+ "%2$s shared %1$s with you" : "%2$s %1$s 'ஐ உங்களுடன் பகிர்ந்துள்ளார்.",
"Shares" : "பகிர்வுகள் "
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/ta_IN.json b/apps/files_sharing/l10n/ta_IN.json
index 5b7f88827a4..a79218f2374 100644
--- a/apps/files_sharing/l10n/ta_IN.json
+++ b/apps/files_sharing/l10n/ta_IN.json
@@ -2,8 +2,8 @@
"A file or folder has been <strong>shared</strong>" : "ஒரு கோப்புறை அல்லது ஆவணம் <strong> பகிர்வு செய்யப்பட்டுள்ளது.</strong>",
"You shared %1$s with %2$s" : "நீங்கள் %1$s 'ஐ %2$s உடன் பகிர்ந்துள்ளிர்கள். ",
"You shared %1$s with group %2$s" : "நீங்கள் %1$s 'ஐ %2$s குழுவுடன் உடன் பகிர்ந்துள்ளிர்கள்.",
- "%2$s shared %1$s with you" : "%2$s %1$s 'ஐ உங்களுடன் பகிர்ந்துள்ளார்.",
"You shared %1$s via link" : "நீங்கள் %1$s 'ஐ இணைப்பு மூலம் பகிர்ந்துள்ளிர்கள்.",
+ "%2$s shared %1$s with you" : "%2$s %1$s 'ஐ உங்களுடன் பகிர்ந்துள்ளார்.",
"Shares" : "பகிர்வுகள் "
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js
index 692ef9b42b9..ccb2835faf4 100644
--- a/apps/files_sharing/l10n/th_TH.js
+++ b/apps/files_sharing/l10n/th_TH.js
@@ -38,20 +38,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "โฟลเดอร์สาธารณะ %1$s ที่แชร์ถูกดาวน์โหลด",
"Public shared file %1$s was downloaded" : "ไฟล์สาธารณะ %1$s ที่แชร์ถูกดาวน์โหลด",
"You shared %1$s with %2$s" : "คุณแชร์ %1$s กับ %2$s",
- "You shared %1$s with group %2$s" : "คุณแชร์ %1$s กับกลุ่ม %2$s",
"%2$s shared %1$s with %3$s" : "%2$s ได้แชร์ %1$s กับ %3$s",
+ "You shared %1$s with group %2$s" : "คุณแชร์ %1$s กับกลุ่ม %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s ได้แชร์ %1$s กับกลุ่ม %3$s",
"%2$s shared %1$s via link" : "%2$s ได้แชร์ %1$s ผ่านลิงค์",
- "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
"You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
+ "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
"Downloaded via public link" : "ดาวน์โหลดผ่านลิงค์สาธารณะ",
"Shared with %2$s" : "แชร์กับ %2$s",
- "Shared with group %2$s" : "แชร์กับกลุ่ม %2$s",
"Shared with %3$s by %2$s" : "แชร์กับ %3$s โดย %2$s",
+ "Shared with group %2$s" : "แชร์กับกลุ่ม %2$s",
"Shared with group %3$s by %2$s" : "แชร์กับกลุ่ม %3$s โดย %2$s",
"Shared via link by %2$s" : "แชร์ผ่านลิงค์โดย %2$s",
- "Shared by %2$s" : "แชร์โดย %2$s",
"Shared via public link" : "แชร์ผ่านลิงค์สาธารณะ",
+ "Shared by %2$s" : "แชร์โดย %2$s",
"Shares" : "แชร์",
"Accept" : "ยอมรับ",
"Decline" : "ลดลง",
diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json
index e2191fc944c..cfba5c6b1b0 100644
--- a/apps/files_sharing/l10n/th_TH.json
+++ b/apps/files_sharing/l10n/th_TH.json
@@ -36,20 +36,20 @@
"Public shared folder %1$s was downloaded" : "โฟลเดอร์สาธารณะ %1$s ที่แชร์ถูกดาวน์โหลด",
"Public shared file %1$s was downloaded" : "ไฟล์สาธารณะ %1$s ที่แชร์ถูกดาวน์โหลด",
"You shared %1$s with %2$s" : "คุณแชร์ %1$s กับ %2$s",
- "You shared %1$s with group %2$s" : "คุณแชร์ %1$s กับกลุ่ม %2$s",
"%2$s shared %1$s with %3$s" : "%2$s ได้แชร์ %1$s กับ %3$s",
+ "You shared %1$s with group %2$s" : "คุณแชร์ %1$s กับกลุ่ม %2$s",
"%2$s shared %1$s with group %3$s" : "%2$s ได้แชร์ %1$s กับกลุ่ม %3$s",
"%2$s shared %1$s via link" : "%2$s ได้แชร์ %1$s ผ่านลิงค์",
- "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
"You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
+ "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
"Downloaded via public link" : "ดาวน์โหลดผ่านลิงค์สาธารณะ",
"Shared with %2$s" : "แชร์กับ %2$s",
- "Shared with group %2$s" : "แชร์กับกลุ่ม %2$s",
"Shared with %3$s by %2$s" : "แชร์กับ %3$s โดย %2$s",
+ "Shared with group %2$s" : "แชร์กับกลุ่ม %2$s",
"Shared with group %3$s by %2$s" : "แชร์กับกลุ่ม %3$s โดย %2$s",
"Shared via link by %2$s" : "แชร์ผ่านลิงค์โดย %2$s",
- "Shared by %2$s" : "แชร์โดย %2$s",
"Shared via public link" : "แชร์ผ่านลิงค์สาธารณะ",
+ "Shared by %2$s" : "แชร์โดย %2$s",
"Shares" : "แชร์",
"Accept" : "ยอมรับ",
"Decline" : "ลดลง",
diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js
index 5501abab3c6..111ada67e6c 100644
--- a/apps/files_sharing/l10n/tr.js
+++ b/apps/files_sharing/l10n/tr.js
@@ -37,20 +37,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "Herkese açık paylaşılan klasör %1$s indirildi",
"Public shared file %1$s was downloaded" : "Herkese açık paylaşılan dosya %1$s indirildi",
"You shared %1$s with %2$s" : "%1$s dosyasını %2$s ile paylaştınız",
- "You shared %1$s with group %2$s" : "%1$s dosyasını %2$s grubu ile paylaştınız",
"%2$s shared %1$s with %3$s" : "%2$s %3$s ile %1$s dosyasını paylaştı",
+ "You shared %1$s with group %2$s" : "%1$s dosyasını %2$s grubu ile paylaştınız",
"%2$s shared %1$s with group %3$s" : "%2$s %3$s grubu ile %1$s dosyasını paylaştı",
"%2$s shared %1$s via link" : "%2$s bağlantı ile %1$s dosyasını paylaştı",
- "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı",
"You shared %1$s via link" : "Bağlantı ile %1$s paylaşımını yaptınız",
+ "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı",
"Downloaded via public link" : "Herkese açık bağlantı ile indirildi",
"Shared with %2$s" : "%2$s ile paylaşıldı",
- "Shared with group %2$s" : "%2$s grubu ile paylaşıldı",
"Shared with %3$s by %2$s" : "%3$s ile %2$s tarafından paylaşıldı",
+ "Shared with group %2$s" : "%2$s grubu ile paylaşıldı",
"Shared with group %3$s by %2$s" : "%2$s tarafından %3$s grubu ile paylaşıldı",
"Shared via link by %2$s" : "%2$s tarafından bağlantı ile paylaşıldı",
- "Shared by %2$s" : "%2$s tarafından paylaşıldı",
"Shared via public link" : "Herkese açık bağlantı ile paylaşıldı",
+ "Shared by %2$s" : "%2$s tarafından paylaşıldı",
"Shares" : "Paylaşımlar",
"Accept" : "Kabul et",
"Decline" : "Reddet",
diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json
index d0a6a5e6f0f..390909842cd 100644
--- a/apps/files_sharing/l10n/tr.json
+++ b/apps/files_sharing/l10n/tr.json
@@ -35,20 +35,20 @@
"Public shared folder %1$s was downloaded" : "Herkese açık paylaşılan klasör %1$s indirildi",
"Public shared file %1$s was downloaded" : "Herkese açık paylaşılan dosya %1$s indirildi",
"You shared %1$s with %2$s" : "%1$s dosyasını %2$s ile paylaştınız",
- "You shared %1$s with group %2$s" : "%1$s dosyasını %2$s grubu ile paylaştınız",
"%2$s shared %1$s with %3$s" : "%2$s %3$s ile %1$s dosyasını paylaştı",
+ "You shared %1$s with group %2$s" : "%1$s dosyasını %2$s grubu ile paylaştınız",
"%2$s shared %1$s with group %3$s" : "%2$s %3$s grubu ile %1$s dosyasını paylaştı",
"%2$s shared %1$s via link" : "%2$s bağlantı ile %1$s dosyasını paylaştı",
- "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı",
"You shared %1$s via link" : "Bağlantı ile %1$s paylaşımını yaptınız",
+ "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı",
"Downloaded via public link" : "Herkese açık bağlantı ile indirildi",
"Shared with %2$s" : "%2$s ile paylaşıldı",
- "Shared with group %2$s" : "%2$s grubu ile paylaşıldı",
"Shared with %3$s by %2$s" : "%3$s ile %2$s tarafından paylaşıldı",
+ "Shared with group %2$s" : "%2$s grubu ile paylaşıldı",
"Shared with group %3$s by %2$s" : "%2$s tarafından %3$s grubu ile paylaşıldı",
"Shared via link by %2$s" : "%2$s tarafından bağlantı ile paylaşıldı",
- "Shared by %2$s" : "%2$s tarafından paylaşıldı",
"Shared via public link" : "Herkese açık bağlantı ile paylaşıldı",
+ "Shared by %2$s" : "%2$s tarafından paylaşıldı",
"Shares" : "Paylaşımlar",
"Accept" : "Kabul et",
"Decline" : "Reddet",
diff --git a/apps/files_sharing/l10n/uk.js b/apps/files_sharing/l10n/uk.js
index 80c28c8a936..b122664beca 100644
--- a/apps/files_sharing/l10n/uk.js
+++ b/apps/files_sharing/l10n/uk.js
@@ -37,8 +37,8 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Опублікований файл %1$s був завантажений",
"You shared %1$s with %2$s" : "Ви поділилися %1$s з %2$s",
"You shared %1$s with group %2$s" : "Ви поділилися %1$s з групою %2$s",
- "%2$s shared %1$s with you" : "%2$s поділився %1$s з вами",
"You shared %1$s via link" : "Ви поділилися %1$s використовуючи лінк",
+ "%2$s shared %1$s with you" : "%2$s поділився %1$s з вами",
"Shares" : "Розподільні",
"This share is password-protected" : "Цей ресурс обміну захищений паролем",
"The password is wrong. Try again." : "Невірний пароль. Спробуйте ще раз.",
diff --git a/apps/files_sharing/l10n/uk.json b/apps/files_sharing/l10n/uk.json
index 0b5de75ac5a..363a02ed7ed 100644
--- a/apps/files_sharing/l10n/uk.json
+++ b/apps/files_sharing/l10n/uk.json
@@ -35,8 +35,8 @@
"Public shared file %1$s was downloaded" : "Опублікований файл %1$s був завантажений",
"You shared %1$s with %2$s" : "Ви поділилися %1$s з %2$s",
"You shared %1$s with group %2$s" : "Ви поділилися %1$s з групою %2$s",
- "%2$s shared %1$s with you" : "%2$s поділився %1$s з вами",
"You shared %1$s via link" : "Ви поділилися %1$s використовуючи лінк",
+ "%2$s shared %1$s with you" : "%2$s поділився %1$s з вами",
"Shares" : "Розподільні",
"This share is password-protected" : "Цей ресурс обміну захищений паролем",
"The password is wrong. Try again." : "Невірний пароль. Спробуйте ще раз.",
diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js
index c62e6a47621..edcc9714799 100644
--- a/apps/files_sharing/l10n/zh_CN.js
+++ b/apps/files_sharing/l10n/zh_CN.js
@@ -21,8 +21,8 @@ OC.L10N.register(
"You received a new remote share from %s" : "您从%s收到了新的远程分享",
"You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s",
"You shared %1$s with group %2$s" : "你把 %1$s 分享给了 %2$s 组",
- "%2$s shared %1$s with you" : "%2$s 把 %1$s 分享给了您",
"You shared %1$s via link" : "您通过链接共享了 %1$s",
+ "%2$s shared %1$s with you" : "%2$s 把 %1$s 分享给了您",
"Shares" : "共享",
"This share is password-protected" : "这是一个密码保护的共享",
"The password is wrong. Try again." : "用户名或密码错误!请重试",
diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json
index 5496d90bea1..eef54c49e15 100644
--- a/apps/files_sharing/l10n/zh_CN.json
+++ b/apps/files_sharing/l10n/zh_CN.json
@@ -19,8 +19,8 @@
"You received a new remote share from %s" : "您从%s收到了新的远程分享",
"You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s",
"You shared %1$s with group %2$s" : "你把 %1$s 分享给了 %2$s 组",
- "%2$s shared %1$s with you" : "%2$s 把 %1$s 分享给了您",
"You shared %1$s via link" : "您通过链接共享了 %1$s",
+ "%2$s shared %1$s with you" : "%2$s 把 %1$s 分享给了您",
"Shares" : "共享",
"This share is password-protected" : "这是一个密码保护的共享",
"The password is wrong. Try again." : "用户名或密码错误!请重试",
diff --git a/apps/files_sharing/l10n/zh_TW.js b/apps/files_sharing/l10n/zh_TW.js
index 39f57a656eb..a3de7a5ef4a 100644
--- a/apps/files_sharing/l10n/zh_TW.js
+++ b/apps/files_sharing/l10n/zh_TW.js
@@ -38,20 +38,20 @@ OC.L10N.register(
"Public shared folder %1$s was downloaded" : "共享資料夾 %1$s 已被下載",
"Public shared file %1$s was downloaded" : "共享檔案 %1$s 已被下載",
"You shared %1$s with %2$s" : "您與 %2$s 分享了 %1$s",
- "You shared %1$s with group %2$s" : "您與 %2$s 群組分享了 %1$s",
"%2$s shared %1$s with %3$s" : "%2$s 與 %3$s 分享了 %1$s",
+ "You shared %1$s with group %2$s" : "您與 %2$s 群組分享了 %1$s",
"%2$s shared %1$s with group %3$s" : "%2$s 與群組 %3$s 分享了 %1$s",
"%2$s shared %1$s via link" : "%2$s 透過連結分享了 %1$s ",
- "%2$s shared %1$s with you" : "%2$s 與您分享了 %1$s",
"You shared %1$s via link" : "您以連結分享了 %1$s",
+ "%2$s shared %1$s with you" : "%2$s 與您分享了 %1$s",
"Downloaded via public link" : "透過公用連結下載",
"Shared with %2$s" : "與 %2$s 分享",
- "Shared with group %2$s" : "與群組 %2$s 分享",
"Shared with %3$s by %2$s" : "透過 %2$s 與 %3$s 分享",
+ "Shared with group %2$s" : "與群組 %2$s 分享",
"Shared with group %3$s by %2$s" : "透過 %2$s 與群組 %3$s 分享",
"Shared via link by %2$s" : "%2$s 透過連結分享",
- "Shared by %2$s" : "由 %2$s 分享",
"Shared via public link" : "透過公用連結分享",
+ "Shared by %2$s" : "由 %2$s 分享",
"Shares" : "分享",
"Accept" : "接受",
"Decline" : "拒絕",
diff --git a/apps/files_sharing/l10n/zh_TW.json b/apps/files_sharing/l10n/zh_TW.json
index 8b2716b1c0a..7a237c1c58a 100644
--- a/apps/files_sharing/l10n/zh_TW.json
+++ b/apps/files_sharing/l10n/zh_TW.json
@@ -36,20 +36,20 @@
"Public shared folder %1$s was downloaded" : "共享資料夾 %1$s 已被下載",
"Public shared file %1$s was downloaded" : "共享檔案 %1$s 已被下載",
"You shared %1$s with %2$s" : "您與 %2$s 分享了 %1$s",
- "You shared %1$s with group %2$s" : "您與 %2$s 群組分享了 %1$s",
"%2$s shared %1$s with %3$s" : "%2$s 與 %3$s 分享了 %1$s",
+ "You shared %1$s with group %2$s" : "您與 %2$s 群組分享了 %1$s",
"%2$s shared %1$s with group %3$s" : "%2$s 與群組 %3$s 分享了 %1$s",
"%2$s shared %1$s via link" : "%2$s 透過連結分享了 %1$s ",
- "%2$s shared %1$s with you" : "%2$s 與您分享了 %1$s",
"You shared %1$s via link" : "您以連結分享了 %1$s",
+ "%2$s shared %1$s with you" : "%2$s 與您分享了 %1$s",
"Downloaded via public link" : "透過公用連結下載",
"Shared with %2$s" : "與 %2$s 分享",
- "Shared with group %2$s" : "與群組 %2$s 分享",
"Shared with %3$s by %2$s" : "透過 %2$s 與 %3$s 分享",
+ "Shared with group %2$s" : "與群組 %2$s 分享",
"Shared with group %3$s by %2$s" : "透過 %2$s 與群組 %3$s 分享",
"Shared via link by %2$s" : "%2$s 透過連結分享",
- "Shared by %2$s" : "由 %2$s 分享",
"Shared via public link" : "透過公用連結分享",
+ "Shared by %2$s" : "由 %2$s 分享",
"Shares" : "分享",
"Accept" : "接受",
"Decline" : "拒絕",
diff --git a/apps/files_sharing/lib/migration.php b/apps/files_sharing/lib/migration.php
index e7346385510..31a76687d40 100644
--- a/apps/files_sharing/lib/migration.php
+++ b/apps/files_sharing/lib/migration.php
@@ -55,32 +55,30 @@ class Migration {
*/
public function removeReShares() {
- while(true) {
- $reShares = $this->getReShares(1000);
+ $stmt = $this->getReShares();
- if (empty($reShares)) {
- break;
- }
+ $owners = [];
+ while($share = $stmt->fetch()) {
- // Update the cache
- foreach($reShares as $reShare) {
- $this->shareCache[$reShare['id']] = $reShare;
- }
+ $this->shareCache[$share['id']] = $share;
- $owners = [];
- foreach ($reShares as $share) {
- $owners[$share['id']] = [
+ $owners[$share['id']] = [
'owner' => $this->findOwner($share),
- 'initiator' => $share['uid_owner']
- ];
- }
- $this->updateOwners($owners);
+ 'initiator' => $share['uid_owner'],
+ 'type' => $share['share_type'],
+ ];
- //Clear the cache of the shares we just updated so we have more room
- foreach($owners as $id => $owner) {
- unset($this->shareCache[$id]);
+ if (count($owners) === 1000) {
+ $this->updateOwners($owners);
+ $owners = [];
}
}
+
+ $stmt->closeCursor();
+
+ if (count($owners)) {
+ $this->updateOwners($owners);
+ }
}
/**
@@ -99,7 +97,8 @@ class Migration {
foreach ($shares as $share) {
$owners[$share['id']] = [
'owner' => $share['uid_owner'],
- 'initiator' => $share['uid_owner']
+ 'initiator' => $share['uid_owner'],
+ 'type' => $share['share_type'],
];
}
$this->updateOwners($owners);
@@ -130,11 +129,11 @@ class Migration {
* Get $n re-shares from the database
*
* @param int $n The max number of shares to fetch
- * @return array
+ * @return \Doctrine\DBAL\Driver\Statement
*/
- private function getReShares($n = 1000) {
+ private function getReShares() {
$query = $this->connection->getQueryBuilder();
- $query->select(['id', 'parent', 'uid_owner'])
+ $query->select(['id', 'parent', 'uid_owner', 'share_type'])
->from($this->table)
->where($query->expr()->in(
'share_type',
@@ -156,9 +155,10 @@ class Migration {
)
))
->andWhere($query->expr()->isNotNull('parent'))
- ->orderBy('id', 'asc')
- ->setMaxResults($n);
- $result = $query->execute();
+ ->orderBy('id', 'asc');
+ return $query->execute();
+
+
$shares = $result->fetchAll();
$result->closeCursor();
@@ -178,7 +178,7 @@ class Migration {
*/
private function getMissingInitiator($n = 1000) {
$query = $this->connection->getQueryBuilder();
- $query->select(['id', 'uid_owner'])
+ $query->select(['id', 'uid_owner', 'share_type'])
->from($this->table)
->where($query->expr()->in(
'share_type',
@@ -247,11 +247,17 @@ class Migration {
foreach ($owners as $id => $owner) {
$query = $this->connection->getQueryBuilder();
$query->update($this->table)
- ->set('parent', $query->createNamedParameter(null))
->set('uid_owner', $query->createNamedParameter($owner['owner']))
- ->set('uid_initiator', $query->createNamedParameter($owner['initiator']))
- ->where($query->expr()->eq('id', $query->createNamedParameter($id)))
- ->execute();
+ ->set('uid_initiator', $query->createNamedParameter($owner['initiator']));
+
+
+ if ((int)$owner['type'] !== \OCP\Share::SHARE_TYPE_LINK) {
+ $query->set('parent', $query->createNamedParameter(null));
+ }
+
+ $query->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+
+ $query->execute();
}
$this->connection->commit();
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index 49a08d3d0ce..3a2ae1eef37 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -40,6 +40,9 @@ class Test_Files_Sharing_Api extends TestCase {
private static $tempStorage;
+ /** @var \OCP\Share\IManager */
+ private $shareManager;
+
protected function setUp() {
parent::setUp();
@@ -59,6 +62,8 @@ class Test_Files_Sharing_Api extends TestCase {
$this->view->mkdir($this->folder . $this->subfolder . $this->subsubfolder);
$this->view->file_put_contents($this->folder.$this->filename, $this->data);
$this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data);
+
+ $this->shareManager = \OC::$server->getShareManager();
}
protected function tearDown() {
@@ -73,6 +78,40 @@ class Test_Files_Sharing_Api extends TestCase {
}
/**
+ * @param array $data
+ * @return \OCP\IRequest
+ */
+ private function createRequest(array $data) {
+ $request = $this->getMock('\OCP\IRequest');
+ $request->method('getParam')
+ ->will($this->returnCallback(function($param, $default = null) use ($data) {
+ if (isset($data[$param])) {
+ return $data[$param];
+ }
+ return $default;
+ }));
+ return $request;
+ }
+
+ /**
+ * @param \OCP\IRequest $request
+ * @param string $userId The userId of the caller
+ * @return \OCA\Files_Sharing\API\Share20OCS
+ */
+ private function createOCS($request, $userId) {
+ $currentUser = \OC::$server->getUserManager()->get($userId);
+ return new \OCA\Files_Sharing\API\Share20OCS(
+ $this->shareManager,
+ \OC::$server->getGroupManager(),
+ \OC::$server->getUserManager(),
+ $request,
+ \OC::$server->getRootFolder(),
+ \OC::$server->getURLGenerator(),
+ $currentUser
+ );
+ }
+
+ /**
* @medium
*/
function testCreateShareUserFile() {
@@ -1725,4 +1764,85 @@ class Test_Files_Sharing_Api extends TestCase {
$config->setAppValue('core', 'shareapi_enforce_expire_date', 'no');
}
+ /**
+ * test for no invisible shares
+ * See: https://github.com/owncloud/core/issues/22295
+ */
+ public function testInvisibleSharesUser() {
+ // simulate a post request
+ $request = $this->createRequest([
+ 'path' => $this->folder,
+ 'shareWith' => self::TEST_FILES_SHARING_API_USER2,
+ 'shareType' => \OCP\Share::SHARE_TYPE_USER
+ ]);
+ $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1);
+ $result = $ocs->createShare();
+ $this->assertTrue($result->succeeded());
+ $data = $result->getData();
+
+ $topId = $data['id'];
+
+ $request = $this->createRequest([
+ 'path' => $this->folder . $this->subfolder,
+ 'shareType' => \OCP\Share::SHARE_TYPE_LINK,
+ ]);
+ $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER2);
+ $result = $ocs->createShare();
+ $this->assertTrue($result->succeeded());
+
+ $request = $this->createRequest([]);
+ $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1);
+ $result = $ocs->deleteShare($topId);
+ $this->assertTrue($result->succeeded());
+
+ $request = $this->createRequest([
+ 'reshares' => 'true',
+ ]);
+ $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1);
+ $result = $ocs->getShares();
+ $this->assertTrue($result->succeeded());
+
+ $this->assertEmpty($result->getData());
+ }
+
+ /**
+ * test for no invisible shares
+ * See: https://github.com/owncloud/core/issues/22295
+ */
+ public function testInvisibleSharesGroup() {
+ // simulate a post request
+ $request = $this->createRequest([
+ 'path' => $this->folder,
+ 'shareWith' => self::TEST_FILES_SHARING_API_GROUP1,
+ 'shareType' => \OCP\Share::SHARE_TYPE_GROUP
+ ]);
+ $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1);
+ $result = $ocs->createShare();
+ $this->assertTrue($result->succeeded());
+ $data = $result->getData();
+
+ $topId = $data['id'];
+
+ $request = $this->createRequest([
+ 'path' => $this->folder . $this->subfolder,
+ 'shareType' => \OCP\Share::SHARE_TYPE_LINK,
+ ]);
+ $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER2);
+ $result = $ocs->createShare();
+ $this->assertTrue($result->succeeded());
+
+ $request = $this->createRequest([]);
+ $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1);
+ $result = $ocs->deleteShare($topId);
+ $this->assertTrue($result->succeeded());
+
+ $request = $this->createRequest([
+ 'reshares' => 'true',
+ ]);
+ $ocs = $this->createOCS($request, self::TEST_FILES_SHARING_API_USER1);
+ $result = $ocs->getShares();
+ $this->assertTrue($result->succeeded());
+
+ $this->assertEmpty($result->getData());
+ }
}
diff --git a/apps/files_sharing/tests/migrationtest.php b/apps/files_sharing/tests/migrationtest.php
index 8a40b76a642..1bca4a419f3 100644
--- a/apps/files_sharing/tests/migrationtest.php
+++ b/apps/files_sharing/tests/migrationtest.php
@@ -226,6 +226,23 @@ class MigrationTest extends TestCase {
$this->assertSame(1,
$query->execute()
);
+
+ // Link reshare should keep its parent
+ $query->setParameter('share_type', \OCP\Share::SHARE_TYPE_LINK)
+ ->setParameter('share_with', null)
+ ->setParameter('uid_owner', 'user3')
+ ->setParameter('uid_initiator', '')
+ ->setParameter('parent', $parent)
+ ->setParameter('item_type', 'file')
+ ->setParameter('item_source', '2')
+ ->setParameter('item_target', '/2')
+ ->setParameter('file_source', 2)
+ ->setParameter('file_target', '/foobar')
+ ->setParameter('permissions', 31)
+ ->setParameter('stime', time());
+ $this->assertSame(1,
+ $query->execute()
+ );
}
public function testRemoveReShares() {
@@ -238,7 +255,7 @@ class MigrationTest extends TestCase {
$query = $this->connection->getQueryBuilder();
$query->select('*')->from($this->table)->orderBy('id');
$result = $query->execute()->fetchAll();
- $this->assertSame(9, count($result));
+ $this->assertSame(10, count($result));
// shares which shouldn't be modified
for ($i = 0; $i < 4; $i++) {
@@ -261,6 +278,14 @@ class MigrationTest extends TestCase {
$this->assertSame($user, $result[$i]['uid_initiator']);
$this->assertNull($result[$i]['parent']);
}
+
+ /*
+ * The link share is flattend but has an owner to avoid invisible shares
+ * see: https://github.com/owncloud/core/pull/22317
+ */
+ $this->assertSame('owner2', $result[9]['uid_owner']);
+ $this->assertSame('user3', $result[9]['uid_initiator']);
+ $this->assertSame($result[7]['id'], $result[9]['parent']);
}
public function test1001DeepReshares() {
diff --git a/apps/updatenotification/appinfo/app.php b/apps/updatenotification/appinfo/app.php
index 99df99ac7c9..9148b6e6ef7 100644
--- a/apps/updatenotification/appinfo/app.php
+++ b/apps/updatenotification/appinfo/app.php
@@ -34,8 +34,7 @@ if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) {
if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) && $updateChecker->getUpdateState() !== []) {
\OCP\Util::addScript('updatenotification', 'notification');
OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
+ \OC_App::registerAdmin('updatenotification', 'admin');
}
}
-
- \OC_App::registerAdmin('updatenotification', 'admin');
}
diff --git a/apps/user_ldap/l10n/he.js b/apps/user_ldap/l10n/he.js
index 0e4b78f0373..ef8976f9439 100644
--- a/apps/user_ldap/l10n/he.js
+++ b/apps/user_ldap/l10n/he.js
@@ -115,14 +115,24 @@ OC.L10N.register(
"Directory Settings" : "הגדרות תיקייה",
"User Display Name Field" : "שדה שם תצוגה למשתמש",
"Base User Tree" : "עץ משתמש בסיסי",
+ "User Search Attributes" : "מאפייני חיפוש משתמש",
+ "Optional; one attribute per line" : "אופציונאלי; מאפיין אחד בשורה",
+ "Group Display Name Field" : "שדה שם תצוגה לקבוצה",
"Base Group Tree" : "עץ קבוצה בסיסי",
"Group Search Attributes" : "מאפייני חיפוש קבוצה",
+ "Dynamic Group Member URL" : "נתיב חבר קבוצה דינמית",
"Special Attributes" : "מאפיינים מיוחדים",
"Quota Field" : "שדה מכסה",
"Quota Default" : "ברירת מחדל מכסה",
"in bytes" : "בבתים",
"Email Field" : "שדה דואר אלקטרוני",
"Internal Username" : "שם משתמש פנימי",
- "Internal Username Attribute:" : "מאפיין שם משתמש פנימי:"
+ "Internal Username Attribute:" : "מאפיין שם משתמש פנימי:",
+ "Override UUID detection" : "דריסת זיהוי UUID",
+ "UUID Attribute for Users:" : "מאפייני UUID למשתמשים:",
+ "UUID Attribute for Groups:" : "מאפייני UUID לקבוצות:",
+ "Username-LDAP User Mapping" : "מיפוי שם משתמש LDAP:",
+ "Clear Username-LDAP User Mapping" : "ניקוי מיפוי שם משתמש LDAP:",
+ "Clear Groupname-LDAP Group Mapping" : "ניקוי מיפוי שם משתמש קבוצה LDAP:"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/he.json b/apps/user_ldap/l10n/he.json
index 21b0cbb70a4..dfbdf689873 100644
--- a/apps/user_ldap/l10n/he.json
+++ b/apps/user_ldap/l10n/he.json
@@ -113,14 +113,24 @@
"Directory Settings" : "הגדרות תיקייה",
"User Display Name Field" : "שדה שם תצוגה למשתמש",
"Base User Tree" : "עץ משתמש בסיסי",
+ "User Search Attributes" : "מאפייני חיפוש משתמש",
+ "Optional; one attribute per line" : "אופציונאלי; מאפיין אחד בשורה",
+ "Group Display Name Field" : "שדה שם תצוגה לקבוצה",
"Base Group Tree" : "עץ קבוצה בסיסי",
"Group Search Attributes" : "מאפייני חיפוש קבוצה",
+ "Dynamic Group Member URL" : "נתיב חבר קבוצה דינמית",
"Special Attributes" : "מאפיינים מיוחדים",
"Quota Field" : "שדה מכסה",
"Quota Default" : "ברירת מחדל מכסה",
"in bytes" : "בבתים",
"Email Field" : "שדה דואר אלקטרוני",
"Internal Username" : "שם משתמש פנימי",
- "Internal Username Attribute:" : "מאפיין שם משתמש פנימי:"
+ "Internal Username Attribute:" : "מאפיין שם משתמש פנימי:",
+ "Override UUID detection" : "דריסת זיהוי UUID",
+ "UUID Attribute for Users:" : "מאפייני UUID למשתמשים:",
+ "UUID Attribute for Groups:" : "מאפייני UUID לקבוצות:",
+ "Username-LDAP User Mapping" : "מיפוי שם משתמש LDAP:",
+ "Clear Username-LDAP User Mapping" : "ניקוי מיפוי שם משתמש LDAP:",
+ "Clear Groupname-LDAP Group Mapping" : "ניקוי מיפוי שם משתמש קבוצה LDAP:"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/autotest.sh b/autotest.sh
index 5196d5c31d5..48b73283499 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -185,17 +185,19 @@ function execute_tests {
if [ ! -z "$USEDOCKER" ] ; then
echo "Fire up the mariadb docker"
DOCKER_CONTAINER_ID=$(docker run \
+ -v $BASEDIR/tests/docker/mariadb:/etc/mysql/conf.d \
-e MYSQL_ROOT_PASSWORD=owncloud \
-e MYSQL_USER="$DATABASEUSER" \
-e MYSQL_PASSWORD=owncloud \
-e MYSQL_DATABASE="$DATABASENAME" \
- -d rullzer/mariadb-owncloud)
+ -d mariadb)
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
echo "Waiting for MariaDB initialisation ..."
-
- # grep exits on the first match and then the script continues
- timeout 30 docker logs -f $DOCKER_CONTAINER_ID 2>&1 | grep -q "mysqld: ready for connections."
+ if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 60; then
+ echo "[ERROR] Waited 60 seconds, no response" >&2
+ exit 1
+ fi
echo "MariaDB is up."
diff --git a/core/css/icons.css b/core/css/icons.css
index 836a84fd70e..359c55e4dc5 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -57,6 +57,10 @@
background-image: url('../img/actions/close.svg');
}
+.icon-comment {
+ background-image: url('../img/actions/comment.svg');
+}
+
.icon-confirm {
background-image: url('../img/actions/confirm.svg');
}
@@ -70,6 +74,9 @@
.icon-delete:focus {
background-image: url('../img/actions/delete-hover.svg');
}
+.icon-delete-white {
+ background-image: url('../img/actions/delete-white.svg');
+}
.icon-details {
background-image: url('../img/actions/details.svg');
diff --git a/core/img/actions/comment.png b/core/img/actions/comment.png
index 7ca20eba363..08867cf6361 100644
--- a/core/img/actions/comment.png
+++ b/core/img/actions/comment.png
Binary files differ
diff --git a/core/img/actions/comment.svg b/core/img/actions/comment.svg
index a8ab95e615b..02fbac3e036 100644
--- a/core/img/actions/comment.svg
+++ b/core/img/actions/comment.svg
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m2.3496 1.002c-0.1975 0.0382-0.3531 0.2333-0.3496 0.4375v13.122c0 0.23 0.2061 0.438 0.4316 0.438h11.138c0.226 0 0.432-0.208 0.432-0.438v-10.142c-0.004-0.0669-0.023-0.133-0.055-0.1915l-3.312-3.1992c-0.043-0.0164-0.089-0.0255-0.135-0.0273h-8.0684c-0.0268-0.00265-0.0552-0.00265-0.082 0zm1.6504 1.998h6v1h-6v-1zm0 3h5v1h-5v-1zm0 3h8v1h-8v-1zm0 3h4v1h-4v-1z"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m8 1.5c-4.4183 0-8 2.4624-8 5.5s3.5817 5.5 8 5.5c0.24963 0 0.49058-0.01587 0.73438-0.03125l4.2656 3.531v-4.703c1.829-1.008 3-2.5599 3-4.297 0-3.0376-3.582-5.5-8-5.5z"/>
</svg>
diff --git a/core/img/actions/delete-white.png b/core/img/actions/delete-white.png
new file mode 100644
index 00000000000..07a5de34252
--- /dev/null
+++ b/core/img/actions/delete-white.png
Binary files differ
diff --git a/core/img/actions/delete-white.svg b/core/img/actions/delete-white.svg
new file mode 100644
index 00000000000..58e8dd3677d
--- /dev/null
+++ b/core/img/actions/delete-white.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m6.5 1-0.5 1h-3c-0.554 0-1 0.446-1 1v1h12v-1c0-0.554-0.446-1-1-1h-3l-0.5-1zm-3.5 4 0.875 9c0.061 0.549 0.5729 1 1.125 1h6c0.55232 0 1.064-0.45102 1.125-1l0.875-9z" fill-rule="evenodd" fill="#fff"/>
+</svg>
diff --git a/core/js/share.js b/core/js/share.js
index 9baa34d9bb7..9539e92e09b 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -50,17 +50,29 @@ OC.Share = _.extend(OC.Share || {}, {
* @param callback function to call after the shares were loaded
*/
loadIcons:function(itemType, fileList, callback) {
+ var path = fileList.dirInfo.path;
+ if (path === '/') {
+ path = '';
+ }
+ path += '/' + fileList.dirInfo.name;
+
// Load all share icons
$.get(
- OC.filePath('core', 'ajax', 'share.php'),
+ OC.linkToOCS('apps/files_sharing/api/v1', 2) + 'shares',
{
- fetch: 'getItemsSharedStatuses',
- itemType: itemType
+ subfiles: 'true',
+ path: path,
+ format: 'json'
}, function(result) {
- if (result && result.status === 'success') {
+ if (result && result.ocs.meta.statuscode === 200) {
OC.Share.statuses = {};
- $.each(result.data, function(item, data) {
- OC.Share.statuses[item] = data;
+ $.each(result.ocs.data, function(it, share) {
+ if (!(share.item_source in OC.Share.statuses)) {
+ OC.Share.statuses[share.item_source] = {link: false};
+ }
+ if (share.share_type === OC.Share.SHARE_TYPE_LINK) {
+ OC.Share.statuses[share.item_source] = {link: true};
+ }
});
if (_.isFunction(callback)) {
callback(OC.Share.statuses);
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 4cebf7962e8..ea7e198cb46 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -67,6 +67,10 @@
/** @type {object} **/
shareeListView: undefined,
+ events: {
+ 'input .shareWithField': 'onShareWithFieldChanged'
+ },
+
initialize: function(options) {
var view = this;
@@ -109,7 +113,18 @@
: options[name];
}
- _.bindAll(this, 'autocompleteHandler', '_onSelectRecipient');
+ _.bindAll(this,
+ 'autocompleteHandler',
+ '_onSelectRecipient',
+ 'onShareWithFieldChanged'
+ );
+ },
+
+ onShareWithFieldChanged: function() {
+ var $el = this.$el.find('.shareWithField');
+ if ($el.val().length < 2) {
+ $el.removeClass('error').tooltip('hide');
+ }
},
autocompleteHandler: function (search, response) {
@@ -196,9 +211,20 @@
var suggestions = users.concat(groups).concat(remotes);
if (suggestions.length > 0) {
- $('.shareWithField').autocomplete("option", "autoFocus", true);
+ $('.shareWithField').removeClass('error')
+ .tooltip('hide')
+ .autocomplete("option", "autoFocus", true);
response(suggestions);
} else {
+ $('.shareWithField').addClass('error')
+ .attr('data-original-title', t('core', 'No users or groups found for {search}', {search: $('.shareWithField').val()}))
+ .tooltip('hide')
+ .tooltip({
+ placement: 'bottom',
+ trigger: 'manual',
+ })
+ .tooltip('fixTitle')
+ .tooltip('show');
response();
}
} else {
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 670f7561468..aa7146dfd89 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -197,6 +197,7 @@ OC.L10N.register(
"Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
"An error occurred." : "Une erreur est survenue.",
"Please reload the page." : "Veuillez recharger la page.",
+ "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "La mise à jour a échoué. Pour plus d'informations <a href=\"{url}\">consultez notre publication sur le forum</a> à propos de ce problème.",
"The update was unsuccessful. " : "La mise à jour a échoué.",
"The update was successful. There were warnings." : "La mise à jour a réussi, mais il y a eu des avertissements",
"The update was successful. Redirecting you to ownCloud now." : "La mise à jour a réussi. Vous êtes maintenant redirigé vers ownCloud.",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index bf3b40a7fe9..dfe5926469f 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -195,6 +195,7 @@
"Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
"An error occurred." : "Une erreur est survenue.",
"Please reload the page." : "Veuillez recharger la page.",
+ "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "La mise à jour a échoué. Pour plus d'informations <a href=\"{url}\">consultez notre publication sur le forum</a> à propos de ce problème.",
"The update was unsuccessful. " : "La mise à jour a échoué.",
"The update was successful. There were warnings." : "La mise à jour a réussi, mais il y a eu des avertissements",
"The update was successful. Redirecting you to ownCloud now." : "La mise à jour a réussi. Vous êtes maintenant redirigé vers ownCloud.",
diff --git a/core/shipped.json b/core/shipped.json
index d15f3ba3ca3..e33269dad75 100644
--- a/core/shipped.json
+++ b/core/shipped.json
@@ -20,7 +20,7 @@
"files_texteditor",
"files_trashbin",
"files_versions",
- "files_videoviewer",
+ "files_videoplayer",
"firewall",
"firstrunwizard",
"gallery",
diff --git a/lib/l10n/ast.js b/lib/l10n/ast.js
index 45939c5d99f..ce68c41b09d 100644
--- a/lib/l10n/ast.js
+++ b/lib/l10n/ast.js
@@ -46,7 +46,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Nun pue instalase l'aplicación por causa d'un códigu non permitíu na App",
"App can't be installed because it is not compatible with this version of ownCloud" : "Nun pue instalase l'aplicación porque nun ye compatible con esta versión d'ownCloud.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'aplicación nun pue instalase porque contién la etiqueta <shipped>true</shipped> que nun ta permitida p'aplicaciones non distribuyíes",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Nun pue instalase l'aplicación porque'l númberu de versión en info.xml/version nun ye'l mesmu que la versión qu'apaez na app store",
"Application is not enabled" : "L'aplicación nun ta habilitada",
"Authentication error" : "Fallu d'autenticación",
"Token expired. Please reload page." : "Token caducáu. Recarga la páxina.",
diff --git a/lib/l10n/ast.json b/lib/l10n/ast.json
index 794bf0134a9..bd6facfd558 100644
--- a/lib/l10n/ast.json
+++ b/lib/l10n/ast.json
@@ -44,7 +44,6 @@
"App can't be installed because of not allowed code in the App" : "Nun pue instalase l'aplicación por causa d'un códigu non permitíu na App",
"App can't be installed because it is not compatible with this version of ownCloud" : "Nun pue instalase l'aplicación porque nun ye compatible con esta versión d'ownCloud.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'aplicación nun pue instalase porque contién la etiqueta <shipped>true</shipped> que nun ta permitida p'aplicaciones non distribuyíes",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Nun pue instalase l'aplicación porque'l númberu de versión en info.xml/version nun ye'l mesmu que la versión qu'apaez na app store",
"Application is not enabled" : "L'aplicación nun ta habilitada",
"Authentication error" : "Fallu d'autenticación",
"Token expired. Please reload page." : "Token caducáu. Recarga la páxina.",
diff --git a/lib/l10n/bg_BG.js b/lib/l10n/bg_BG.js
index 37a87706159..d54276316de 100644
--- a/lib/l10n/bg_BG.js
+++ b/lib/l10n/bg_BG.js
@@ -44,7 +44,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Приложението няма да бъде инсталирано, защото използва неразрешен код.",
"App can't be installed because it is not compatible with this version of ownCloud" : "Приложението няма да бъде инсталирано, защото не е съвместимо с текущата версия на ownCloud.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Приложението няма да бъде инсталирано, защото съдържа <shipped>true</shipped>, който таг не е разрешен за не ship-нати приложения.",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Приложението няма да бъде инсталирано, защото версията в info.xml/version не съвпада с версията публикувана в магазина за приложения.",
"Application is not enabled" : "Приложението не е включено",
"Authentication error" : "Проблем с идентификацията",
"Token expired. Please reload page." : "Изтекла сесия. Моля, презареди страницата.",
diff --git a/lib/l10n/bg_BG.json b/lib/l10n/bg_BG.json
index c26aaa692ff..eaadb8f974e 100644
--- a/lib/l10n/bg_BG.json
+++ b/lib/l10n/bg_BG.json
@@ -42,7 +42,6 @@
"App can't be installed because of not allowed code in the App" : "Приложението няма да бъде инсталирано, защото използва неразрешен код.",
"App can't be installed because it is not compatible with this version of ownCloud" : "Приложението няма да бъде инсталирано, защото не е съвместимо с текущата версия на ownCloud.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Приложението няма да бъде инсталирано, защото съдържа <shipped>true</shipped>, който таг не е разрешен за не ship-нати приложения.",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Приложението няма да бъде инсталирано, защото версията в info.xml/version не съвпада с версията публикувана в магазина за приложения.",
"Application is not enabled" : "Приложението не е включено",
"Authentication error" : "Проблем с идентификацията",
"Token expired. Please reload page." : "Изтекла сесия. Моля, презареди страницата.",
diff --git a/lib/l10n/bn_BD.js b/lib/l10n/bn_BD.js
index 333d19ae14d..493601aa9d1 100644
--- a/lib/l10n/bn_BD.js
+++ b/lib/l10n/bn_BD.js
@@ -26,7 +26,6 @@ OC.L10N.register(
"App does not provide an info.xml file" : "অ্যাপের সঙ্গে একটি info.xml ফাইল নেই",
"App can't be installed because of not allowed code in the App" : "অ্যাপের সাথে অননুমোদিত কোড থাকায় অ্যাপটি ইনস্টল করা যাবেনা",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "অ্যাপ ইনস্টল করা যাবেনা কারণ এতে ননশিপড অ্যাপ এর জন্য অননুমোদিত <shipped>true</shipped> ট্যাগ বিদ্যমান ",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : " info.xml/version এর উল্লেখিত সংষ্করণ এবং অ্যাপ স্টোর হতে প্রদান করা সংষ্করণ একরকম না হওয়াতে অ্যাপটি ইনস্টল করা যাবেনা",
"Application is not enabled" : "অ্যাপ্লিকেসনটি সক্রিয় নয়",
"Authentication error" : "অনুমোদন ঘটিত সমস্যা",
"Token expired. Please reload page." : "টোকেন মেয়াদোত্তীর্ণ। দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
diff --git a/lib/l10n/bn_BD.json b/lib/l10n/bn_BD.json
index 2bf6620dc8a..e3c2b378042 100644
--- a/lib/l10n/bn_BD.json
+++ b/lib/l10n/bn_BD.json
@@ -24,7 +24,6 @@
"App does not provide an info.xml file" : "অ্যাপের সঙ্গে একটি info.xml ফাইল নেই",
"App can't be installed because of not allowed code in the App" : "অ্যাপের সাথে অননুমোদিত কোড থাকায় অ্যাপটি ইনস্টল করা যাবেনা",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "অ্যাপ ইনস্টল করা যাবেনা কারণ এতে ননশিপড অ্যাপ এর জন্য অননুমোদিত <shipped>true</shipped> ট্যাগ বিদ্যমান ",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : " info.xml/version এর উল্লেখিত সংষ্করণ এবং অ্যাপ স্টোর হতে প্রদান করা সংষ্করণ একরকম না হওয়াতে অ্যাপটি ইনস্টল করা যাবেনা",
"Application is not enabled" : "অ্যাপ্লিকেসনটি সক্রিয় নয়",
"Authentication error" : "অনুমোদন ঘটিত সমস্যা",
"Token expired. Please reload page." : "টোকেন মেয়াদোত্তীর্ণ। দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
diff --git a/lib/l10n/ca.js b/lib/l10n/ca.js
index ce74bc408a3..16fa1535a87 100644
--- a/lib/l10n/ca.js
+++ b/lib/l10n/ca.js
@@ -36,7 +36,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "L'aplicació no es pot instal·lar perquè hi ha codi no autoritzat en l'aplicació",
"App can't be installed because it is not compatible with this version of ownCloud" : "L'aplicació no es pot instal·lar perquè no és compatible amb aquesta versió d'ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'aplicació no es pot instal·lar perquè conté l'etiqueta <shipped>vertader</shipped> que no es permet per aplicacions no enviades",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "L'aplicació no es pot instal·lar perquè la versió a info.xml/version no és la mateixa que la versió indicada des de la botiga d'aplicacions",
"Application is not enabled" : "L'aplicació no està habilitada",
"Authentication error" : "Error d'autenticació",
"Token expired. Please reload page." : "El testimoni ha expirat. Torneu a carregar la pàgina.",
diff --git a/lib/l10n/ca.json b/lib/l10n/ca.json
index a0ae70b95fa..38ea9302081 100644
--- a/lib/l10n/ca.json
+++ b/lib/l10n/ca.json
@@ -34,7 +34,6 @@
"App can't be installed because of not allowed code in the App" : "L'aplicació no es pot instal·lar perquè hi ha codi no autoritzat en l'aplicació",
"App can't be installed because it is not compatible with this version of ownCloud" : "L'aplicació no es pot instal·lar perquè no és compatible amb aquesta versió d'ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'aplicació no es pot instal·lar perquè conté l'etiqueta <shipped>vertader</shipped> que no es permet per aplicacions no enviades",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "L'aplicació no es pot instal·lar perquè la versió a info.xml/version no és la mateixa que la versió indicada des de la botiga d'aplicacions",
"Application is not enabled" : "L'aplicació no està habilitada",
"Authentication error" : "Error d'autenticació",
"Token expired. Please reload page." : "El testimoni ha expirat. Torneu a carregar la pàgina.",
diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs_CZ.js
index dfc114816ec..846859dc5ae 100644
--- a/lib/l10n/cs_CZ.js
+++ b/lib/l10n/cs_CZ.js
@@ -60,7 +60,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Aplikace nemůže být nainstalována, protože obsahuje nepovolený kód",
"App can't be installed because it is not compatible with this version of ownCloud" : "Aplikace nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikace nemůže být nainstalována, protože obsahuje značku\n<shipped>\n\ntrue\n</shipped>\n\ncož není povoleno pro nedodávané aplikace",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikace nemůže být nainstalována, protože verze uvedená v info.xml/version nesouhlasí s verzí oznámenou z úložiště aplikací.",
"Application is not enabled" : "Aplikace není povolena",
"Authentication error" : "Chyba ověření",
"Token expired. Please reload page." : "Token vypršel. Obnovte prosím stránku.",
diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs_CZ.json
index a729493c09c..d9be6a314d8 100644
--- a/lib/l10n/cs_CZ.json
+++ b/lib/l10n/cs_CZ.json
@@ -58,7 +58,6 @@
"App can't be installed because of not allowed code in the App" : "Aplikace nemůže být nainstalována, protože obsahuje nepovolený kód",
"App can't be installed because it is not compatible with this version of ownCloud" : "Aplikace nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikace nemůže být nainstalována, protože obsahuje značku\n<shipped>\n\ntrue\n</shipped>\n\ncož není povoleno pro nedodávané aplikace",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikace nemůže být nainstalována, protože verze uvedená v info.xml/version nesouhlasí s verzí oznámenou z úložiště aplikací.",
"Application is not enabled" : "Aplikace není povolena",
"Authentication error" : "Chyba ověření",
"Token expired. Please reload page." : "Token vypršel. Obnovte prosím stránku.",
diff --git a/lib/l10n/da.js b/lib/l10n/da.js
index 4fab1992d42..cfa5ab8e4a3 100644
--- a/lib/l10n/da.js
+++ b/lib/l10n/da.js
@@ -59,7 +59,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Appen kan ikke installeres, da den indeholder ikke-tilladt kode",
"App can't be installed because it is not compatible with this version of ownCloud" : "Appen kan ikke installeres, da den ikke er kompatibel med denne version af ownCloud.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Appen kan ikke installeres, da den indeholder mærket <shipped>true</shipped>, hvilket ikke er tilladt for ikke-medfølgende apps",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App kan ikke installeres, da versionen i info.xml/version ikke er den samme som versionen rapporteret fra app-storen",
"Application is not enabled" : "Programmet er ikke aktiveret",
"Authentication error" : "Adgangsfejl",
"Token expired. Please reload page." : "Adgang er udløbet. Genindlæs siden.",
diff --git a/lib/l10n/da.json b/lib/l10n/da.json
index d4d4d16135a..28dd378e9bc 100644
--- a/lib/l10n/da.json
+++ b/lib/l10n/da.json
@@ -57,7 +57,6 @@
"App can't be installed because of not allowed code in the App" : "Appen kan ikke installeres, da den indeholder ikke-tilladt kode",
"App can't be installed because it is not compatible with this version of ownCloud" : "Appen kan ikke installeres, da den ikke er kompatibel med denne version af ownCloud.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Appen kan ikke installeres, da den indeholder mærket <shipped>true</shipped>, hvilket ikke er tilladt for ikke-medfølgende apps",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App kan ikke installeres, da versionen i info.xml/version ikke er den samme som versionen rapporteret fra app-storen",
"Application is not enabled" : "Programmet er ikke aktiveret",
"Authentication error" : "Adgangsfejl",
"Token expired. Please reload page." : "Adgang er udløbet. Genindlæs siden.",
diff --git a/lib/l10n/de.js b/lib/l10n/de.js
index 0b5e385d781..c8eebcfce04 100644
--- a/lib/l10n/de.js
+++ b/lib/l10n/de.js
@@ -59,7 +59,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Die App kann nicht installiert werden, weil sie unerlaubten Code enthält",
"App can't be installed because it is not compatible with this version of ownCloud" : "Die App kann nicht installiert werden, weil sie mit dieser Version von ownCloud nicht kompatibel ist",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Die App kann nicht installiert werden, weil sie den <shipped>true</shipped>-Tag enthält, der bei Apps, die nicht zum Standardumfang von ownCloud gehören, nicht erlaubt ist",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Die App kann nicht installiert werden, weil die Version in info.xml/version nicht mit der Version aus dem App Store übereinstimmt",
"Application is not enabled" : "Die App ist nicht aktiviert",
"Authentication error" : "Authentifizierungsfehler",
"Token expired. Please reload page." : "Token abgelaufen. Bitte lade die Seite neu.",
diff --git a/lib/l10n/de.json b/lib/l10n/de.json
index 79495ea008f..b38a8d052fb 100644
--- a/lib/l10n/de.json
+++ b/lib/l10n/de.json
@@ -57,7 +57,6 @@
"App can't be installed because of not allowed code in the App" : "Die App kann nicht installiert werden, weil sie unerlaubten Code enthält",
"App can't be installed because it is not compatible with this version of ownCloud" : "Die App kann nicht installiert werden, weil sie mit dieser Version von ownCloud nicht kompatibel ist",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Die App kann nicht installiert werden, weil sie den <shipped>true</shipped>-Tag enthält, der bei Apps, die nicht zum Standardumfang von ownCloud gehören, nicht erlaubt ist",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Die App kann nicht installiert werden, weil die Version in info.xml/version nicht mit der Version aus dem App Store übereinstimmt",
"Application is not enabled" : "Die App ist nicht aktiviert",
"Authentication error" : "Authentifizierungsfehler",
"Token expired. Please reload page." : "Token abgelaufen. Bitte lade die Seite neu.",
diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js
index b434ac56aad..2c4719a68ee 100644
--- a/lib/l10n/de_DE.js
+++ b/lib/l10n/de_DE.js
@@ -58,7 +58,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Die App kann nicht installiert werden, weil sie unerlaubten Code enthält",
"App can't be installed because it is not compatible with this version of ownCloud" : "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Die App kann nicht installiert werden, weil sie den <shipped>true</shipped>-Tag enthält, der bei Apps, die nicht zum Standardumfang von ownCloud gehören, nicht erlaubt ist",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist",
"Application is not enabled" : "Die Anwendung ist nicht aktiviert",
"Authentication error" : "Authentifizierungsfehler",
"Token expired. Please reload page." : "Token abgelaufen. Bitte laden Sie die Seite neu.",
diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json
index 09ce050c452..a0033aab485 100644
--- a/lib/l10n/de_DE.json
+++ b/lib/l10n/de_DE.json
@@ -56,7 +56,6 @@
"App can't be installed because of not allowed code in the App" : "Die App kann nicht installiert werden, weil sie unerlaubten Code enthält",
"App can't be installed because it is not compatible with this version of ownCloud" : "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Die App kann nicht installiert werden, weil sie den <shipped>true</shipped>-Tag enthält, der bei Apps, die nicht zum Standardumfang von ownCloud gehören, nicht erlaubt ist",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist",
"Application is not enabled" : "Die Anwendung ist nicht aktiviert",
"Authentication error" : "Authentifizierungsfehler",
"Token expired. Please reload page." : "Token abgelaufen. Bitte laden Sie die Seite neu.",
diff --git a/lib/l10n/el.js b/lib/l10n/el.js
index 209f35f040d..75bde20823e 100644
--- a/lib/l10n/el.js
+++ b/lib/l10n/el.js
@@ -56,7 +56,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί λόγω μη-επιτρεπόμενου κώδικα μέσα στην Εφαρμογή",
"App can't be installed because it is not compatible with this version of ownCloud" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την έκδοση ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή περιέχει την ετικέτα <shipped>σωστή</shipped> που δεν επιτρέπεται για μη-ενσωματωμένες εφαρμογές",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή η έκδοση στο info.xml/version δεν είναι η ίδια με την έκδοση που αναφέρεται στο κατάστημα εφαρμογών",
"Application is not enabled" : "Δεν ενεργοποιήθηκε η εφαρμογή",
"Authentication error" : "Σφάλμα πιστοποίησης",
"Token expired. Please reload page." : "Το αναγνωριστικό έληξε. Παρακαλώ φορτώστε ξανά την σελίδα.",
diff --git a/lib/l10n/el.json b/lib/l10n/el.json
index f5976188506..be3760d6d62 100644
--- a/lib/l10n/el.json
+++ b/lib/l10n/el.json
@@ -54,7 +54,6 @@
"App can't be installed because of not allowed code in the App" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί λόγω μη-επιτρεπόμενου κώδικα μέσα στην Εφαρμογή",
"App can't be installed because it is not compatible with this version of ownCloud" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την έκδοση ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή περιέχει την ετικέτα <shipped>σωστή</shipped> που δεν επιτρέπεται για μη-ενσωματωμένες εφαρμογές",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή η έκδοση στο info.xml/version δεν είναι η ίδια με την έκδοση που αναφέρεται στο κατάστημα εφαρμογών",
"Application is not enabled" : "Δεν ενεργοποιήθηκε η εφαρμογή",
"Authentication error" : "Σφάλμα πιστοποίησης",
"Token expired. Please reload page." : "Το αναγνωριστικό έληξε. Παρακαλώ φορτώστε ξανά την σελίδα.",
diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js
index a36477d2d2a..b75551708be 100644
--- a/lib/l10n/en_GB.js
+++ b/lib/l10n/en_GB.js
@@ -55,7 +55,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "App can't be installed because of unallowed code in the App",
"App can't be installed because it is not compatible with this version of ownCloud" : "App can't be installed because it is not compatible with this version of ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store",
"Application is not enabled" : "Application is not enabled",
"Authentication error" : "Authentication error",
"Token expired. Please reload page." : "Token expired. Please reload page.",
diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json
index b5785acef58..c44cafd39e9 100644
--- a/lib/l10n/en_GB.json
+++ b/lib/l10n/en_GB.json
@@ -53,7 +53,6 @@
"App can't be installed because of not allowed code in the App" : "App can't be installed because of unallowed code in the App",
"App can't be installed because it is not compatible with this version of ownCloud" : "App can't be installed because it is not compatible with this version of ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store",
"Application is not enabled" : "Application is not enabled",
"Authentication error" : "Authentication error",
"Token expired. Please reload page." : "Token expired. Please reload page.",
diff --git a/lib/l10n/es.js b/lib/l10n/es.js
index 6ed1111f6d5..e0ade5c7b5d 100644
--- a/lib/l10n/es.js
+++ b/lib/l10n/es.js
@@ -60,7 +60,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "La aplicación no puede ser instalada por tener código no autorizado en la aplicación",
"App can't be installed because it is not compatible with this version of ownCloud" : "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store",
"Application is not enabled" : "La aplicación no está habilitada",
"Authentication error" : "Error de autenticación",
"Token expired. Please reload page." : "Token expirado. Por favor, recarge la página.",
diff --git a/lib/l10n/es.json b/lib/l10n/es.json
index e64686f5b84..d77247e08a0 100644
--- a/lib/l10n/es.json
+++ b/lib/l10n/es.json
@@ -58,7 +58,6 @@
"App can't be installed because of not allowed code in the App" : "La aplicación no puede ser instalada por tener código no autorizado en la aplicación",
"App can't be installed because it is not compatible with this version of ownCloud" : "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store",
"Application is not enabled" : "La aplicación no está habilitada",
"Authentication error" : "Error de autenticación",
"Token expired. Please reload page." : "Token expirado. Por favor, recarge la página.",
diff --git a/lib/l10n/es_AR.js b/lib/l10n/es_AR.js
index aff2406c699..fe720d08a8e 100644
--- a/lib/l10n/es_AR.js
+++ b/lib/l10n/es_AR.js
@@ -29,7 +29,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "No puede ser instalada la app por tener código no autorizado",
"App can't be installed because it is not compatible with this version of ownCloud" : "No se puede instalar la app porque no es compatible con esta versión de ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "La app no se puede instalar porque contiene la etiqueta <shipped>true</shipped> que no está permitida para apps no distribuidas",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "La app no puede ser instalada porque la versión en info.xml/version no es la misma que la establecida en el app store",
"Application is not enabled" : "La aplicación no está habilitada",
"Authentication error" : "Error al autenticar",
"Token expired. Please reload page." : "Token expirado. Por favor, recargá la página.",
diff --git a/lib/l10n/es_AR.json b/lib/l10n/es_AR.json
index 4cbbb8ad93f..5a3b56f425a 100644
--- a/lib/l10n/es_AR.json
+++ b/lib/l10n/es_AR.json
@@ -27,7 +27,6 @@
"App can't be installed because of not allowed code in the App" : "No puede ser instalada la app por tener código no autorizado",
"App can't be installed because it is not compatible with this version of ownCloud" : "No se puede instalar la app porque no es compatible con esta versión de ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "La app no se puede instalar porque contiene la etiqueta <shipped>true</shipped> que no está permitida para apps no distribuidas",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "La app no puede ser instalada porque la versión en info.xml/version no es la misma que la establecida en el app store",
"Application is not enabled" : "La aplicación no está habilitada",
"Authentication error" : "Error al autenticar",
"Token expired. Please reload page." : "Token expirado. Por favor, recargá la página.",
diff --git a/lib/l10n/es_MX.js b/lib/l10n/es_MX.js
index b9cbf96c7af..a101b28da43 100644
--- a/lib/l10n/es_MX.js
+++ b/lib/l10n/es_MX.js
@@ -34,7 +34,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "La aplicación no puede ser instalada por tener código no autorizado en la aplicación",
"App can't be installed because it is not compatible with this version of ownCloud" : "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store",
"Application is not enabled" : "La aplicación no está habilitada",
"Authentication error" : "Error de autenticación",
"Token expired. Please reload page." : "Token expirado. Por favor, recarga la página.",
diff --git a/lib/l10n/es_MX.json b/lib/l10n/es_MX.json
index 53db7b10151..2550ce6ab97 100644
--- a/lib/l10n/es_MX.json
+++ b/lib/l10n/es_MX.json
@@ -32,7 +32,6 @@
"App can't be installed because of not allowed code in the App" : "La aplicación no puede ser instalada por tener código no autorizado en la aplicación",
"App can't be installed because it is not compatible with this version of ownCloud" : "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store",
"Application is not enabled" : "La aplicación no está habilitada",
"Authentication error" : "Error de autenticación",
"Token expired. Please reload page." : "Token expirado. Por favor, recarga la página.",
diff --git a/lib/l10n/et_EE.js b/lib/l10n/et_EE.js
index 397114f5886..adae17c841c 100644
--- a/lib/l10n/et_EE.js
+++ b/lib/l10n/et_EE.js
@@ -48,7 +48,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Rakendit ei saa paigaldada, kuna sisaldab lubamatud koodi",
"App can't be installed because it is not compatible with this version of ownCloud" : "Rakendit ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Rakendit ei saa paigaldada, kuna see sisaldab \n<shipped>\n\ntrue\n</shipped>\nmärgendit, mis pole lubatud mitte veetud (non shipped) rakendites",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Rakendit ei saa paigaldada, kuna selle versioon info.xml/version pole sama, mis on märgitud rakendite laos.",
"Application is not enabled" : "Rakendus pole sisse lülitatud",
"Authentication error" : "Autentimise viga",
"Token expired. Please reload page." : "Kontrollkood aegus. Paelun lae leht uuesti.",
diff --git a/lib/l10n/et_EE.json b/lib/l10n/et_EE.json
index 3716cc59f51..68340a6b965 100644
--- a/lib/l10n/et_EE.json
+++ b/lib/l10n/et_EE.json
@@ -46,7 +46,6 @@
"App can't be installed because of not allowed code in the App" : "Rakendit ei saa paigaldada, kuna sisaldab lubamatud koodi",
"App can't be installed because it is not compatible with this version of ownCloud" : "Rakendit ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Rakendit ei saa paigaldada, kuna see sisaldab \n<shipped>\n\ntrue\n</shipped>\nmärgendit, mis pole lubatud mitte veetud (non shipped) rakendites",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Rakendit ei saa paigaldada, kuna selle versioon info.xml/version pole sama, mis on märgitud rakendite laos.",
"Application is not enabled" : "Rakendus pole sisse lülitatud",
"Authentication error" : "Autentimise viga",
"Token expired. Please reload page." : "Kontrollkood aegus. Paelun lae leht uuesti.",
diff --git a/lib/l10n/eu.js b/lib/l10n/eu.js
index 56499eb89fa..3afefbdda80 100644
--- a/lib/l10n/eu.js
+++ b/lib/l10n/eu.js
@@ -47,7 +47,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Aplikazioa ezin da instalatu bertan duen baimendu gabeko kodea dela eta",
"App can't be installed because it is not compatible with this version of ownCloud" : "Aplikazioa ezin da instalatu ownCloud bertsio honekin bateragarria ez delako",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikazioa ezin da instalatu <shipped>true</shipped> etiketa duelako eta etiketa hau ez da onartzen banaketan ez datozen aplikazioetan",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikazioa ezin da instalatu info.xml/version bertsioa ez delako \"app store\"an jartzen duenaren berdina",
"Application is not enabled" : "Aplikazioa ez dago gaituta",
"Authentication error" : "Autentifikazio errorea",
"Token expired. Please reload page." : "Tokena iraungitu da. Mesedez birkargatu orria.",
diff --git a/lib/l10n/eu.json b/lib/l10n/eu.json
index 91547707f32..2894b851dc7 100644
--- a/lib/l10n/eu.json
+++ b/lib/l10n/eu.json
@@ -45,7 +45,6 @@
"App can't be installed because of not allowed code in the App" : "Aplikazioa ezin da instalatu bertan duen baimendu gabeko kodea dela eta",
"App can't be installed because it is not compatible with this version of ownCloud" : "Aplikazioa ezin da instalatu ownCloud bertsio honekin bateragarria ez delako",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikazioa ezin da instalatu <shipped>true</shipped> etiketa duelako eta etiketa hau ez da onartzen banaketan ez datozen aplikazioetan",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikazioa ezin da instalatu info.xml/version bertsioa ez delako \"app store\"an jartzen duenaren berdina",
"Application is not enabled" : "Aplikazioa ez dago gaituta",
"Authentication error" : "Autentifikazio errorea",
"Token expired. Please reload page." : "Tokena iraungitu da. Mesedez birkargatu orria.",
diff --git a/lib/l10n/fi_FI.js b/lib/l10n/fi_FI.js
index 8b273fcc238..5da8b1e2ab5 100644
--- a/lib/l10n/fi_FI.js
+++ b/lib/l10n/fi_FI.js
@@ -57,7 +57,7 @@ OC.L10N.register(
"Signature could not get checked. Please contact the app developer and check your admin screen." : "Allekirjoituksen tarkistaminen ei onnistunut. Ota yhteys sovelluskehittäjään ja tarkista ylläpitonäkymä.",
"App can't be installed because of not allowed code in the App" : "Sovellusta ei voi asentaa, koska sovellus sisältää kiellettyä koodia",
"App can't be installed because it is not compatible with this version of ownCloud" : "Sovellusta ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Sovellusta ei voi asentaa, koska info.xml/version ilmoittaa versioksi eri arvon kuin sovelluskauppa",
+ "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Sovelluksen asennus ei onnistu, koska sen info.xml:ssä ilmoitettu versio ei ole sama kuin sovelluskaupassa ilmoitettu versio",
"Application is not enabled" : "Sovellusta ei ole otettu käyttöön",
"Authentication error" : "Tunnistautumisvirhe",
"Token expired. Please reload page." : "Valtuutus vanheni. Lataa sivu uudelleen.",
@@ -77,6 +77,7 @@ OC.L10N.register(
"Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Poista open_basedir-asetus php.ini-tiedostosta tai vaihda 64-bittiseen PHP:hen.",
"Set an admin username." : "Aseta ylläpitäjän käyttäjätunnus.",
"Set an admin password." : "Aseta ylläpitäjän salasana.",
+ "Invalid Federated Cloud ID" : "Virheellinen federoidun pilven tunniste",
"%s shared »%s« with you" : "%s jakoi kohteen »%s« kanssasi",
"Sharing %s failed, because the file does not exist" : "Kohteen %s jakaminen epäonnistui, koska tiedostoa ei ole olemassa",
"You are not allowed to share %s" : "Oikeutesi eivät riitä kohteen %s jakamiseen.",
diff --git a/lib/l10n/fi_FI.json b/lib/l10n/fi_FI.json
index 3db25f9f220..8e6a639846c 100644
--- a/lib/l10n/fi_FI.json
+++ b/lib/l10n/fi_FI.json
@@ -55,7 +55,7 @@
"Signature could not get checked. Please contact the app developer and check your admin screen." : "Allekirjoituksen tarkistaminen ei onnistunut. Ota yhteys sovelluskehittäjään ja tarkista ylläpitonäkymä.",
"App can't be installed because of not allowed code in the App" : "Sovellusta ei voi asentaa, koska sovellus sisältää kiellettyä koodia",
"App can't be installed because it is not compatible with this version of ownCloud" : "Sovellusta ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Sovellusta ei voi asentaa, koska info.xml/version ilmoittaa versioksi eri arvon kuin sovelluskauppa",
+ "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Sovelluksen asennus ei onnistu, koska sen info.xml:ssä ilmoitettu versio ei ole sama kuin sovelluskaupassa ilmoitettu versio",
"Application is not enabled" : "Sovellusta ei ole otettu käyttöön",
"Authentication error" : "Tunnistautumisvirhe",
"Token expired. Please reload page." : "Valtuutus vanheni. Lataa sivu uudelleen.",
@@ -75,6 +75,7 @@
"Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Poista open_basedir-asetus php.ini-tiedostosta tai vaihda 64-bittiseen PHP:hen.",
"Set an admin username." : "Aseta ylläpitäjän käyttäjätunnus.",
"Set an admin password." : "Aseta ylläpitäjän salasana.",
+ "Invalid Federated Cloud ID" : "Virheellinen federoidun pilven tunniste",
"%s shared »%s« with you" : "%s jakoi kohteen »%s« kanssasi",
"Sharing %s failed, because the file does not exist" : "Kohteen %s jakaminen epäonnistui, koska tiedostoa ei ole olemassa",
"You are not allowed to share %s" : "Oikeutesi eivät riitä kohteen %s jakamiseen.",
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index 24bfced6f7c..08b83e8dc75 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -60,7 +60,7 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "L'application ne peut être installée car elle contient du code non-autorisé",
"App can't be installed because it is not compatible with this version of ownCloud" : "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'application ne peut être installée car elle contient la balise <shipped>true</shipped> qui n'est pas autorisée pour les applications non incluses par défaut",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "L'application ne peut être installée car la version dans info.xml/version n'est pas identique à celle indiquée sur l'app store",
+ "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "L'App ne peut pas être installé car la version dans info.xml diffère de la version signalée par l' app store",
"Application is not enabled" : "L'application n'est pas activée",
"Authentication error" : "Erreur d'authentification",
"Token expired. Please reload page." : "La session a expiré. Veuillez recharger la page.",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index bacb0a4211b..7541b6b93b0 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -58,7 +58,7 @@
"App can't be installed because of not allowed code in the App" : "L'application ne peut être installée car elle contient du code non-autorisé",
"App can't be installed because it is not compatible with this version of ownCloud" : "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'application ne peut être installée car elle contient la balise <shipped>true</shipped> qui n'est pas autorisée pour les applications non incluses par défaut",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "L'application ne peut être installée car la version dans info.xml/version n'est pas identique à celle indiquée sur l'app store",
+ "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "L'App ne peut pas être installé car la version dans info.xml diffère de la version signalée par l' app store",
"Application is not enabled" : "L'application n'est pas activée",
"Authentication error" : "Erreur d'authentification",
"Token expired. Please reload page." : "La session a expiré. Veuillez recharger la page.",
diff --git a/lib/l10n/gl.js b/lib/l10n/gl.js
index fa6435e8559..cece8a9076a 100644
--- a/lib/l10n/gl.js
+++ b/lib/l10n/gl.js
@@ -58,7 +58,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Non é posíbel instalar a aplicación por mor de conter código non permitido",
"App can't be installed because it is not compatible with this version of ownCloud" : "Non é posíbel instalar a aplicación por non seren compatíbel con esta versión do ownCloud.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Non é posíbel instalar a aplicación por conter a etiqueta <shipped>true</shipped> que non está permitida para as aplicacións non enviadas",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Non é posíbel instalar a aplicación xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store",
"Application is not enabled" : "A aplicación non está activada",
"Authentication error" : "Produciuse un erro de autenticación",
"Token expired. Please reload page." : "Testemuña caducada. Recargue a páxina.",
diff --git a/lib/l10n/gl.json b/lib/l10n/gl.json
index 781e880bbc0..c98788a9894 100644
--- a/lib/l10n/gl.json
+++ b/lib/l10n/gl.json
@@ -56,7 +56,6 @@
"App can't be installed because of not allowed code in the App" : "Non é posíbel instalar a aplicación por mor de conter código non permitido",
"App can't be installed because it is not compatible with this version of ownCloud" : "Non é posíbel instalar a aplicación por non seren compatíbel con esta versión do ownCloud.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Non é posíbel instalar a aplicación por conter a etiqueta <shipped>true</shipped> que non está permitida para as aplicacións non enviadas",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Non é posíbel instalar a aplicación xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store",
"Application is not enabled" : "A aplicación non está activada",
"Authentication error" : "Produciuse un erro de autenticación",
"Token expired. Please reload page." : "Testemuña caducada. Recargue a páxina.",
diff --git a/lib/l10n/hr.js b/lib/l10n/hr.js
index 4d7ce340625..2f3b6616180 100644
--- a/lib/l10n/hr.js
+++ b/lib/l10n/hr.js
@@ -41,7 +41,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Aplikaciju nije moguće instalirati zbog nedopuštenog koda u njoj.",
"App can't be installed because it is not compatible with this version of ownCloud" : "Aplikaciju nije moguće instalirati jer nije kompatibilna s ovom verzijom ownClouda.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikaciju nije moguće instalirati jer sadrži oznaku <otpremljeno>istinito</otpremljeno>.",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikaciju nije moguće instalirati jer verzija u info.xml/version nije ista kaoverzija koju je prijavio app store",
"Application is not enabled" : "Aplikacija nije aktivirana",
"Authentication error" : "Pogrešna autentikacija",
"Token expired. Please reload page." : "Token je istekao. Molimo, ponovno učitajte stranicu.",
diff --git a/lib/l10n/hr.json b/lib/l10n/hr.json
index e17183ed169..166f509e2f0 100644
--- a/lib/l10n/hr.json
+++ b/lib/l10n/hr.json
@@ -39,7 +39,6 @@
"App can't be installed because of not allowed code in the App" : "Aplikaciju nije moguće instalirati zbog nedopuštenog koda u njoj.",
"App can't be installed because it is not compatible with this version of ownCloud" : "Aplikaciju nije moguće instalirati jer nije kompatibilna s ovom verzijom ownClouda.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikaciju nije moguće instalirati jer sadrži oznaku <otpremljeno>istinito</otpremljeno>.",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikaciju nije moguće instalirati jer verzija u info.xml/version nije ista kaoverzija koju je prijavio app store",
"Application is not enabled" : "Aplikacija nije aktivirana",
"Authentication error" : "Pogrešna autentikacija",
"Token expired. Please reload page." : "Token je istekao. Molimo, ponovno učitajte stranicu.",
diff --git a/lib/l10n/hu_HU.js b/lib/l10n/hu_HU.js
index 6a6b0dfaaf3..626bd0c44a3 100644
--- a/lib/l10n/hu_HU.js
+++ b/lib/l10n/hu_HU.js
@@ -52,7 +52,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Az alkalmazást nem lehet telepíteni, mert abban nem engedélyezett programkód szerepel",
"App can't be installed because it is not compatible with this version of ownCloud" : "Az alkalmazás nem telepíthető, mert nem kompatibilis az ownCloud jelen verziójával.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Az alkalmazást nem lehet telepíteni, mert tartalmazza a \n<shipped>\ntrue\n</shipped>\ncímkét, ami a nem szállított alkalmazások esetén nem engedélyezett",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Az alkalmazást nem lehet telepíteni, mert az info.xml/version-ben megadott verzió nem egyezik az alkalmazás-kiszolgálón feltüntetett verzióval.",
"Application is not enabled" : "Az alkalmazás nincs engedélyezve",
"Authentication error" : "Azonosítási hiba",
"Token expired. Please reload page." : "A token lejárt. Frissítse az oldalt.",
diff --git a/lib/l10n/hu_HU.json b/lib/l10n/hu_HU.json
index 18c27c859e1..dde921ce3b1 100644
--- a/lib/l10n/hu_HU.json
+++ b/lib/l10n/hu_HU.json
@@ -50,7 +50,6 @@
"App can't be installed because of not allowed code in the App" : "Az alkalmazást nem lehet telepíteni, mert abban nem engedélyezett programkód szerepel",
"App can't be installed because it is not compatible with this version of ownCloud" : "Az alkalmazás nem telepíthető, mert nem kompatibilis az ownCloud jelen verziójával.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Az alkalmazást nem lehet telepíteni, mert tartalmazza a \n<shipped>\ntrue\n</shipped>\ncímkét, ami a nem szállított alkalmazások esetén nem engedélyezett",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Az alkalmazást nem lehet telepíteni, mert az info.xml/version-ben megadott verzió nem egyezik az alkalmazás-kiszolgálón feltüntetett verzióval.",
"Application is not enabled" : "Az alkalmazás nincs engedélyezve",
"Authentication error" : "Azonosítási hiba",
"Token expired. Please reload page." : "A token lejárt. Frissítse az oldalt.",
diff --git a/lib/l10n/id.js b/lib/l10n/id.js
index 10848fd80f4..d158492ebee 100644
--- a/lib/l10n/id.js
+++ b/lib/l10n/id.js
@@ -59,7 +59,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Apl tidak dapat diinstal karena terdapat kode yang tidak diizinkan didalam Apl",
"App can't be installed because it is not compatible with this version of ownCloud" : "Apl tidak dapat diinstal karena tidak kompatibel dengan versi ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Apl tidak dapat diinstal karena mengandung tag <shipped>true</shipped> yang tidak diizinkan untuk apl yang bukan bawaan.",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Apl tidak dapat diinstal karena versi di info.xml/versi tidak sama dengan versi yang dilansir dari toko apl",
"Application is not enabled" : "Aplikasi tidak diaktifkan",
"Authentication error" : "Galat saat otentikasi",
"Token expired. Please reload page." : "Token sudah kedaluwarsa. Silakan muat ulang halaman.",
diff --git a/lib/l10n/id.json b/lib/l10n/id.json
index a5edae82d83..db1be730970 100644
--- a/lib/l10n/id.json
+++ b/lib/l10n/id.json
@@ -57,7 +57,6 @@
"App can't be installed because of not allowed code in the App" : "Apl tidak dapat diinstal karena terdapat kode yang tidak diizinkan didalam Apl",
"App can't be installed because it is not compatible with this version of ownCloud" : "Apl tidak dapat diinstal karena tidak kompatibel dengan versi ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Apl tidak dapat diinstal karena mengandung tag <shipped>true</shipped> yang tidak diizinkan untuk apl yang bukan bawaan.",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Apl tidak dapat diinstal karena versi di info.xml/versi tidak sama dengan versi yang dilansir dari toko apl",
"Application is not enabled" : "Aplikasi tidak diaktifkan",
"Authentication error" : "Galat saat otentikasi",
"Token expired. Please reload page." : "Token sudah kedaluwarsa. Silakan muat ulang halaman.",
diff --git a/lib/l10n/it.js b/lib/l10n/it.js
index 7aab74e24e5..3265cc30edd 100644
--- a/lib/l10n/it.js
+++ b/lib/l10n/it.js
@@ -60,7 +60,7 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "L'applicazione non può essere installata a causa di codice non consentito al suo interno",
"App can't be installed because it is not compatible with this version of ownCloud" : "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'applicazione non può essere installata poiché contiene il tag <shipped>true<shipped> che è consentito per le applicazioni native",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "L'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store",
+ "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "L'applicazione non può essere installata poiché la versione nel file info.xml non è la stessa riportata dall'app store",
"Application is not enabled" : "L'applicazione non è abilitata",
"Authentication error" : "Errore di autenticazione",
"Token expired. Please reload page." : "Token scaduto. Ricarica la pagina.",
diff --git a/lib/l10n/it.json b/lib/l10n/it.json
index f4238e6e598..c891d1a765c 100644
--- a/lib/l10n/it.json
+++ b/lib/l10n/it.json
@@ -58,7 +58,7 @@
"App can't be installed because of not allowed code in the App" : "L'applicazione non può essere installata a causa di codice non consentito al suo interno",
"App can't be installed because it is not compatible with this version of ownCloud" : "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'applicazione non può essere installata poiché contiene il tag <shipped>true<shipped> che è consentito per le applicazioni native",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "L'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store",
+ "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "L'applicazione non può essere installata poiché la versione nel file info.xml non è la stessa riportata dall'app store",
"Application is not enabled" : "L'applicazione non è abilitata",
"Authentication error" : "Errore di autenticazione",
"Token expired. Please reload page." : "Token scaduto. Ricarica la pagina.",
diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js
index 971a622f0fc..7a050007ad5 100644
--- a/lib/l10n/ja.js
+++ b/lib/l10n/ja.js
@@ -60,7 +60,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "アプリで許可されないコードが入っているのが原因でアプリがインストールできません",
"App can't be installed because it is not compatible with this version of ownCloud" : "アプリは、このバージョンのownCloudと互換性がないためインストールできません。",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "非shippedアプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストールできません。",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "info.xml/versionのバージョンがアプリストアのバージョンと合っていないため、アプリはインストールされません",
"Application is not enabled" : "アプリケーションは無効です",
"Authentication error" : "認証エラー",
"Token expired. Please reload page." : "トークンが無効になりました。ページを再読込してください。",
diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json
index defcbdffebd..4188e55765b 100644
--- a/lib/l10n/ja.json
+++ b/lib/l10n/ja.json
@@ -58,7 +58,6 @@
"App can't be installed because of not allowed code in the App" : "アプリで許可されないコードが入っているのが原因でアプリがインストールできません",
"App can't be installed because it is not compatible with this version of ownCloud" : "アプリは、このバージョンのownCloudと互換性がないためインストールできません。",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "非shippedアプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストールできません。",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "info.xml/versionのバージョンがアプリストアのバージョンと合っていないため、アプリはインストールされません",
"Application is not enabled" : "アプリケーションは無効です",
"Authentication error" : "認証エラー",
"Token expired. Please reload page." : "トークンが無効になりました。ページを再読込してください。",
diff --git a/lib/l10n/ko.js b/lib/l10n/ko.js
index afdbd56bd6a..cb447f8d69a 100644
--- a/lib/l10n/ko.js
+++ b/lib/l10n/ko.js
@@ -59,7 +59,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "앱에 허용되지 않는 코드가 있어서 앱을 설치할 수 없습니다.",
"App can't be installed because it is not compatible with this version of ownCloud" : "현재 ownCloud 버전과 호환되지 않기 때문에 앱을 설치할 수 없습니다.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "출시되지 않은 앱에 허용되지 않는 <shipped>true</shipped> 태그를 포함하고 있기 때문에 앱을 설치할 수 없습니다.",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "info.xml/version에 포함된 버전과 앱 스토어에 보고된 버전이 같지 않아서 앱을 설치할 수 없습니다.",
"Application is not enabled" : "앱이 활성화되지 않았습니다",
"Authentication error" : "인증 오류",
"Token expired. Please reload page." : "토큰이 만료되었습니다. 페이지를 새로 고치십시오.",
diff --git a/lib/l10n/ko.json b/lib/l10n/ko.json
index 910c004a73d..b967df66ff4 100644
--- a/lib/l10n/ko.json
+++ b/lib/l10n/ko.json
@@ -57,7 +57,6 @@
"App can't be installed because of not allowed code in the App" : "앱에 허용되지 않는 코드가 있어서 앱을 설치할 수 없습니다.",
"App can't be installed because it is not compatible with this version of ownCloud" : "현재 ownCloud 버전과 호환되지 않기 때문에 앱을 설치할 수 없습니다.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "출시되지 않은 앱에 허용되지 않는 <shipped>true</shipped> 태그를 포함하고 있기 때문에 앱을 설치할 수 없습니다.",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "info.xml/version에 포함된 버전과 앱 스토어에 보고된 버전이 같지 않아서 앱을 설치할 수 없습니다.",
"Application is not enabled" : "앱이 활성화되지 않았습니다",
"Authentication error" : "인증 오류",
"Token expired. Please reload page." : "토큰이 만료되었습니다. 페이지를 새로 고치십시오.",
diff --git a/lib/l10n/lt_LT.js b/lib/l10n/lt_LT.js
index 402167cb3c6..937cf28cef5 100644
--- a/lib/l10n/lt_LT.js
+++ b/lib/l10n/lt_LT.js
@@ -37,7 +37,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Programa negali būti įdiegta, nes turi neleistiną kodą",
"App can't be installed because it is not compatible with this version of ownCloud" : "Programa negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Programa negali būti įdiegta, nes turi <shipped>true</shipped> žymę, kuri yra neleistina ne kartu platinamoms programoms",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Programa negali būti įdiegta, nes versija pateikta info.xml/version nesutampa su versija deklaruota programų saugykloje",
"Application is not enabled" : "Programa neįjungta",
"Authentication error" : "Autentikacijos klaida",
"Token expired. Please reload page." : "Sesija baigėsi. Prašome perkrauti puslapį.",
diff --git a/lib/l10n/lt_LT.json b/lib/l10n/lt_LT.json
index c4efe386655..93299728b32 100644
--- a/lib/l10n/lt_LT.json
+++ b/lib/l10n/lt_LT.json
@@ -35,7 +35,6 @@
"App can't be installed because of not allowed code in the App" : "Programa negali būti įdiegta, nes turi neleistiną kodą",
"App can't be installed because it is not compatible with this version of ownCloud" : "Programa negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Programa negali būti įdiegta, nes turi <shipped>true</shipped> žymę, kuri yra neleistina ne kartu platinamoms programoms",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Programa negali būti įdiegta, nes versija pateikta info.xml/version nesutampa su versija deklaruota programų saugykloje",
"Application is not enabled" : "Programa neįjungta",
"Authentication error" : "Autentikacijos klaida",
"Token expired. Please reload page." : "Sesija baigėsi. Prašome perkrauti puslapį.",
diff --git a/lib/l10n/nb_NO.js b/lib/l10n/nb_NO.js
index 2dbf45e950b..bdd4baafe80 100644
--- a/lib/l10n/nb_NO.js
+++ b/lib/l10n/nb_NO.js
@@ -60,7 +60,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "App kan ikke installeres på grunn av ulovlig kode i appen.",
"App can't be installed because it is not compatible with this version of ownCloud" : "App kan ikke installeres fordi den ikke er kompatibel med denne versjonen av ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App kan ikke installeres fordi den inneholder tag <shipped>true</shipped> som ikke er tillatt for apper som ikke leveres med systemet",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App kan ikke installeres fordi versjonen i info.xml/version ikke er den samme som versjonen som rapporteres fra app-butikken",
"Application is not enabled" : "Applikasjon er ikke påslått",
"Authentication error" : "Autentikasjonsfeil",
"Token expired. Please reload page." : "Symbol utløpt. Vennligst last inn siden på nytt.",
diff --git a/lib/l10n/nb_NO.json b/lib/l10n/nb_NO.json
index d93e32b7469..a9635ba70cb 100644
--- a/lib/l10n/nb_NO.json
+++ b/lib/l10n/nb_NO.json
@@ -58,7 +58,6 @@
"App can't be installed because of not allowed code in the App" : "App kan ikke installeres på grunn av ulovlig kode i appen.",
"App can't be installed because it is not compatible with this version of ownCloud" : "App kan ikke installeres fordi den ikke er kompatibel med denne versjonen av ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App kan ikke installeres fordi den inneholder tag <shipped>true</shipped> som ikke er tillatt for apper som ikke leveres med systemet",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App kan ikke installeres fordi versjonen i info.xml/version ikke er den samme som versjonen som rapporteres fra app-butikken",
"Application is not enabled" : "Applikasjon er ikke påslått",
"Authentication error" : "Autentikasjonsfeil",
"Token expired. Please reload page." : "Symbol utløpt. Vennligst last inn siden på nytt.",
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index 9e009e6d180..5a22e147df3 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -60,7 +60,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "De app kan niet worden geïnstalleerd wegens onjuiste code in de app",
"App can't be installed because it is not compatible with this version of ownCloud" : "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "De app kan niet worden geïnstallerd omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "De app kan niet worden geïnstalleerd omdat de versie in info.xml/version niet dezelfde is als de versie zoals die in de app store staat vermeld",
"Application is not enabled" : "De applicatie is niet actief",
"Authentication error" : "Authenticatie fout",
"Token expired. Please reload page." : "Token verlopen. Herlaad de pagina.",
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index 22b125ab713..2af4fad7e88 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -58,7 +58,6 @@
"App can't be installed because of not allowed code in the App" : "De app kan niet worden geïnstalleerd wegens onjuiste code in de app",
"App can't be installed because it is not compatible with this version of ownCloud" : "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "De app kan niet worden geïnstallerd omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "De app kan niet worden geïnstalleerd omdat de versie in info.xml/version niet dezelfde is als de versie zoals die in de app store staat vermeld",
"Application is not enabled" : "De applicatie is niet actief",
"Authentication error" : "Authenticatie fout",
"Token expired. Please reload page." : "Token verlopen. Herlaad de pagina.",
diff --git a/lib/l10n/oc.js b/lib/l10n/oc.js
index 74eeaa4a2ed..961f4889177 100644
--- a/lib/l10n/oc.js
+++ b/lib/l10n/oc.js
@@ -58,7 +58,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "L'aplicacion pòt pas èsser installada perque conten de còde pas autorizat",
"App can't be installed because it is not compatible with this version of ownCloud" : "L'aplicacion pòt pas èsser installada perque es pas compatibla amb aquesta version d'ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'aplicacion pòt pas èsser installada perque conten la balisa <shipped>true</shipped> qu'es pas autorizada per las aplicacions non inclusas per defaut",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "L'aplicacion pòt pas èsser installada perque la version dins info.xml/version es pas identica a la qu'es indicada sus l'app store",
"Application is not enabled" : "L'aplicacion es pas activada",
"Authentication error" : "Error d'autentificacion",
"Token expired. Please reload page." : "La session a expirat. Recargatz la pagina.",
diff --git a/lib/l10n/oc.json b/lib/l10n/oc.json
index 20fb3c52851..e855ab6bd6b 100644
--- a/lib/l10n/oc.json
+++ b/lib/l10n/oc.json
@@ -56,7 +56,6 @@
"App can't be installed because of not allowed code in the App" : "L'aplicacion pòt pas èsser installada perque conten de còde pas autorizat",
"App can't be installed because it is not compatible with this version of ownCloud" : "L'aplicacion pòt pas èsser installada perque es pas compatibla amb aquesta version d'ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'aplicacion pòt pas èsser installada perque conten la balisa <shipped>true</shipped> qu'es pas autorizada per las aplicacions non inclusas per defaut",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "L'aplicacion pòt pas èsser installada perque la version dins info.xml/version es pas identica a la qu'es indicada sus l'app store",
"Application is not enabled" : "L'aplicacion es pas activada",
"Authentication error" : "Error d'autentificacion",
"Token expired. Please reload page." : "La session a expirat. Recargatz la pagina.",
diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js
index 76318fc8acb..c432b8c1301 100644
--- a/lib/l10n/pl.js
+++ b/lib/l10n/pl.js
@@ -46,7 +46,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Aplikacja nie może być zainstalowany ponieważ nie dopuszcza kod w aplikacji",
"App can't be installed because it is not compatible with this version of ownCloud" : "Aplikacja nie może zostać zainstalowana ponieważ jest niekompatybilna z tą wersja ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikacja nie może być zainstalowana ponieważ true tag nie jest <shipped>true</shipped> , co nie jest dozwolone dla aplikacji nie wysłanych",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Nie można zainstalować aplikacji, ponieważ w wersji info.xml/version nie jest taka sama, jak wersja z app store",
"Application is not enabled" : "Aplikacja nie jest włączona",
"Authentication error" : "Błąd uwierzytelniania",
"Token expired. Please reload page." : "Token wygasł. Proszę ponownie załadować stronę.",
diff --git a/lib/l10n/pl.json b/lib/l10n/pl.json
index 2bd882c012f..b48d1c49f09 100644
--- a/lib/l10n/pl.json
+++ b/lib/l10n/pl.json
@@ -44,7 +44,6 @@
"App can't be installed because of not allowed code in the App" : "Aplikacja nie może być zainstalowany ponieważ nie dopuszcza kod w aplikacji",
"App can't be installed because it is not compatible with this version of ownCloud" : "Aplikacja nie może zostać zainstalowana ponieważ jest niekompatybilna z tą wersja ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikacja nie może być zainstalowana ponieważ true tag nie jest <shipped>true</shipped> , co nie jest dozwolone dla aplikacji nie wysłanych",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Nie można zainstalować aplikacji, ponieważ w wersji info.xml/version nie jest taka sama, jak wersja z app store",
"Application is not enabled" : "Aplikacja nie jest włączona",
"Authentication error" : "Błąd uwierzytelniania",
"Token expired. Please reload page." : "Token wygasł. Proszę ponownie załadować stronę.",
diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js
index 9baa9f51a44..7a860129362 100644
--- a/lib/l10n/pt_BR.js
+++ b/lib/l10n/pt_BR.js
@@ -60,7 +60,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "O aplicativo não pode ser instalado por causa do código não permitido no Aplivativo",
"App can't be installed because it is not compatible with this version of ownCloud" : "O aplicativo não pode ser instalado porque não é compatível com esta versão do ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "O aplicativo não pode ser instalado porque ele contém a marca <shipped>verdadeiro</shipped> que não é permitido para aplicações não embarcadas",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "O aplicativo não pode ser instalado porque a versão em info.xml/versão não é a mesma que a versão relatada na App Store",
"Application is not enabled" : "Aplicação não está habilitada",
"Authentication error" : "Erro de autenticação",
"Token expired. Please reload page." : "Token expirou. Por favor recarregue a página.",
diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json
index e2bb90fd0ce..49d4b40a127 100644
--- a/lib/l10n/pt_BR.json
+++ b/lib/l10n/pt_BR.json
@@ -58,7 +58,6 @@
"App can't be installed because of not allowed code in the App" : "O aplicativo não pode ser instalado por causa do código não permitido no Aplivativo",
"App can't be installed because it is not compatible with this version of ownCloud" : "O aplicativo não pode ser instalado porque não é compatível com esta versão do ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "O aplicativo não pode ser instalado porque ele contém a marca <shipped>verdadeiro</shipped> que não é permitido para aplicações não embarcadas",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "O aplicativo não pode ser instalado porque a versão em info.xml/versão não é a mesma que a versão relatada na App Store",
"Application is not enabled" : "Aplicação não está habilitada",
"Authentication error" : "Erro de autenticação",
"Token expired. Please reload page." : "Token expirou. Por favor recarregue a página.",
diff --git a/lib/l10n/pt_PT.js b/lib/l10n/pt_PT.js
index 9ea7b813e70..6d8efd9fc12 100644
--- a/lib/l10n/pt_PT.js
+++ b/lib/l10n/pt_PT.js
@@ -57,7 +57,7 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "A aplicação não pode ser instalado devido a código não permitido dentro da aplicação",
"App can't be installed because it is not compatible with this version of ownCloud" : "A aplicação não pode ser instalada por não ser compatível com esta versão do ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Esta aplicação não pode ser instalada por que contém o tag <shipped>true</shipped> que só é permitido para aplicações nativas",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Esta aplicação não pode ser instalada porque a versão no info.xml/version não coincide com a reportada na loja de aplicações",
+ "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Esta aplicação não pode ser instalada porque a versão no info.xml não coincide com a reportada na loja de aplicações",
"Application is not enabled" : "A aplicação não está activada",
"Authentication error" : "Erro na autenticação",
"Token expired. Please reload page." : "O token expirou. Por favor recarregue a página.",
diff --git a/lib/l10n/pt_PT.json b/lib/l10n/pt_PT.json
index 60a31bb4393..74a7438c422 100644
--- a/lib/l10n/pt_PT.json
+++ b/lib/l10n/pt_PT.json
@@ -55,7 +55,7 @@
"App can't be installed because of not allowed code in the App" : "A aplicação não pode ser instalado devido a código não permitido dentro da aplicação",
"App can't be installed because it is not compatible with this version of ownCloud" : "A aplicação não pode ser instalada por não ser compatível com esta versão do ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Esta aplicação não pode ser instalada por que contém o tag <shipped>true</shipped> que só é permitido para aplicações nativas",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Esta aplicação não pode ser instalada porque a versão no info.xml/version não coincide com a reportada na loja de aplicações",
+ "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Esta aplicação não pode ser instalada porque a versão no info.xml não coincide com a reportada na loja de aplicações",
"Application is not enabled" : "A aplicação não está activada",
"Authentication error" : "Erro na autenticação",
"Token expired. Please reload page." : "O token expirou. Por favor recarregue a página.",
diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js
index 655d2a885ce..486d00c0391 100644
--- a/lib/l10n/ru.js
+++ b/lib/l10n/ru.js
@@ -60,7 +60,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Приложение невозможно установить. В нем содержится запрещенный код.",
"App can't be installed because it is not compatible with this version of ownCloud" : "Приложение невозможно установить. Не совместимо с текущей версией ownCloud.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Приложение невозможно установить. Оно содержит параметр <shipped>true</shipped> который не допустим для приложений, не входящих в поставку.",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Приложение невозможно установить. Версия в info.xml/version не совпадает с версией заявленной в магазине приложений",
"Application is not enabled" : "Приложение не разрешено",
"Authentication error" : "Ошибка аутентификации",
"Token expired. Please reload page." : "Токен просрочен. Перезагрузите страницу.",
diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json
index 0f66b9cdc00..52766f67dd3 100644
--- a/lib/l10n/ru.json
+++ b/lib/l10n/ru.json
@@ -58,7 +58,6 @@
"App can't be installed because of not allowed code in the App" : "Приложение невозможно установить. В нем содержится запрещенный код.",
"App can't be installed because it is not compatible with this version of ownCloud" : "Приложение невозможно установить. Не совместимо с текущей версией ownCloud.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Приложение невозможно установить. Оно содержит параметр <shipped>true</shipped> который не допустим для приложений, не входящих в поставку.",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Приложение невозможно установить. Версия в info.xml/version не совпадает с версией заявленной в магазине приложений",
"Application is not enabled" : "Приложение не разрешено",
"Authentication error" : "Ошибка аутентификации",
"Token expired. Please reload page." : "Токен просрочен. Перезагрузите страницу.",
diff --git a/lib/l10n/sk_SK.js b/lib/l10n/sk_SK.js
index b644fea0b9e..962deaa4c37 100644
--- a/lib/l10n/sk_SK.js
+++ b/lib/l10n/sk_SK.js
@@ -59,7 +59,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Aplikácia nemôže byť nainštalovaná pre nepovolený kód v aplikácii",
"App can't be installed because it is not compatible with this version of ownCloud" : "Aplikácia nemôže byť nainštalovaná pre nekompatibilitu z touto verziou ownCloudu",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikácia nemôže byť nainštalovaná pretože obsahuje značku<shipped>true</shipped>, ktorá nie je povolená pre nedodávané aplikácie",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikácia nemôže byť nainštalovaná pretože verzia v info.xml/version nezodpovedá verzii špecifikovanej v obchode s aplikáciami",
"Application is not enabled" : "Aplikácia nie je zapnutá",
"Authentication error" : "Chyba autentifikácie",
"Token expired. Please reload page." : "Token vypršal. Obnovte, prosím, stránku.",
diff --git a/lib/l10n/sk_SK.json b/lib/l10n/sk_SK.json
index 9d02a1d264b..da5af2befd5 100644
--- a/lib/l10n/sk_SK.json
+++ b/lib/l10n/sk_SK.json
@@ -57,7 +57,6 @@
"App can't be installed because of not allowed code in the App" : "Aplikácia nemôže byť nainštalovaná pre nepovolený kód v aplikácii",
"App can't be installed because it is not compatible with this version of ownCloud" : "Aplikácia nemôže byť nainštalovaná pre nekompatibilitu z touto verziou ownCloudu",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikácia nemôže byť nainštalovaná pretože obsahuje značku<shipped>true</shipped>, ktorá nie je povolená pre nedodávané aplikácie",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikácia nemôže byť nainštalovaná pretože verzia v info.xml/version nezodpovedá verzii špecifikovanej v obchode s aplikáciami",
"Application is not enabled" : "Aplikácia nie je zapnutá",
"Authentication error" : "Chyba autentifikácie",
"Token expired. Please reload page." : "Token vypršal. Obnovte, prosím, stránku.",
diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js
index 4ae1e49705c..872273a6d13 100644
--- a/lib/l10n/sl.js
+++ b/lib/l10n/sl.js
@@ -53,7 +53,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Programa ni mogoče namestiti zaradi nedovoljene programske kode.",
"App can't be installed because it is not compatible with this version of ownCloud" : "Programa ni mogoče namestiti, ker ni skladen z trenutno nameščeno različico oblaka ownCloud.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Programa ni mogoče namestiti, ker vsebuje oznako <shipped>potrditve</shipped>, ki pa ni dovoljena za javne programe.",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Program ni mogoče namestiti zaradi neustrezne različice datoteke info.xml. Ta ni enaka različici programa.",
"Application is not enabled" : "Program ni omogočen",
"Authentication error" : "Napaka overjanja",
"Token expired. Please reload page." : "Žeton je potekel. Stran je treba ponovno naložiti.",
diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json
index 8a34931889f..e7fad43e6e6 100644
--- a/lib/l10n/sl.json
+++ b/lib/l10n/sl.json
@@ -51,7 +51,6 @@
"App can't be installed because of not allowed code in the App" : "Programa ni mogoče namestiti zaradi nedovoljene programske kode.",
"App can't be installed because it is not compatible with this version of ownCloud" : "Programa ni mogoče namestiti, ker ni skladen z trenutno nameščeno različico oblaka ownCloud.",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Programa ni mogoče namestiti, ker vsebuje oznako <shipped>potrditve</shipped>, ki pa ni dovoljena za javne programe.",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Program ni mogoče namestiti zaradi neustrezne različice datoteke info.xml. Ta ni enaka različici programa.",
"Application is not enabled" : "Program ni omogočen",
"Authentication error" : "Napaka overjanja",
"Token expired. Please reload page." : "Žeton je potekel. Stran je treba ponovno naložiti.",
diff --git a/lib/l10n/sq.js b/lib/l10n/sq.js
index bfb5b12cc32..afa5028e61e 100644
--- a/lib/l10n/sq.js
+++ b/lib/l10n/sq.js
@@ -60,7 +60,7 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Aplikacioni s’mund të instalohet, për shkak kodi të palejuar te Aplikacioni",
"App can't be installed because it is not compatible with this version of ownCloud" : "Aplikacioni s’mund të instalohet, ngaqë s’është i përputhshëm me këtë version të ownCloud-it",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikacioni s’mund të instalohet, ngaqë përmban etiketën <shipped>true</shipped> e cila nuk lejohet për aplikacione që s’janë hedhur në qarkullim",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikacioni s’mund të instalohet, ngaqë versioni te info.xml/version s’është i njëjti me versionin e treguar nga shitorja e aplikacioneve",
+ "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Aplikacioni s’mund të instalohet, ngaqë versioni te info.xml s’është i njëjti me versionin e treguar nga shitorja e aplikacioneve",
"Application is not enabled" : "Aplikacioni s’është aktivizuar",
"Authentication error" : "Gabim mirëfilltësimi",
"Token expired. Please reload page." : "Token-i ka skaduar. Ju lutemi, ringarkoni faqen.",
diff --git a/lib/l10n/sq.json b/lib/l10n/sq.json
index 7768167dc4f..2f126b2d964 100644
--- a/lib/l10n/sq.json
+++ b/lib/l10n/sq.json
@@ -58,7 +58,7 @@
"App can't be installed because of not allowed code in the App" : "Aplikacioni s’mund të instalohet, për shkak kodi të palejuar te Aplikacioni",
"App can't be installed because it is not compatible with this version of ownCloud" : "Aplikacioni s’mund të instalohet, ngaqë s’është i përputhshëm me këtë version të ownCloud-it",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikacioni s’mund të instalohet, ngaqë përmban etiketën <shipped>true</shipped> e cila nuk lejohet për aplikacione që s’janë hedhur në qarkullim",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikacioni s’mund të instalohet, ngaqë versioni te info.xml/version s’është i njëjti me versionin e treguar nga shitorja e aplikacioneve",
+ "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Aplikacioni s’mund të instalohet, ngaqë versioni te info.xml s’është i njëjti me versionin e treguar nga shitorja e aplikacioneve",
"Application is not enabled" : "Aplikacioni s’është aktivizuar",
"Authentication error" : "Gabim mirëfilltësimi",
"Token expired. Please reload page." : "Token-i ka skaduar. Ju lutemi, ringarkoni faqen.",
diff --git a/lib/l10n/sr.js b/lib/l10n/sr.js
index 4cb5661eedf..ba8a1466fc7 100644
--- a/lib/l10n/sr.js
+++ b/lib/l10n/sr.js
@@ -59,7 +59,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Апликације не може бити инсталирана због недозвољеног кода у апликацији",
"App can't be installed because it is not compatible with this version of ownCloud" : "Апликације не може бити инсталирана јер није компатибилна са овом верзијом оунКлауда",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Апликација се не може инсталирати јер садржи ознаку <shipped>тачно</shipped> која није дозвољена за неиспоручене апликације",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Апликација се не може инсталирати јер верзија у info.xml/version није иста као верзија коју пријављује продавница апликација",
"Application is not enabled" : "Апликација није укључена",
"Authentication error" : "Грешка аутентификације",
"Token expired. Please reload page." : "Жетон је истекао. Поново учитајте страницу.",
diff --git a/lib/l10n/sr.json b/lib/l10n/sr.json
index dd686f58fe9..270b58ad3a4 100644
--- a/lib/l10n/sr.json
+++ b/lib/l10n/sr.json
@@ -57,7 +57,6 @@
"App can't be installed because of not allowed code in the App" : "Апликације не може бити инсталирана због недозвољеног кода у апликацији",
"App can't be installed because it is not compatible with this version of ownCloud" : "Апликације не може бити инсталирана јер није компатибилна са овом верзијом оунКлауда",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Апликација се не може инсталирати јер садржи ознаку <shipped>тачно</shipped> која није дозвољена за неиспоручене апликације",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Апликација се не може инсталирати јер верзија у info.xml/version није иста као верзија коју пријављује продавница апликација",
"Application is not enabled" : "Апликација није укључена",
"Authentication error" : "Грешка аутентификације",
"Token expired. Please reload page." : "Жетон је истекао. Поново учитајте страницу.",
diff --git a/lib/l10n/sv.js b/lib/l10n/sv.js
index e378f831d13..2d5ce30ab87 100644
--- a/lib/l10n/sv.js
+++ b/lib/l10n/sv.js
@@ -47,7 +47,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Appen kan inte installeras eftersom att den innehåller otillåten kod",
"App can't be installed because it is not compatible with this version of ownCloud" : "Appen kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Appen kan inte installeras eftersom att den innehåller etiketten <shipped>true</shipped> vilket inte är tillåtet för icke inkluderade appar",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Appen kan inte installeras eftersom versionen i info.xml inte är samma som rapporteras från app store",
"Application is not enabled" : "Applikationen är inte aktiverad",
"Authentication error" : "Fel vid autentisering",
"Token expired. Please reload page." : "Ogiltig token. Ladda om sidan.",
diff --git a/lib/l10n/sv.json b/lib/l10n/sv.json
index 4cecd4711f5..1e93a4a7d75 100644
--- a/lib/l10n/sv.json
+++ b/lib/l10n/sv.json
@@ -45,7 +45,6 @@
"App can't be installed because of not allowed code in the App" : "Appen kan inte installeras eftersom att den innehåller otillåten kod",
"App can't be installed because it is not compatible with this version of ownCloud" : "Appen kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Appen kan inte installeras eftersom att den innehåller etiketten <shipped>true</shipped> vilket inte är tillåtet för icke inkluderade appar",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Appen kan inte installeras eftersom versionen i info.xml inte är samma som rapporteras från app store",
"Application is not enabled" : "Applikationen är inte aktiverad",
"Authentication error" : "Fel vid autentisering",
"Token expired. Please reload page." : "Ogiltig token. Ladda om sidan.",
diff --git a/lib/l10n/th_TH.js b/lib/l10n/th_TH.js
index a5116ec6e5c..6258ab22c48 100644
--- a/lib/l10n/th_TH.js
+++ b/lib/l10n/th_TH.js
@@ -60,7 +60,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "ไม่สามารถติดตั้งแอพพลิเคชันเพราะไม่ได้อนุญาตรหัสในแอพพลิเคชัน",
"App can't be installed because it is not compatible with this version of ownCloud" : "ไม่สามารถติดตั้งแอพพลิเคชันเพราะมันเข้ากันไม่ได้กับรุ่นของ ownCloud นี้",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "ไม่สามารถติดตั้งแอพพลิเคชันเพราะมันมี <shipped>จริง</shipped> แท็กที่ไม่ได้รับอนุญาต",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "ไม่สามารถติดตั้งแอพพลิเคเพราะรุ่นใน info.xml/version ไม่เหมือนกันกับรุ่นที่มีรายงานจากร้านค้าแอพ",
"Application is not enabled" : "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน",
"Authentication error" : "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
"Token expired. Please reload page." : "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง",
diff --git a/lib/l10n/th_TH.json b/lib/l10n/th_TH.json
index 52fb06d31d5..7b1d9d2e7db 100644
--- a/lib/l10n/th_TH.json
+++ b/lib/l10n/th_TH.json
@@ -58,7 +58,6 @@
"App can't be installed because of not allowed code in the App" : "ไม่สามารถติดตั้งแอพพลิเคชันเพราะไม่ได้อนุญาตรหัสในแอพพลิเคชัน",
"App can't be installed because it is not compatible with this version of ownCloud" : "ไม่สามารถติดตั้งแอพพลิเคชันเพราะมันเข้ากันไม่ได้กับรุ่นของ ownCloud นี้",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "ไม่สามารถติดตั้งแอพพลิเคชันเพราะมันมี <shipped>จริง</shipped> แท็กที่ไม่ได้รับอนุญาต",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "ไม่สามารถติดตั้งแอพพลิเคเพราะรุ่นใน info.xml/version ไม่เหมือนกันกับรุ่นที่มีรายงานจากร้านค้าแอพ",
"Application is not enabled" : "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน",
"Authentication error" : "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
"Token expired. Please reload page." : "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง",
diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js
index 9facd084bec..870755af9a2 100644
--- a/lib/l10n/tr.js
+++ b/lib/l10n/tr.js
@@ -59,7 +59,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor",
"App can't be installed because it is not compatible with this version of ownCloud" : "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Uygulama, birlikte gelmeyen uygulama olmasına rağmen <shipped>true</shipped> etiketi içerdiği için kurulamıyor",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Uygulama info.xml/version ile uygulama marketinde belirtilen sürüm aynı olmadığından kurulamıyor",
"Application is not enabled" : "Uygulama etkin değil",
"Authentication error" : "Kimlik doğrulama hatası",
"Token expired. Please reload page." : "Belirteç süresi geçti. Lütfen sayfayı yenileyin.",
diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json
index 442c53181ea..053db049f62 100644
--- a/lib/l10n/tr.json
+++ b/lib/l10n/tr.json
@@ -57,7 +57,6 @@
"App can't be installed because of not allowed code in the App" : "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor",
"App can't be installed because it is not compatible with this version of ownCloud" : "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Uygulama, birlikte gelmeyen uygulama olmasına rağmen <shipped>true</shipped> etiketi içerdiği için kurulamıyor",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Uygulama info.xml/version ile uygulama marketinde belirtilen sürüm aynı olmadığından kurulamıyor",
"Application is not enabled" : "Uygulama etkin değil",
"Authentication error" : "Kimlik doğrulama hatası",
"Token expired. Please reload page." : "Belirteç süresi geçti. Lütfen sayfayı yenileyin.",
diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js
index e7b5747f068..29f7c12141c 100644
--- a/lib/l10n/uk.js
+++ b/lib/l10n/uk.js
@@ -52,7 +52,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "Неможливо встановити додаток. Він містить заборонений код",
"App can't be installed because it is not compatible with this version of ownCloud" : "Неможливо встановити додаток, він є несумісним з даною версією ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Неможливо встановити додаток, оскільки він містить параметр <shipped>true</shipped> заборонений додаткам, що не входять в поставку ",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Неможливо встановити додаток. Версія в файлі info.xml/version не співпадає з заявленою в магазині додатків",
"Application is not enabled" : "Додаток не увімкнений",
"Authentication error" : "Помилка автентифікації",
"Token expired. Please reload page." : "Строк дії токена скінчився. Будь ласка, перезавантажте сторінку.",
diff --git a/lib/l10n/uk.json b/lib/l10n/uk.json
index 08b826c5ec6..45b39e4aa14 100644
--- a/lib/l10n/uk.json
+++ b/lib/l10n/uk.json
@@ -50,7 +50,6 @@
"App can't be installed because of not allowed code in the App" : "Неможливо встановити додаток. Він містить заборонений код",
"App can't be installed because it is not compatible with this version of ownCloud" : "Неможливо встановити додаток, він є несумісним з даною версією ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Неможливо встановити додаток, оскільки він містить параметр <shipped>true</shipped> заборонений додаткам, що не входять в поставку ",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Неможливо встановити додаток. Версія в файлі info.xml/version не співпадає з заявленою в магазині додатків",
"Application is not enabled" : "Додаток не увімкнений",
"Authentication error" : "Помилка автентифікації",
"Token expired. Please reload page." : "Строк дії токена скінчився. Будь ласка, перезавантажте сторінку.",
diff --git a/lib/l10n/zh_CN.js b/lib/l10n/zh_CN.js
index 8a24877ca1a..a11c0539635 100644
--- a/lib/l10n/zh_CN.js
+++ b/lib/l10n/zh_CN.js
@@ -32,7 +32,6 @@ OC.L10N.register(
"App can't be installed because of not allowed code in the App" : "App 无法安装,因为 App 中有非法代码 ",
"App can't be installed because it is not compatible with this version of ownCloud" : "App 无法安装,因为和当前 ownCloud 版本不兼容",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App 无法安装,因为 App 包含不允许在非内置 App 中使用的 <shipped>true</shipped> 标签",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App 无法安装因为 info.xml/version 中的版本和 App 商店版本不同",
"Application is not enabled" : "应用程序未启用",
"Authentication error" : "认证出错",
"Token expired. Please reload page." : "Token 过期,请刷新页面。",
diff --git a/lib/l10n/zh_CN.json b/lib/l10n/zh_CN.json
index b4e67c7ae20..5872c0eb5a9 100644
--- a/lib/l10n/zh_CN.json
+++ b/lib/l10n/zh_CN.json
@@ -30,7 +30,6 @@
"App can't be installed because of not allowed code in the App" : "App 无法安装,因为 App 中有非法代码 ",
"App can't be installed because it is not compatible with this version of ownCloud" : "App 无法安装,因为和当前 ownCloud 版本不兼容",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App 无法安装,因为 App 包含不允许在非内置 App 中使用的 <shipped>true</shipped> 标签",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App 无法安装因为 info.xml/version 中的版本和 App 商店版本不同",
"Application is not enabled" : "应用程序未启用",
"Authentication error" : "认证出错",
"Token expired. Please reload page." : "Token 过期,请刷新页面。",
diff --git a/lib/l10n/zh_TW.js b/lib/l10n/zh_TW.js
index fda0ebe90f6..c05810c647b 100644
--- a/lib/l10n/zh_TW.js
+++ b/lib/l10n/zh_TW.js
@@ -40,6 +40,7 @@ OC.L10N.register(
"web services under your control" : "由您控制的網路服務",
"Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "模組編號: %s 不存在,請在應用程式設定中開啟,或是聯絡系統管理員",
"Empty filename is not allowed" : "不允許空白的檔名",
+ "Dot files are not allowed" : "不允許小數點開頭的檔案",
"4-byte characters are not supported in file names" : "檔案名稱不支援4位元的字元",
"File name is a reserved word" : "檔案名稱是預設保留字",
"File name contains at least one invalid character" : "檔案名稱含有不合法的字元",
@@ -54,10 +55,10 @@ OC.L10N.register(
"Archives of type %s are not supported" : "不支援 %s 格式的壓縮檔",
"Failed to open archive when installing app" : "安裝應用程式時無法開啓壓縮檔",
"App does not provide an info.xml file" : "應用程式沒有提供 info.xml 檔案",
+ "Signature could not get checked. Please contact the app developer and check your admin screen." : "無法驗證數位簽章,請聯絡 app 開發者,並檢查您的管理頁面",
"App can't be installed because of not allowed code in the App" : "無法安裝應用程式因為在當中找到危險的代碼",
"App can't be installed because it is not compatible with this version of ownCloud" : "無法安裝應用程式因為它和此版本的 ownCloud 不相容。",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "無法安裝應用程式,因為它包含了 <shipped>true</shipped> 標籤,在未發行的應用程式當中這是不允許的",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "無法安裝應用程式,因為它在 info.xml/version 宣告的版本與 app store 當中記載的版本不同",
"Application is not enabled" : "應用程式未啟用",
"Authentication error" : "認證錯誤",
"Token expired. Please reload page." : "Token 過期,請重新整理頁面。",
@@ -94,6 +95,7 @@ OC.L10N.register(
"Sharing %s failed, because %s is not a member of the group %s" : "分享 %s 失敗,因為 %s 不是群組 %s 的一員",
"You need to provide a password to create a public link, only protected links are allowed" : "您必須為公開連結設定一組密碼,我們只允許受密碼保護的連結",
"Sharing %s failed, because sharing with links is not allowed" : "分享 %s 失敗,因為目前不允許使用連結分享",
+ "Not allowed to create a federated share with the same user" : "不允許與同一個使用者建立聯盟式分享",
"Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "分享%s失敗,找不到%s,或許目前無法連線到該伺服器",
"Share type %s is not valid for %s" : "分享類型 %s 對於 %s 來說無效",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "為 %s 設定權限失敗,因為欲設定的權限超出開放給 %s 的範圍",
@@ -114,7 +116,9 @@ OC.L10N.register(
"Cannot set expiration date more than %s days in the future" : "無法設定到期日超過未來%s天",
"Could not find category \"%s\"" : "找不到分類:\"%s\"",
"Apps" : "應用程式",
+ "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "使用者名稱當中只能包含下列字元:\"a-z\", \"A-Z\", \"0-9\", 和 \"_.@-'\"",
"A valid username must be provided" : "必須提供一個有效的用戶名",
+ "Username contains whitespace at the beginning or at the end" : "使用者名詞的開頭或結尾有空白",
"A valid password must be provided" : "一定要提供一個有效的密碼",
"The username is already being used" : "這個使用者名稱已經有人使用了",
"No database drivers (sqlite, mysql, or postgresql) installed." : "沒有安裝資料庫驅動程式 (sqlite, mysql, 或 postgresql)",
@@ -134,6 +138,7 @@ OC.L10N.register(
"Adjusting this setting in php.ini will make ownCloud run again" : "調整php.ini裡的這項設定會讓ownCloud再次運行",
"mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload 應該要被設定成 \"0\"而不是目前的設定 \"%s\" ",
"To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "為了修正這個問題,請到php.ini將 <code>mbstring.func_overload</code> 的值改為 <code>0</code>",
+ "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 已經設定成「剪除 inline doc block」模式,這將會使幾個核心應用程式無法使用",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "這大概是由快取或是加速器像是 Zend OPcache, eAccelerator 造成的",
"PHP modules have been installed, but they are still listed as missing?" : "你已經安裝了指定的 PHP 模組,可是還是顯示為找不到嗎?",
"Please ask your server administrator to restart the web server." : "請聯絡您的系統管理員重新啟動網頁伺服器",
diff --git a/lib/l10n/zh_TW.json b/lib/l10n/zh_TW.json
index 1b27a722443..adf2825a5c5 100644
--- a/lib/l10n/zh_TW.json
+++ b/lib/l10n/zh_TW.json
@@ -38,6 +38,7 @@
"web services under your control" : "由您控制的網路服務",
"Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "模組編號: %s 不存在,請在應用程式設定中開啟,或是聯絡系統管理員",
"Empty filename is not allowed" : "不允許空白的檔名",
+ "Dot files are not allowed" : "不允許小數點開頭的檔案",
"4-byte characters are not supported in file names" : "檔案名稱不支援4位元的字元",
"File name is a reserved word" : "檔案名稱是預設保留字",
"File name contains at least one invalid character" : "檔案名稱含有不合法的字元",
@@ -52,10 +53,10 @@
"Archives of type %s are not supported" : "不支援 %s 格式的壓縮檔",
"Failed to open archive when installing app" : "安裝應用程式時無法開啓壓縮檔",
"App does not provide an info.xml file" : "應用程式沒有提供 info.xml 檔案",
+ "Signature could not get checked. Please contact the app developer and check your admin screen." : "無法驗證數位簽章,請聯絡 app 開發者,並檢查您的管理頁面",
"App can't be installed because of not allowed code in the App" : "無法安裝應用程式因為在當中找到危險的代碼",
"App can't be installed because it is not compatible with this version of ownCloud" : "無法安裝應用程式因為它和此版本的 ownCloud 不相容。",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "無法安裝應用程式,因為它包含了 <shipped>true</shipped> 標籤,在未發行的應用程式當中這是不允許的",
- "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "無法安裝應用程式,因為它在 info.xml/version 宣告的版本與 app store 當中記載的版本不同",
"Application is not enabled" : "應用程式未啟用",
"Authentication error" : "認證錯誤",
"Token expired. Please reload page." : "Token 過期,請重新整理頁面。",
@@ -92,6 +93,7 @@
"Sharing %s failed, because %s is not a member of the group %s" : "分享 %s 失敗,因為 %s 不是群組 %s 的一員",
"You need to provide a password to create a public link, only protected links are allowed" : "您必須為公開連結設定一組密碼,我們只允許受密碼保護的連結",
"Sharing %s failed, because sharing with links is not allowed" : "分享 %s 失敗,因為目前不允許使用連結分享",
+ "Not allowed to create a federated share with the same user" : "不允許與同一個使用者建立聯盟式分享",
"Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "分享%s失敗,找不到%s,或許目前無法連線到該伺服器",
"Share type %s is not valid for %s" : "分享類型 %s 對於 %s 來說無效",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "為 %s 設定權限失敗,因為欲設定的權限超出開放給 %s 的範圍",
@@ -112,7 +114,9 @@
"Cannot set expiration date more than %s days in the future" : "無法設定到期日超過未來%s天",
"Could not find category \"%s\"" : "找不到分類:\"%s\"",
"Apps" : "應用程式",
+ "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "使用者名稱當中只能包含下列字元:\"a-z\", \"A-Z\", \"0-9\", 和 \"_.@-'\"",
"A valid username must be provided" : "必須提供一個有效的用戶名",
+ "Username contains whitespace at the beginning or at the end" : "使用者名詞的開頭或結尾有空白",
"A valid password must be provided" : "一定要提供一個有效的密碼",
"The username is already being used" : "這個使用者名稱已經有人使用了",
"No database drivers (sqlite, mysql, or postgresql) installed." : "沒有安裝資料庫驅動程式 (sqlite, mysql, 或 postgresql)",
@@ -132,6 +136,7 @@
"Adjusting this setting in php.ini will make ownCloud run again" : "調整php.ini裡的這項設定會讓ownCloud再次運行",
"mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload 應該要被設定成 \"0\"而不是目前的設定 \"%s\" ",
"To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "為了修正這個問題,請到php.ini將 <code>mbstring.func_overload</code> 的值改為 <code>0</code>",
+ "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 已經設定成「剪除 inline doc block」模式,這將會使幾個核心應用程式無法使用",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "這大概是由快取或是加速器像是 Zend OPcache, eAccelerator 造成的",
"PHP modules have been installed, but they are still listed as missing?" : "你已經安裝了指定的 PHP 模組,可是還是顯示為找不到嗎?",
"Please ask your server administrator to restart the web server." : "請聯絡您的系統管理員重新啟動網頁伺服器",
diff --git a/lib/private/share20/defaultshareprovider.php b/lib/private/share20/defaultshareprovider.php
index 0ab0dc81fa7..e18e306d7f6 100644
--- a/lib/private/share20/defaultshareprovider.php
+++ b/lib/private/share20/defaultshareprovider.php
@@ -118,6 +118,10 @@ class DefaultShareProvider implements IShareProvider {
if ($share->getExpirationDate() !== null) {
$qb->setValue('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime'));
}
+
+ if (method_exists($share, 'getParent')) {
+ $qb->setValue('parent', $qb->createNamedParameter($share->getParent()));
+ }
} else {
throw new \Exception('invalid share type!');
}
diff --git a/lib/private/share20/manager.php b/lib/private/share20/manager.php
index 4345784d2e7..7a10d6cba55 100644
--- a/lib/private/share20/manager.php
+++ b/lib/private/share20/manager.php
@@ -415,6 +415,28 @@ class Manager implements IManager {
}
/**
+ * To make sure we don't get invisible link shares we set the parent
+ * of a link if it is a reshare. This is a quick word around
+ * until we can properly display multiple link shares in the UI
+ *
+ * See: https://github.com/owncloud/core/issues/22295
+ *
+ * FIXME: Remove once multiple link shares can be properly displayed
+ *
+ * @param \OCP\Share\IShare $share
+ */
+ protected function setLinkParent(\OCP\Share\IShare $share) {
+
+ // No sense in checking if the method is not there.
+ if (method_exists($share, 'setParent')) {
+ $storage = $share->getNode()->getStorage();
+ if ($storage->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
+ $share->setParent($storage->getShareId());
+ }
+ };
+ }
+
+ /**
* @param File|Folder $path
*/
protected function pathCreateChecks($path) {
@@ -470,6 +492,7 @@ class Manager implements IManager {
$this->groupCreateChecks($share);
} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
$this->linkCreateChecks($share);
+ $this->setLinkParent($share);
/*
* For now ignore a set token.
@@ -695,9 +718,9 @@ class Manager implements IManager {
* @throws \InvalidArgumentException
*/
public function deleteShare(\OCP\Share\IShare $share) {
- // Just to make sure we have all the info
+
try {
- $share = $this->getShareById($share->getFullId());
+ $share->getFullId();
} catch (\UnexpectedValueException $e) {
throw new \InvalidArgumentException('Share does not have a full id');
}
diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index cd9991796ec..7f34c261cbe 100644
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -80,16 +80,14 @@ class User implements IUser {
$this->uid = $uid;
$this->backend = $backend;
$this->emitter = $emitter;
+ if(is_null($config)) {
+ $config = \OC::$server->getConfig();
+ }
$this->config = $config;
$this->urlGenerator = $urlGenerator;
- if ($this->config) {
- $enabled = $this->config->getUserValue($uid, 'core', 'enabled', 'true');
- $this->enabled = ($enabled === 'true');
- $this->lastLogin = $this->config->getUserValue($uid, 'login', 'lastLogin', 0);
- } else {
- $this->enabled = true;
- $this->lastLogin = \OC::$server->getConfig()->getUserValue($uid, 'login', 'lastLogin', 0);
- }
+ $enabled = $this->config->getUserValue($uid, 'core', 'enabled', 'true');
+ $this->enabled = ($enabled === 'true');
+ $this->lastLogin = $this->config->getUserValue($uid, 'login', 'lastLogin', 0);
if (is_null($this->urlGenerator)) {
$this->urlGenerator = \OC::$server->getURLGenerator();
}
@@ -300,11 +298,10 @@ class User implements IUser {
* @return bool
*/
public function canChangeDisplayName() {
- if ($this->config and $this->config->getSystemValue('allow_user_to_change_display_name') === false) {
+ if ($this->config->getSystemValue('allow_user_to_change_display_name') === false) {
return false;
- } else {
- return $this->backend->implementsActions(\OC_User_Backend::SET_DISPLAYNAME);
}
+ return $this->backend->implementsActions(\OC_User_Backend::SET_DISPLAYNAME);
}
/**
@@ -323,10 +320,8 @@ class User implements IUser {
*/
public function setEnabled($enabled) {
$this->enabled = $enabled;
- if ($this->config) {
- $enabled = ($enabled) ? 'true' : 'false';
- $this->config->setUserValue($this->uid, 'core', 'enabled', $enabled);
- }
+ $enabled = ($enabled) ? 'true' : 'false';
+ $this->config->setUserValue($this->uid, 'core', 'enabled', $enabled);
}
/**
diff --git a/tests/docker/mariadb/oc.cnf b/tests/docker/mariadb/oc.cnf
new file mode 100644
index 00000000000..590284d4617
--- /dev/null
+++ b/tests/docker/mariadb/oc.cnf
@@ -0,0 +1,5 @@
+
+[mysqld]
+
+innodb_buffer_pool_size = 512M
+innodb_flush_log_at_trx_commit = 2
diff --git a/tests/lib/share20/managertest.php b/tests/lib/share20/managertest.php
index 73a1b0a6530..bb91ed0d51e 100644
--- a/tests/lib/share20/managertest.php
+++ b/tests/lib/share20/managertest.php
@@ -132,16 +132,10 @@ class ManagerTest extends \Test\TestCase {
}
/**
- * @expectedException \OCP\Share\Exceptions\ShareNotFound
+ * @expectedException \InvalidArgumentException
*/
public function testDeleteNoShareId() {
- $share = $this->getMock('\OCP\Share\IShare');
-
- $share
- ->expects($this->once())
- ->method('getFullId')
- ->with()
- ->willReturn(null);
+ $share = $this->manager->newShare();
$this->manager->deleteShare($share);
}
@@ -181,7 +175,6 @@ class ManagerTest extends \Test\TestCase {
->setNode($path)
->setTarget('myTarget');
- $manager->expects($this->once())->method('getShareById')->with('prov:42')->willReturn($share);
$manager->expects($this->once())->method('deleteChildren')->with($share);
$this->defaultProvider
@@ -261,7 +254,6 @@ class ManagerTest extends \Test\TestCase {
$this->rootFolder->expects($this->never())->method($this->anything());
- $manager->expects($this->once())->method('getShareById')->with('prov:42')->willReturn($share);
$manager->expects($this->once())->method('deleteChildren')->with($share);
$this->defaultProvider
@@ -359,8 +351,6 @@ class ManagerTest extends \Test\TestCase {
->setTarget('myTarget3')
->setParent(43);
- $manager->expects($this->once())->method('getShareById')->with('prov:42')->willReturn($share1);
-
$this->defaultProvider
->method('getChildren')
->will($this->returnValueMap([
@@ -1549,6 +1539,7 @@ class ManagerTest extends \Test\TestCase {
'pathCreateChecks',
'validateExpirationDate',
'verifyPassword',
+ 'setLinkParent',
])
->getMock();
@@ -1589,6 +1580,9 @@ class ManagerTest extends \Test\TestCase {
$manager->expects($this->once())
->method('verifyPassword')
->with('password');
+ $manager->expects($this->once())
+ ->method('setLinkParent')
+ ->with($share);
$this->hasher->expects($this->once())
->method('hash')